Changeset 4603

Timestamp:

Jul 24, 2005, 9:20:33 AM (21 years ago)

Author:

eugene

Message:

added Nmax jobs

Location:

trunk/Ohana/src/opihi

Files:

• include/scheduler.h (modified) (1 diff)
• pantasks/CheckTasks.c (modified) (1 diff)
• pantasks/Makefile (modified) (1 diff)
• pantasks/TaskOps.c (modified) (1 diff)
• pantasks/init.c (modified) (2 diffs)
• pantasks/task_nmax.c (added)

trunk/Ohana/src/opihi/include/scheduler.h

@@ -65 +65 @@
   TimeRange *ranges;
 
-  int     Ntotal;  // only construct Ntotal jobs for this task
+  int     Nmax;  // only construct Ntotal jobs for this task
   int     Njobs;
 

trunk/Ohana/src/opihi/pantasks/CheckTasks.c

@@ -17 +17 @@
     /* need to check if the current time is within valid/invalid periods */
     if (!CheckTimeRanges (task[0].ranges, task[0].Nranges)) continue;
+    if (task[0].Nmax && (task[0].Njobs >= task[0].Nmax)) continue;
 
     SetCurrentTask (task[0].name);

trunk/Ohana/src/opihi/pantasks/Makefile

@@ -52 +52 @@
 $(SDIR)/controller_output.$(ARCH).o \
 $(SDIR)/task.$(ARCH).o \
-$(SDIR)/task_command.$(ARCH).o \
 $(SDIR)/task_host.$(ARCH).o \
+$(SDIR)/task_nmax.$(ARCH).o \
 $(SDIR)/task_macros.$(ARCH).o \
 $(SDIR)/task_trange.$(ARCH).o \
-$(SDIR)/task_periods.$(ARCH).o
+$(SDIR)/task_periods.$(ARCH).o \
+$(SDIR)/task_command.$(ARCH).o
 
 libs = \

trunk/Ohana/src/opihi/pantasks/TaskOps.c

@@ -138 +138 @@
   gettimeofday (&tasks[Ntasks].last, (void *) NULL);
   tasks[Ntasks].Njobs = 0;
+  tasks[Ntasks].Nmax = 0;  /* default value means 'no limit' */
 
   Ntasks ++;

trunk/Ohana/src/opihi/pantasks/init.c

@@ -4 +4 @@
 int task            PROTO((int, char **));
 int task_host       PROTO((int, char **));
+int task_nmax       PROTO((int, char **));
 int task_trange     PROTO((int, char **));
 int task_macros     PROTO((int, char **));
@@ -19 +20 @@
   {"task",       task,         "define a schedulable task"},
   {"host",       task_host,    "define host machine for a task"},
+  {"nmax",       task_nmax,    "define maximum number of jobs for a task"},
   {"trange",     task_trange,  "define valid/invalid time periods for a task"},
   {"task.exit",  task_macros,  "define exit macros for a task"},