Changeset 29540 for trunk/Ohana/src/opihi/pcontrol/MachineOps.c

Timestamp:

Oct 25, 2010, 12:50:29 PM (16 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20100823

File:

• trunk/Ohana/src/opihi/pcontrol/MachineOps.c (modified) (6 diffs)

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

@@ -1 +1 @@
 # include "pcontrol.h"
+# define DEBUG 0
 
 static int MAX_UNWANTED_HOST_JOBS = 5;
@@ -107 +108 @@
 int AddMachineJob (Host *host, Job *job) {
 
+  int i;
   Machine *machine;
 
@@ -114 +116 @@
   machine[0].NjobsRealhost ++;
 
-  // skip jobs that do not have a targeted host
-  if (job[0].hostname == NULL) {
-    return (TRUE);
+  // skip jobs that do not have a targeted host or any xhosts
+  if (!job[0].hostname && !job[0].Nxhosts) {
+    return (TRUE);
+  }
+
+  for (i = 0; i < job[0].Nxhosts; i++) {
+    // find machine matching the xhost name (these count against the unwanted host total)
+    machine = FindMachineByName (job[0].xhosts[i]); // Can this fail?
+    if (!machine) continue;
+    machine[0].NjobsWanthost ++;
   }
 
@@ -134 +143 @@
 int DelMachineJob (Host *host, Job *job) {
 
+  int i;
   Machine *machine;
 
@@ -141 +151 @@
   machine[0].NjobsRealhost --;
 
-  // skip jobs that do not have a targeted host
-  if (job[0].hostname == NULL) {
-    return (TRUE);
+  // skip jobs that do not have a targeted host or any xhosts
+  if (!job[0].hostname && !job[0].Nxhosts) {
+    return (TRUE);
+  }
+
+  for (i = 0; i < job[0].Nxhosts; i++) {
+    // find machine matching the xhost name (these count against the unwanted host total)
+    machine = FindMachineByName (job[0].xhosts[i]); // Can this fail?
+    if (!machine) continue;
+    machine[0].NjobsWanthost --;
   }
 
@@ -175 +192 @@
 int CheckMachineJobs (Host *host, Job *job) {
 
+  int i;
   Machine *machine;
 
   machine = FindMachineByName (job[0].hostname);
-  if (machine == NULL) return (TRUE);
-  // fprintf (stderr, "wanthost: %s, Ntotal: %d, Nmax: %d\n", job[0].hostname, machine[0].NjobsWanthost + machine[0].NjobsRealhost, machine[0].Nhosts + MAX_UNWANTED_HOST_JOBS);
-  // if (machine[0].NjobsWanthost + machine[0].NjobsRealhost >= machine[0].Nhosts + MAX_UNWANTED_HOST_JOBS) {
-  if (machine[0].NjobsWanthost >= MAX_UNWANTED_HOST_JOBS) {
-    // fprintf (stderr, "too many outstanding jobs wanting host %s, delay job %s for now\n", job[0].hostname, job[0].argv[0]);
-    return (FALSE);
-  }
+  if (machine) {
+    if (DEBUG) fprintf (stderr, "wanthost: %s, Ntotal: %d, Nmax: %d\n", machine[0].name, machine[0].NjobsWanthost + machine[0].NjobsRealhost, machine[0].Nhosts + MAX_UNWANTED_HOST_JOBS);
+    if (machine[0].NjobsWanthost >= MAX_UNWANTED_HOST_JOBS) {
+      if (DEBUG) fprintf (stderr, "too many outstanding jobs wanting host %s, delay job %s for now\n", machine[0].name, job[0].argv[0]);
+      return (FALSE);
+    }
+  }
+
+  for (i = 0; i < job[0].Nxhosts; i++) {
+    machine = FindMachineByName (job[0].xhosts[i]);
+    if (machine) {
+      if (DEBUG) fprintf (stderr, "xhost: %s, Ntotal: %d, Nmax: %d\n", machine[0].name, machine[0].NjobsWanthost + machine[0].NjobsRealhost, machine[0].Nhosts + MAX_UNWANTED_HOST_JOBS);
+      if (machine[0].NjobsWanthost >= MAX_UNWANTED_HOST_JOBS) {
+        if (DEBUG) fprintf (stderr, "too many outstanding jobs wanting host %s, delay job %s for now\n", machine[0].name, job[0].argv[0]);
+        return (FALSE);
+      }
+    }
+  }    
 
   machine = FindMachineByName (host[0].hostname);
-  // fprintf (stderr, "realhost: %s, Ntotal: %d, Nmax: %d\n", host[0].hostname, machine[0].NjobsWanthost + machine[0].NjobsRealhost, machine[0].Nhosts + MAX_UNWANTED_HOST_JOBS);
-  if (machine[0].NjobsWanthost >= MAX_UNWANTED_HOST_JOBS) {
-    // fprintf (stderr, "too many outstanding jobs wanting host %s, delay job %s for now\n", job[0].hostname, job[0].argv[0]);
-    return (FALSE);
-  }
+  if (machine) {
+    if (DEBUG) fprintf (stderr, "realhost: %s, Ntotal: %d, Nmax: %d\n", machine[0].name, machine[0].NjobsWanthost + machine[0].NjobsRealhost, machine[0].Nhosts + MAX_UNWANTED_HOST_JOBS);
+    if (machine[0].NjobsWanthost >= MAX_UNWANTED_HOST_JOBS) {
+      if (DEBUG) fprintf (stderr, "too many outstanding jobs wanting host %s, delay job %s for now\n", machine[0].name, job[0].argv[0]);
+      return (FALSE);
+    }
+  }
+
   return (TRUE);
 }