Changeset 11052

Timestamp:

Jan 11, 2007, 4:50:20 PM (19 years ago)

Author:

eugene

Message:

adding timing statistics

Location:

trunk/Ohana/src/opihi

Files:

• include/pcontrol.h (modified) (2 diffs)
• pcontrol/CheckBusyJob.c (modified) (1 diff)
• pcontrol/Makefile (modified) (4 diffs)
• pcontrol/StartJob.c (modified) (1 diff)
• pcontrol/check.c (modified) (1 diff)

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

@@ -77 +77 @@
   IOBuffer     stderr;
   Ptime        start;
-  Ptime        accum;
-  Ptime        timer;
-  struct Host *host;
+  Ptime        stop;
+  double       dtime;
   int          pid;
   IDtype       JobID;
+  struct Host *host;
 } Job;
 
@@ -93 +93 @@
   int         pid;
   HostStat    stack;
-  struct timeval lasttry;
-  struct timeval nexttry;
-  Ptime       accum;
-  Ptime       timer;
+  Ptime       lasttry;
+  Ptime       nexttry;
   IDtype      HostID;
   struct Job *job;

trunk/Ohana/src/opihi/pcontrol/CheckBusyJob.c

@@ -89 +89 @@
   PutHost (host, PCONTROL_HOST_BUSY, STACK_BOTTOM);
   PutJobSetState (job, PCONTROL_JOB_DONE, STACK_BOTTOM, outstate);
+  gettimeofday (&job[0].stop, (void *) NULL);
+  job[0].dtime = DTIME(job[0].stop, job[0].start);
   FreeIOBuffer (&buffer);
   return (TRUE);

trunk/Ohana/src/opihi/pcontrol/Makefile

@@ -1 +1 @@
 include ../../../Configure
+default: pcontrol
 
 HOME    =       $(ROOT)/src/opihi
@@ -5 +6 @@
 LIB     =       $(HOME)/lib
 INC     =       $(HOME)/include
-SDIR    =       $(HOME)/pcontrol
+SRC    =       $(HOME)/pcontrol
 HELP    =       $(DESTHELP)/pcontrol
 
@@ -19 +20 @@
 
 funcs = \
-$(SDIR)/init.$(ARCH).o \
-$(SDIR)/pcontrol.$(ARCH).o \
-$(SDIR)/rconnect.$(ARCH).o \
-$(SDIR)/CheckBusyJob.$(ARCH).o \
-$(SDIR)/CheckDoneHost.$(ARCH).o \
-$(SDIR)/CheckDoneJob.$(ARCH).o \
-$(SDIR)/CheckHost.$(ARCH).o \
-$(SDIR)/CheckIdleHost.$(ARCH).o \
-$(SDIR)/CheckPoint.$(ARCH).o \
-$(SDIR)/CheckSystem.$(ARCH).o \
-$(SDIR)/GetJobOutput.$(ARCH).o \
-$(SDIR)/HostOps.$(ARCH).o \
-$(SDIR)/IDops.$(ARCH).o \
-$(SDIR)/JobOps.$(ARCH).o \
-$(SDIR)/StackOps.$(ARCH).o \
-$(SDIR)/PclientCommand.$(ARCH).o \
-$(SDIR)/ResetJob.$(ARCH).o \
-$(SDIR)/StartHost.$(ARCH).o \
-$(SDIR)/StopHosts.$(ARCH).o \
-$(SDIR)/KillJob.$(ARCH).o \
-$(SDIR)/StartJob.$(ARCH).o
+$(SRC)/init.$(ARCH).o \
+$(SRC)/pcontrol.$(ARCH).o \
+$(SRC)/rconnect.$(ARCH).o \
+$(SRC)/CheckBusyJob.$(ARCH).o \
+$(SRC)/CheckDoneHost.$(ARCH).o \
+$(SRC)/CheckDoneJob.$(ARCH).o \
+$(SRC)/CheckHost.$(ARCH).o \
+$(SRC)/CheckIdleHost.$(ARCH).o \
+$(SRC)/CheckPoint.$(ARCH).o \
+$(SRC)/CheckSystem.$(ARCH).o \
+$(SRC)/GetJobOutput.$(ARCH).o \
+$(SRC)/HostOps.$(ARCH).o \
+$(SRC)/IDops.$(ARCH).o \
+$(SRC)/JobOps.$(ARCH).o \
+$(SRC)/StackOps.$(ARCH).o \
+$(SRC)/PclientCommand.$(ARCH).o \
+$(SRC)/ResetJob.$(ARCH).o \
+$(SRC)/StartHost.$(ARCH).o \
+$(SRC)/StopHosts.$(ARCH).o \
+$(SRC)/KillJob.$(ARCH).o \
+$(SRC)/StartJob.$(ARCH).o
 
 cmds = \
-$(SDIR)/check.$(ARCH).o \
-$(SDIR)/delete.$(ARCH).o \
-$(SDIR)/host.$(ARCH).o \
-$(SDIR)/job.$(ARCH).o \
-$(SDIR)/jobstack.$(ARCH).o \
-$(SDIR)/hoststack.$(ARCH).o \
-$(SDIR)/kill.$(ARCH).o \
-$(SDIR)/pulse.$(ARCH).o \
-$(SDIR)/run.$(ARCH).o \
-$(SDIR)/status.$(ARCH).o \
-$(SDIR)/stdout.$(ARCH).o \
-$(SDIR)/version.$(ARCH).o \
-$(SDIR)/verbose.$(ARCH).o
-
-pcontrol = $(cmds) $(funcs)
+$(SRC)/check.$(ARCH).o \
+$(SRC)/delete.$(ARCH).o \
+$(SRC)/host.$(ARCH).o \
+$(SRC)/job.$(ARCH).o \
+$(SRC)/jobstack.$(ARCH).o \
+$(SRC)/hoststack.$(ARCH).o \
+$(SRC)/kill.$(ARCH).o \
+$(SRC)/pulse.$(ARCH).o \
+$(SRC)/run.$(ARCH).o \
+$(SRC)/status.$(ARCH).o \
+$(SRC)/stdout.$(ARCH).o \
+$(SRC)/version.$(ARCH).o \
+$(SRC)/verbose.$(ARCH).o
 
 libs = \
@@ -63 +62 @@
 $(DESTLIB)/libdata.a
 
-pcontrol: $(BIN)/pcontrol.$(ARCH) $(libs)
+pcontrol: $(BIN)/pcontrol.$(ARCH)
+$(SRC)/pcontrol.$(ARCH).o : $(libs)
+$(BIN)/pcontrol.$(ARCH)   : $(cmds) $(funcs)
 
-$(BIN)/pcontrol.$(ARCH) : $(pcontrol)
+$(cmds) $(funcs) : $(INC)/pcontrol.h
 
 install: $(DESTBIN)/pcontrol help

trunk/Ohana/src/opihi/pcontrol/StartJob.c

@@ -82 +82 @@
       PutJob (job, PCONTROL_JOB_BUSY, STACK_BOTTOM);
       FreeIOBuffer (&buffer);
-      /** need to start timers here **/
+      gettimeofday (&job[0].start, (void *) NULL);
       return (TRUE);
   }

trunk/Ohana/src/opihi/pcontrol/check.c

@@ -27 +27 @@
     gprint (GP_LOG, "STDOUT %d\n", job[0].stdout_size);
     gprint (GP_LOG, "STDERR %d\n", job[0].stderr_size);
+    gprint (GP_LOG, "DTIME %lf\n", job[0].dtime);
     PutJob (job, StackID, STACK_BOTTOM);
     ClearCheckPoint ();