From 98429197c59c4f3cf97cc110424cd46332c8cc7c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Fri, 16 Sep 2005 12:16:36 +0000 Subject: [PATCH] initialise the intStatus in plugin correctly --- org.glite.lb.server/src/jobstat.c | 11 ----------- org.glite.lb.server/src/jobstat.h | 1 + org.glite.lb.server/src/jobstat_supp.c | 13 +++++++++++++ org.glite.lb.server/src/lb_plugin.c | 1 + 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/org.glite.lb.server/src/jobstat.c b/org.glite.lb.server/src/jobstat.c index 9846fe6..a1f27ae 100644 --- a/org.glite.lb.server/src/jobstat.c +++ b/org.glite.lb.server/src/jobstat.c @@ -47,17 +47,6 @@ int js_enable_store = 1; * Basic manipulations with the internal representation of job state */ -static void init_intJobStat(intJobStat *p) -{ - memset(p, 0, sizeof(intJobStat)); - p->pub.jobtype = EDG_WLL_STAT_SIMPLE; - p->pub.children_hist = (int*) calloc(1+EDG_WLL_NUMBER_OF_STATCODES, sizeof(int)); - p->pub.children_hist[0] = EDG_WLL_NUMBER_OF_STATCODES; - p->pub.stateEnterTimes = (int*) calloc(1+EDG_WLL_NUMBER_OF_STATCODES, sizeof(int)); - p->pub.stateEnterTimes[0] = EDG_WLL_NUMBER_OF_STATCODES; - /* TBD: generate */ -} - #if 0 static int eval_expect_update(intJobStat *, int *, char **); #endif diff --git a/org.glite.lb.server/src/jobstat.h b/org.glite.lb.server/src/jobstat.h index 7460523..181a85d 100644 --- a/org.glite.lb.server/src/jobstat.h +++ b/org.glite.lb.server/src/jobstat.h @@ -69,3 +69,4 @@ int processEvent(intJobStat *, edg_wll_Event *, int, int, char **); int add_stringlist(char ***, const char *); int edg_wll_compare_seq(const char *, const char *); +void init_intJobStat(intJobStat *p); diff --git a/org.glite.lb.server/src/jobstat_supp.c b/org.glite.lb.server/src/jobstat_supp.c index 84a9cc3..58d4a51 100644 --- a/org.glite.lb.server/src/jobstat_supp.c +++ b/org.glite.lb.server/src/jobstat_supp.c @@ -739,3 +739,16 @@ void edg_wll_SortEvents(edg_wll_Event *e) for (n=0; e[n].type; n++); qsort(e,n,sizeof *e,compare_events_by_seq); } + + +void init_intJobStat(intJobStat *p) +{ + memset(p, 0, sizeof(intJobStat)); + p->pub.jobtype = EDG_WLL_STAT_SIMPLE; + p->pub.children_hist = (int*) calloc(1+EDG_WLL_NUMBER_OF_STATCODES, sizeof(int)); + p->pub.children_hist[0] = EDG_WLL_NUMBER_OF_STATCODES; + p->pub.stateEnterTimes = (int*) calloc(1+EDG_WLL_NUMBER_OF_STATCODES, sizeof(int)); + p->pub.stateEnterTimes[0] = EDG_WLL_NUMBER_OF_STATCODES; + /* TBD: generate */ +} + diff --git a/org.glite.lb.server/src/lb_plugin.c b/org.glite.lb.server/src/lb_plugin.c index 7c2db6d..340478c 100644 --- a/org.glite.lb.server/src/lb_plugin.c +++ b/org.glite.lb.server/src/lb_plugin.c @@ -377,6 +377,7 @@ static int lb_status(edg_wll_Event **events, edg_wll_JobStat *status) { char *errstring; js = calloc(1, sizeof(intJobStat)); + init_intJobStat(js); i = 0; while (events[i]) -- 1.8.2.3