===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/make.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -c -r1.63 -r1.64
*** src/usr.bin/make/make.c	2012/04/21 04:35:32	1.63
--- src/usr.bin/make/make.c	2012/10/09 19:49:28	1.64
***************
*** 1,4 ****
! /*	$OpenBSD: make.c,v 1.63 2012/04/21 04:35:32 guenther Exp $	*/
  /*	$NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: make.c,v 1.64 2012/10/09 19:49:28 espie Exp $	*/
  /*	$NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $	*/
  
  /*
***************
*** 90,95 ****
--- 90,98 ----
   * MakeStartJobs */
  static struct growableArray toBeMade;	
  
+ /* Hold back on nodes where equivalent stuff is already building... */
+ static struct growableArray heldBack;
+ 
  static struct ohash targets;	/* stuff we must build */
  
  static void MakeAddChild(void *, void *);
***************
*** 193,198 ****
--- 196,222 ----
  	}
  }
  
+ static void
+ requeue(GNode *gn)
+ {
+ 	/* this is where we go inside the array and move things around */
+ 	unsigned int i, j;
+ 
+ 	for (i = 0, j = 0; i < heldBack.n; i++, j++) {
+ 		if (heldBack.a[i]->watched == gn) {
+ 			j--;
+ 			heldBack.a[i]->built_status = UNKNOWN;
+ 			if (DEBUG(HELDJOBS))
+ 				printf("%s finished, releasing: %s\n", 
+ 				    gn->name, heldBack.a[i]->name);
+ 			Array_Push(&toBeMade, heldBack.a[i]);
+ 			continue;
+ 		}
+ 		heldBack.a[j] = heldBack.a[i];
+ 	}
+ 	heldBack.n = j;
+ }
+ 
  /*-
   *-----------------------------------------------------------------------
   * Make_Update	--
***************
*** 247,254 ****
  			printf("update time: %s\n", time_to_string(cgn->mtime));
  	}
  
  	/* SIB: this is where I should mark the build as finished */
- 	cgn->build_lock = false;
  	for (ln = Lst_First(&cgn->parents); ln != NULL; ln = Lst_Adv(ln)) {
  		pgn = (GNode *)Lst_Datum(ln);
  		/* SIB: there should be a siblings loop there */
--- 271,278 ----
  			printf("update time: %s\n", time_to_string(cgn->mtime));
  	}
  
+ 	requeue(cgn);
  	/* SIB: this is where I should mark the build as finished */
  	for (ln = Lst_First(&cgn->parents); ln != NULL; ln = Lst_Adv(ln)) {
  		pgn = (GNode *)Lst_Datum(ln);
  		/* SIB: there should be a siblings loop there */
***************
*** 288,293 ****
--- 312,323 ----
  	if (DEBUG(MAKE))
  		printf("Examining %s...", gn->name);
  		
+ 	if (gn->built_status == HELDBACK) {
+ 		if (DEBUG(HELDJOBS))
+ 			printf("%s already held back ???\n", gn->name);
+ 		return false;
+ 	}
+ 
  	if (gn->unmade != 0) {
  		if (DEBUG(MAKE))
  			printf(" Requeuing (%d)\n", gn->unmade);
***************
*** 314,329 ****
  		add_targets_to_make(&gn->children);
  		return false;
  	}
  	if (Make_OODate(gn)) {
- 		/* SIB: if a sibling is getting built, I don't build it right now */
  		if (DEBUG(MAKE))
  			printf("out-of-date\n");
  		if (queryFlag)
  			return true;
  		/* SIB: this is where commands should get prepared */
  		Make_DoAllVar(gn);
- 		/* SIB: this is where I should make the gn as `being built */
- 		gn->build_lock = true;
  		Job_Make(gn);
  	} else {
  		if (DEBUG(MAKE))
--- 344,385 ----
  		add_targets_to_make(&gn->children);
  		return false;
  	}
+ 	/* this is where we hold back nodes */
+ 	if (gn->groupling != NULL) {
+ 		GNode *gn2;
+ 		for (gn2 = gn->groupling; gn2 != gn; gn2 = gn2->groupling)
+ 			if (gn2->built_status == BUILDING) {
+ 				gn->watched = gn2;
+ 				gn->built_status = HELDBACK;
+ 				if (DEBUG(HELDJOBS))
+ 					printf("Holding back job %s, "
+ 					    "groupling to %s\n", 
+ 					    gn->name, gn2->name);
+ 				Array_Push(&heldBack, gn);
+ 				return false;
+ 			}
+ 	}
+ 	if (gn->sibling != gn) {
+ 		GNode *gn2;
+ 		for (gn2 = gn->sibling; gn2 != gn; gn2 = gn2->sibling)
+ 			if (gn2->built_status == BUILDING) {
+ 				gn->watched = gn2;
+ 				gn->built_status = HELDBACK;
+ 				if (DEBUG(HELDJOBS))
+ 					printf("Holding back job %s, "
+ 					    "sibling to %s\n", 
+ 					    gn->name, gn2->name);
+ 				Array_Push(&heldBack, gn);
+ 				return false;
+ 			}
+ 	}
  	if (Make_OODate(gn)) {
  		if (DEBUG(MAKE))
  			printf("out-of-date\n");
  		if (queryFlag)
  			return true;
  		/* SIB: this is where commands should get prepared */
  		Make_DoAllVar(gn);
  		Job_Make(gn);
  	} else {
  		if (DEBUG(MAKE))
***************
*** 524,529 ****
--- 580,586 ----
  	/* wild guess at initial sizes */
  	Array_Init(&toBeMade, 500);
  	Array_Init(&examine, 150);
+ 	Array_Init(&heldBack, 100);
  	ohash_init(&targets, 10, &gnode_info);
  	if (DEBUG(PARALLEL))
  		random_setup();