Changeset 27840 for branches/simtest_nebulous_branches/Ohana/src/opihi/include/pcontrol.h

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/include/pcontrol.h (modified) (6 diffs)

branches/simtest_nebulous_branches/Ohana/src/opihi/include/pcontrol.h

@@ -60 +60 @@
   PCONTROL_RESP_KILL_JOB,
   PCONTROL_RESP_STOP_HOST,
+  PCONTROL_RESP_DOWN_HOST,
 } HostResp;
 
@@ -97 +98 @@
   int          requested;
 } JobOutput;
+
+/* A machine has a unique name and may have multiple Hosts (each of which can run a single job)
+   We use this to track aspects of the analysis per machine, to eg, limit the number of jobs 
+   desired on a single machine */
+typedef struct {
+  char *name;
+  int Nhosts;                 // how many hosts are selected for this machine (whatever state)
+  int NjobsRealhost;
+  int NjobsWanthost;
+} Machine;
 
 /* data to define a job */
@@ -129 +140 @@
   int         pid;
   HostStat    stack;
-  Ptime       lasttry;
-  Ptime       nexttry;
   IDtype      HostID;
   IOBuffer    comms_buffer;
   char       *response;
   HostResp    response_state;
+  Ptime       last_start_try; // last (UNIX) time we attempted to connect to this host (0 on success)
+  Ptime       next_start_try; // next (UNIX) time we should attempt to connect to this host (0 on success)
+  Ptime       connect_time; // (UNIX) time we connected to this host
   struct Job *job;
 } Host;
 
+/* the Jobs and Hosts are managed in a set of Stacks which define their state */
 typedef struct {
   void **object;
@@ -210 +223 @@
 
 int StartHost (Host *host);
+int CheckResetHost (Host *host);
 int CheckIdleHost (Host *host, int Stage);
 int CheckDoneJob (Job *job, Host *host);
@@ -253 +267 @@
 /*** StopHosts.c ***/
 void   DownHost (Host *host);
+int    DownHosts (void);
+int    DownHostResponse (Host *host);
 void   OffHost (Host *host);
-int    DownHosts (void);
-int    StopHost (Host *host);
+int    StopHost (Host *host, int mode);
 int    StopHostResponse (Host *host);
 int    HarvestHost (int pid);
@@ -276 +291 @@
 void   LinkJobAndHost (Job *job, Host *host);
 
+/*** MachineOps.c ***/
+void InitMachines ();
+void FreeMachines ();
+Machine *FindMachineByName (char *name);
+Machine *AddMachine (char *name);
+int DelMachine (char *name);
+int AddMachineHost (Host *host);
+int DelMachineHost (Host *host);
+int AddMachineJob (Host *host, Job *job);
+int DelMachineJob (Host *host, Job *job);
+int PrintMachines ();
+int CheckMachineJobs (Host *host, Job *job);
+int GetMaxUnwantedHostJobs (void);
+void SetMaxUnwantedHostJobs (int value);
+
+float GetMaxConnectTime (void);
+void SetMaxConnectTime (float value);
+float GetMaxWantHostWait (void);
+void SetMaxWantHostWait (float value);
+
 void pcontrol_exit (int n);