Changeset 24 for branches/FREEBSD/src/kmk/job.h

Timestamp:

Nov 26, 2002, 10:24:54 PM (23 years ago)

Author:

bird

Message:

Import of RELENG_4_7_0_RELEASE

File:

• branches/FREEBSD/src/kmk/job.h (modified) (10 diffs)

branches/FREEBSD/src/kmk/job.h

@@ -1 +1 @@
 /*
- * Copyright (c) 1988, 1989, 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
@@ -37 +36 @@
  * SUCH DAMAGE.
  *
- *      @(#)job.h       8.1 (Berkeley) 6/6/93
- * $FreeBSD: src/usr.bin/make/job.h,v 1.20 2002/10/09 01:56:02 jmallett Exp $
+ *      from: @(#)job.h 8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/job.h,v 1.11 2000/01/17 06:43:41 kris Exp $
  */
 
@@ -47 +46 @@
  */
 #ifndef _JOB_H_
-#define _JOB_H_
-
-#define TMPPAT  "/tmp/makeXXXXXXXXXX"
-
-#ifndef USE_KQUEUE
+#define _JOB_H_
+
+#define TMPPAT  "/tmp/makeXXXXXXXXXX"
+
 /*
  * The SEL_ constants determine the maximum amount of time spent in select
@@ -57 +55 @@
  * seconds and SEL_USEC is the number of micro-seconds
  */
-#define SEL_SEC         0
-#define SEL_USEC        100000
-#endif /* !USE_KQUEUE */
+#define SEL_SEC         0
+#define SEL_USEC        100000
 
 
@@ -70 +67 @@
  *      2) The graph node describing the target being made by this job
  *      3) A LstNode for the first command to be saved after the job
- *         completes. This is NULL if there was no "..." in the job's
+ *         completes. This is NILLNODE if there was no "..." in the job's
  *         commands.
  *      4) An FILE* for writing out the commands. This is only
@@ -95 +92 @@
  * traversal of the dependency graph.
  */
-#define JOB_BUFSIZE     1024
+#define JOB_BUFSIZE     1024
 typedef struct Job {
     int         pid;        /* The child's process ID */
@@ -109 +106 @@
 #define JOB_IGNERR      0x001   /* Ignore non-zero exits */
 #define JOB_SILENT      0x002   /* no output */
-#define JOB_SPECIAL     0x004   /* Target is a special one. i.e. run it locally
+#define JOB_SPECIAL     0x004   /* Target is a special one. i.e. run it locally
                                  * if we can't export it and maxLocal is 0 */
-#define JOB_IGNDOTS     0x008   /* Ignore "..." lines when processing
+#define JOB_IGNDOTS     0x008   /* Ignore "..." lines when processing
                                  * commands */
-#define JOB_REMOTE      0x010   /* Job is running remotely */
-#define JOB_FIRST       0x020   /* Job is first job for the node */
-#define JOB_REMIGRATE   0x040   /* Job needs to be remigrated */
-#define JOB_RESTART     0x080   /* Job needs to be completely restarted */
-#define JOB_RESUME      0x100   /* Job needs to be resumed b/c it stopped,
+#define JOB_REMOTE      0x010   /* Job is running remotely */
+#define JOB_FIRST       0x020   /* Job is first job for the node */
+#define JOB_REMIGRATE   0x040   /* Job needs to be remigrated */
+#define JOB_RESTART     0x080   /* Job needs to be completely restarted */
+#define JOB_RESUME      0x100   /* Job needs to be resumed b/c it stopped,
                                  * for some reason */
-#define JOB_CONTINUING  0x200   /* We are in the process of resuming this job.
+#define JOB_CONTINUING  0x200   /* We are in the process of resuming this job.
                                  * Used to avoid infinite recursion between
                                  * JobFinish and JobRestart */
@@ -148 +145 @@
 } Job;
 
-#define outPipe         output.o_pipe.op_outPipe
-#define inPipe          output.o_pipe.op_inPipe
-#define outBuf          output.o_pipe.op_outBuf
-#define curPos          output.o_pipe.op_curPos
-#define outFile         output.o_file.of_outFile
-#define outFd           output.o_file.of_outFd
+#define outPipe         output.o_pipe.op_outPipe
+#define inPipe          output.o_pipe.op_inPipe
+#define outBuf          output.o_pipe.op_outBuf
+#define curPos          output.o_pipe.op_curPos
+#define outFile         output.o_file.of_outFile
+#define outFd           output.o_file.of_outFd
 
 
@@ -208 +205 @@
 }               Shell;
 
-/*
- * If REMOTE is defined then these things need exposed, otherwise they are
- * static to job.c!
- */
-#ifdef REMOTE
+
 extern char     *targFmt;       /* Format string for banner that separates
                                  * output from multiple jobs. Contains a
@@ -227 +220 @@
                                  * quite get started */
 extern Boolean  jobFull;        /* Non-zero if no more jobs should/will start*/
-#endif
-
-extern int      maxJobs;        /* Number of jobs that may run */
-
-
-void Job_Touch(GNode *, Boolean);
-Boolean Job_CheckCommands(GNode *, void (*abortProc)(const char *, ...));
-void Job_CatchChildren(Boolean);
-void Job_CatchOutput(void);
-void Job_Make(GNode *);
-void Job_Init(int, int);
-Boolean Job_Full(void);
-Boolean Job_Empty(void);
-ReturnStatus Job_ParseShell(char *);
-int Job_Finish(void);
-void Job_Wait(void);
-void Job_AbortAll(void);
-void JobFlagForMigration(int);
+
+
+void Job_Touch __P((GNode *, Boolean));
+Boolean Job_CheckCommands __P((GNode *, void (*abortProc )(char *, ...)));
+void Job_CatchChildren __P((Boolean));
+void Job_CatchOutput __P((void));
+void Job_Make __P((GNode *));
+void Job_Init __P((int, int));
+Boolean Job_Full __P((void));
+Boolean Job_Empty __P((void));
+ReturnStatus Job_ParseShell __P((char *));
+int Job_End __P((void));
+void Job_Wait __P((void));
+void Job_AbortAll __P((void));
+void JobFlagForMigration __P((int));
 
 #endif /* _JOB_H_ */