Attachment #33436 for issue #60948

View | Details | Raw Unified | Return to issue 60948
Collapse All | Expand All

Lines 237-243 Link Here

(-)dmake/make.c (-4 / +6 lines)
237	char *inf = NIL(char);	237	char *inf = NIL(char);
238	char *outall = NIL(char);	238	char *outall = NIL(char);
239	char *imm = NIL(char);	239	char *imm = NIL(char);
240	int rval = 0;	240	int rval = 0; /* 0==ready, 1==target still running, -1==error */
241	int push = 0;	241	int push = 0;
242	int made = F_MADE;	242	int made = F_MADE;
243	int ignore;	243	int ignore;
Lines 576-581 Link Here
576	else	576	else
577	printf( "[%s]\n", cp->CE_NAME );	577	printf( "[%s]\n", cp->CE_NAME );
578	}	578	}
		579	printf("s target %lu %s\n", Do_time(), cp->CE_NAME);
		580	fflush(stdout);
579		581
580	m_at = Def_macro( "@", cp->ce_fname, M_MULTI );	582	m_at = Def_macro( "@", cp->ce_fname, M_MULTI );
581	m_g = Def_macro( ">", cp->ce_lib, M_MULTI\|M_EXPANDED );	583	m_g = Def_macro( ">", cp->ce_lib, M_MULTI\|M_EXPANDED );
Lines 979-988 Link Here
979	Execute the commands one at a time that are pointed to by the rules pointer	981	Execute the commands one at a time that are pointed to by the rules pointer
980	of the target cp. If a group is indicated, then the ce_attr determines	982	of the target cp. If a group is indicated, then the ce_attr determines
981	.IGNORE and .SILENT treatment for the group.	983	.IGNORE and .SILENT treatment for the group.
982		984
983	The function returns 0, if the command is executed and has successfully	985	The function returns 0, if the command is executed and has successfully
984	returned, and returns 1 if the command is executing but has not yet	986	returned, and it returns 1 if the command is executing but has not yet
985	returned (for parallel makes).	987	returned or -1 if an error occured (Return value from Do_cmnd()).
986		988
987	The F_MADE bit in the cell is guaranteed set when the command has	989	The F_MADE bit in the cell is guaranteed set when the command has
988	successfully completed. */	990	successfully completed. */

Lines 219-225 Link Here

(-)dmake/sysintf.c (-1 / +5 lines)
219		219
220	/* NOTE: runargv must return either 0 or 1, 0 ==> command executed, and	220	/* NOTE: runargv must return either 0 or 1, 0 ==> command executed, and
221	* we waited for it to return, 1 ==> command started and is running	221	* we waited for it to return, 1 ==> command started and is running
222	* concurrently with make process. */	222	* concurrently with make process or -1 if something failed. */
		223	/* NOTE2: runargv currently always returns 1 (possible speed up) or -1. */
223	return(i);	224	return(i);
224	}	225	}
225		226
Lines 782-787 Link Here
782	if( Verbose & V_MAKE )	783	if( Verbose & V_MAKE )
783	printf( "%s: <<<< Set [%s] time stamp to %lu\n",	784	printf( "%s: <<<< Set [%s] time stamp to %lu\n",
784	Pname, tcp->CE_NAME, tcp->ce_time );	785	Pname, tcp->CE_NAME, tcp->ce_time );
		786
		787	printf("e target %lu %s\n", Do_time(), tcp->CE_NAME);
		788	fflush(stdout);
785		789
786	Unlink_temp_files( tcp );	790	Unlink_temp_files( tcp );
787	tcp->ce_flag \|= F_MADE;	791	tcp->ce_flag \|= F_MADE;

Lines 175-181 Link Here

(-)dmake/unix/runargv.c (-2 / +11 lines)
175	/* Any Fatal call can potentially loop by recursion because we	175	/* Any Fatal call can potentially loop by recursion because we
176	* are called from the Quit routine that Fatal indirectly calls	176	* are called from the Quit routine that Fatal indirectly calls
177	* since Fatal should not happen I have left this bug in here */	177	* since Fatal should not happen I have left this bug in here */
178	while( _proc_cnt == Max_proc ) {	178	while( _proc_cnt == Max_proc ) { /* This forces sequential execution for Max_proc == 1. */
179	if( Wait_for_child(FALSE, -1) == -1 ) {	179	if( Wait_for_child(FALSE, -1) == -1 ) {
180	if( ! in_quit() \|\| errno != ECHILD )	180	if( ! in_quit() \|\| errno != ECHILD )
181	Fatal( "Lost a child %d: %s", errno, strerror( errno ) );	181	Fatal( "Lost a child %d: %s", errno, strerror( errno ) );
Lines 298-303 Link Here
298	TALLOC( _procs, Max_proc, PR );	298	TALLOC( _procs, Max_proc, PR );
299	}	299	}
300		300
		301	printf("s recipe %lu %s\n", Do_time(), target->CE_NAME);
		302	fflush(stdout);
		303
		304	/* If _use_i!=-1 then this function is called by _finished_child() */
301	if( (i = _use_i) == -1 )	305	if( (i = _use_i) == -1 )
302	for( i=0; i<Max_proc; i++ )	306	for( i=0; i<Max_proc; i++ )
303	if( !_procs[i].pr_valid )	307	if( !_procs[i].pr_valid )
Lines 335-341 Link Here
335	/* Some children we didn't make esp true if using /bin/sh to execute a	339	/* Some children we didn't make esp true if using /bin/sh to execute a
336	* a pipe and feed the output as a makefile into dmake. */	340	* a pipe and feed the output as a makefile into dmake. */
337	if( i == Max_proc ) return;	341	if( i == Max_proc ) return;
338	_procs[i].pr_valid = 0;	342
		343	_procs[i].pr_valid = 0; /* Not a running process anymore. */
		344	printf("e recipe %lu %s\n", Do_time(), _procs[i].pr_target->CE_NAME);
		345	fflush(stdout);
		346
339	_proc_cnt--;	347	_proc_cnt--;
340	dir = DmStrDup(Get_current_dir());	348	dir = DmStrDup(Get_current_dir());
341	Set_dir( _procs[i].pr_dir );	349	Set_dir( _procs[i].pr_dir );
Lines 357-362 Link Here
357	_procs[i].pr_recipe = rp->prp_next;	365	_procs[i].pr_recipe = rp->prp_next;
358		366
359	_use_i = i;	367	_use_i = i;
		368	/* Run next recipe line. */
360	runargv( _procs[i].pr_target, rp->prp_ignore, rp->prp_group,	369	runargv( _procs[i].pr_target, rp->prp_ignore, rp->prp_group,
361	rp->prp_last, rp->prp_shell, rp->prp_cmd );	370	rp->prp_last, rp->prp_shell, rp->prp_cmd );
362	_use_i = -1;	371	_use_i = -1;

Return to issue 60948