From: Miloš Mulač <mulac@civ.zcu.cz>
Date: Tue, 4 Dec 2007 09:51:18 +0000 (+0000)
Subject: added new field to jobstat structure
X-Git-Tag: glite-yaim-lb_R_4_0_1_1~7
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=3b994b630733af87a33f0ccd99a99dc8b3e00aa0;p=jra1mw.git

added new field to jobstat structure
- fixed C++ padding stuff
---

diff --git a/org.glite.lb.client/interface/JobStatus.h.T b/org.glite.lb.client/interface/JobStatus.h.T
index ab7dca7..5e77bc0 100644
--- a/org.glite.lb.client/interface/JobStatus.h.T
+++ b/org.glite.lb.client/interface/JobStatus.h.T
@@ -77,8 +77,8 @@ public:
 			"\t/** $f->{comment} */\n\t\t$u = $StatusAttrNums{$u},\n" :
 			"#error \"$u not defined in StatusAttrNames\"\n";
 	}
+	gen "\tATTR_MAX = $stno /**< Limit for range checking. */ ";
 @@@}
-                ATTR_MAX /**< Limit for range checking. */
 	};
 
 @@@{
diff --git a/org.glite.lb.client/src/JobStatus.cpp.T b/org.glite.lb.client/src/JobStatus.cpp.T
index 1a29c76..c2b3619 100644
--- a/org.glite.lb.client/src/JobStatus.cpp.T
+++ b/org.glite.lb.client/src/JobStatus.cpp.T
@@ -405,11 +405,12 @@ JobStatus::getValJobStatusList(Attr attr) const
 }
 
 
-/* FIXME: this will not work with the current frozen assignment of constants in JobStatus.h */
 static std::string const attr_names[JobStatus::ATTR_MAX] = {
 @@@{
-	for (sort {$a cmp $b} getAllFields $status) {
-		gen "\t\"$_\",\n";
+	require '../src/StatusAttrNames.pl';
+	for (@main::StatusAttrNames) {
+		my $fn = lc $_;
+		gen "\t\"$fn\",\n";
 	}
 @@@}
 };
diff --git a/org.glite.lb.client/src/StatusAttrNames.pl b/org.glite.lb.client/src/StatusAttrNames.pl
index 026f477..b834d15 100644
--- a/org.glite.lb.client/src/StatusAttrNames.pl
+++ b/org.glite.lb.client/src/StatusAttrNames.pl
@@ -67,4 +67,5 @@
 	SUSPEND_REASON
 	SUSPENDED
 	USER_TAGS
+	REMOVE_FROM_PROXY
 /;
diff --git a/org.glite.lb.types/status.T b/org.glite.lb.types/status.T
index 6cd6549..427e75c 100644
--- a/org.glite.lb.types/status.T
+++ b/org.glite.lb.types/status.T
@@ -82,8 +82,9 @@ bool	suspended	Job is suspended
 string	suspend_reason	Reason for the suspend
 
 string	failure_reasons Concatenated job failure reasons, possibly from deeper middleware layers
+bool	remove_from_proxy	Job reached final status and may be removed from proxy
 
-_pad_	55
+_pad_	54
 
 string	pbs_state	Job state which would probably return PBS qstat (Q/R/C/....)
 string  pbs_queue	Name of queue in which is job queued