 @@ -1,14 +1,14 @@
-/* $NetBSD: jobs.c,v 1.18 2023/02/10 23:14:32 joerg Exp $ */
+/* $NetBSD: jobs.c,v 1.19 2023/02/12 04:12:54 joerg Exp $ */
 /*-
  * Copyright (c) 2007, 2009, 2011 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
+ *
  * This code was developed as part of Google's Summer of Code 2007 program.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -154,41 +154,43 @@ compute_tree_depth_rec(struct build_job
+{
 	struct dependency_list *dep_iter;
 	struct build_job *job_iter;
 	if (job == root && root->pkg_depth != 0) {
 		fprintf(stderr, "Cyclic dependency for package:\n%s\n", job->pkgname);
 		return -1;
+	}
 	if (seen[job - jobs])
 		return 0;
 	seen[job - jobs] = 1;
 	++root->pkg_depth;
 	root->pkg_weighted_depth += job->pkg_weight;
 	SLIST_FOREACH(dep_iter, &job->depending_pkgs, depends_link) {
 		if (compute_tree_depth_rec(dep_iter->dependency, root, seen)) {
 			fprintf(stderr, "%s\n", job->pkgname);
 			return -1;
+		}
+	}
 	return 0;
+}
 static void
 compute_tree_depth(struct build_job *job, char *seen)
+{
 	memset(seen, 0, len_jobs);
 	job->pkg_depth = 0;
 	job->pkg_weighted_depth = 0;
 	if (compute_tree_depth_rec(job, job, seen))
 		exit(1);
+}
 void
 init_jobs(const char *scan_output, const char *success_file, const char *error_file)
+{
 	char *input, *seen;
 	const char *input_iter;
 	int fd;
 	size_t i;
 	TAILQ_INIT(&buildable_jobs);
 @@ -271,79 +273,104 @@ mark_initial_state(int fd, enum job_stat
 			errx(1, "Package from %s build log doesn't exist: %.*s", type, (int)len, input_iter);
 		process_job(iter, state, 0);
 		input_iter = strchr(input_iter, '\n');
 		if (input_iter == NULL)
 			errx(1, "Invalid input");
 		++input_iter;
+	}
 	free(input);
+}
 static void
 parse_weight(struct build_job *job)
+{
 	const char *line;
 	char *eos;
 	long long value;
 	line = find_content(job, "PBULK_WEIGHT=");
 	if (line == NULL) {
 		job->pkg_weight = 100;
 		return;
+	}
 	errno = 0;
 	value = strtoll(line, &eos, 10);
 	if (errno || line == eos || *eos != '\n')
 		errx(1, "Invalid PBULK_WEIGHT for package %s", job->pkgname);
 	if (value < 0 && value <= LLONG_MIN / len_jobs)
 		errx(1, "PBULK_WEIGHT too small for package %s", job->pkgname);
 	if (value > 0 && value >= LLONG_MAX / len_jobs)
 		errx(1, "PBULK_WEIGHT too large for package %s", job->pkgname);
 	job->pkg_weight = value;
+}
 static void
 mark_initial(void)
+{
 	const char *line;
 	size_t i;
 	for (i = 0; i < len_jobs; ++i) {
 		if ((line = find_content(&jobs[i], "PKG_SKIP_REASON=")) == NULL)
 			errx(1, "Invalid scan output");
 		if (*line != '\n') {
 			process_job(&jobs[i], JOB_PREFAILED, 0);
 			continue;
+		}
 		if ((line = find_content(&jobs[i], "PKG_FAIL_REASON=")) == NULL)
 			errx(1, "Invalid scan output");
 		if (*line != '\n') {
 			process_job(&jobs[i], JOB_PREFAILED, 0);
 			continue;
+		}
+	}
 	mark_initial_state(log_success, JOB_DONE, "successful");
 	mark_initial_state(log_failed, JOB_FAILED, "failing");
 	if (verbosity >= 1)
 		printf("Initialisation complete.\n");
 	post_initial = 1;
+}
 static void
 add_to_build_list(struct build_job *job)
+{
 	struct build_job *iter;
 	TAILQ_FOREACH(iter, &buildable_jobs, build_link) {
-		if (iter->pkg_depth < job->pkg_depth) {
+		if (iter->pkg_weighted_depth < job->pkg_weighted_depth) {
 			TAILQ_INSERT_BEFORE(iter, job, build_link);
 			return;
+		}
+	}
 	TAILQ_INSERT_TAIL(&buildable_jobs, job, build_link);
+}
 static void
 build_tree(void)
+{
 	size_t i, len;
 	struct build_job *iter, *job;
 	struct dependency_list *dep;
 	const char *depends;
 	for (i = 0; i < len_jobs; ++i) {
 		job = &jobs[i];
 		parse_weight(job);
 		if ((depends = find_content(job, "DEPENDS=")) == NULL)
 			continue;
 		depends += strspn(depends, " \t");
 		while ((len = strcspn(depends, " \t\n")) != 0) {
 			SLIST_FOREACH(iter, get_hash_chain(depends, len), hash_link) {
 				if (iter->pkgname_len == len &&
 				    strncmp(iter->pkgname, depends, len) == 0)
 					break;
+			}
 			if (iter == NULL)
 				errx(1, "Dependency `%.*s' doesn't exist", (int)strcspn(depends, " \t\n"), depends);
 @@ -520,28 +547,28 @@ finish_build(const char *report_file)
 			break;
 		case JOB_INDIRECT_PREFAILED:
 			status = "indirect-prefailed";
 			break;
 		case JOB_OPEN:
 			status = "open";
 			break;
 		case JOB_IN_PROCESSING:
 			status = "in_processing";
 			break;
 		default:
 			errx(1, "internal error");
+		}
-		fprintf(report, "%s|%s||%d\n", jobs[i].pkgname, status,
+		fprintf(report, "%s|%s||%d|%lld\n", jobs[i].pkgname, status,
-		    jobs[i].pkg_depth);
+		    jobs[i].pkg_depth, jobs[i].pkg_weighted_depth);
+	}
+}
 #define	HASH_SIZE 4096
 static size_t
 hash_item(const char *s, size_t len)
+{
 	return djb_hash2(s, s + len) % HASH_SIZE;
+}
 static struct buildhash hash_table[HASH_SIZE];

 @@ -1,14 +1,14 @@
-/* $NetBSD: pbuild.h,v 1.8 2023/02/10 23:14:32 joerg Exp $ */
+/* $NetBSD: pbuild.h,v 1.9 2023/02/12 04:12:54 joerg Exp $ */
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
+ *
  * This code was developed as part of Google's Summer of Code 2007 program.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -86,26 +86,28 @@ struct build_job {
 	/**
 	 * Pointers into the output from pbulk-resolve. The lines
 	 * between these two pointers describe additional properties
 	 * of the job, such as the PKGPATH in which to build the
 	 * package. The information can be accessed with the
 	 * find_content function.
 	 */
 	const char *begin;
 	const char *end;
 	enum job_state state;
 	int pkg_depth;
 	long long pkg_weighted_depth;
 	long long pkg_weight;
 	/**
 	 * The number of direct dependencies that must be built before
 	 * this package can be tried.
 	 */
 	size_t open_depends;
 	/** The packages that depend on this package. */
 	SLIST_HEAD(, dependency_list) depending_pkgs;
 	TAILQ_ENTRY(build_job) build_link;
 	SLIST_ENTRY(build_job) hash_link;
 };

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.26 2023/02/10 23:14:32 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2023/02/12 04:12:54 joerg Exp $
-DISTNAME=	pbulk-base-0.55
+DISTNAME=	pbulk-base-0.56
 COMMENT=	Core components of the modular bulk build framework
 .include "../../pkgtools/pbulk/Makefile.common"
 USE_FEATURES=	nbcompat
 USE_TOOLS+=	nroff
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
 USE_BSD_MAKEFILE=	yes
 MAKE_FLAGS+=		CWARNFLAGS.clang=-Wno-error=missing-noreturn
 CONFLICTS=	pbulk<0.39