From dda885ae799750d22a48f7dae35dc1a32af70b3c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Wed, 25 Jun 2008 15:41:44 +0000 Subject: [PATCH] fix warnings --- org.glite.lb.server/interface/lb_authz.h | 4 ++-- org.glite.lb.server/interface/store.h | 18 +----------------- org.glite.lb.server/src/db_supp.c | 6 +++--- org.glite.lb.server/src/dump.c | 1 + org.glite.lb.server/src/jobstat.c | 19 +++++++++---------- org.glite.lb.server/src/jobstat.h | 21 +++++++++++++++------ org.glite.lb.server/src/lb_authz.c | 8 ++++---- org.glite.lb.server/src/lb_http.c | 7 +++++-- org.glite.lb.server/src/lb_proto.c | 1 + org.glite.lb.server/src/lb_proto.h | 4 ++++ org.glite.lb.server/src/load.c | 1 + org.glite.lb.server/src/openserver.c | 2 +- org.glite.lb.server/src/purge.h | 4 ++++ org.glite.lb.server/src/query.c | 4 ++-- org.glite.lb.server/src/seqcode.c | 2 +- org.glite.lb.server/src/srv_purge.c | 3 +++ org.glite.lb.server/src/stats.c | 1 + org.glite.lb.server/src/store.c.T | 6 +++++- org.glite.lb.server/src/stored_master.c | 2 +- org.glite.lb.server/src/userjobs.c | 1 + org.glite.lb.server/src/ws_fault.c | 1 + org.glite.lb.server/src/ws_query.c | 1 + org.glite.lb.state-machine/Makefile | 1 + .../interface/process_event.h | 7 +++++++ org.glite.lb.state-machine/src/process_event.c | 12 +++++++----- 25 files changed, 82 insertions(+), 55 deletions(-) create mode 100644 org.glite.lb.state-machine/interface/process_event.h diff --git a/org.glite.lb.server/interface/lb_authz.h b/org.glite.lb.server/interface/lb_authz.h index 4ba1686..3f8728f 100644 --- a/org.glite.lb.server/interface/lb_authz.h +++ b/org.glite.lb.server/interface/lb_authz.h @@ -48,13 +48,13 @@ extern void edg_wll_FreeAcl(edg_wll_Acl); extern int -edg_wll_UpdateACL(edg_wll_Context, edg_wlc_JobId, char *, int, int, int, int); +edg_wll_UpdateACL(edg_wll_Context, glite_jobid_const_t, char *, int, int, int, int); extern int edg_wll_CheckACL(edg_wll_Context, edg_wll_Acl, int); extern int -edg_wll_GetACL(edg_wll_Context, edg_wlc_JobId, edg_wll_Acl *); +edg_wll_GetACL(edg_wll_Context, glite_jobid_const_t, edg_wll_Acl *); extern int edg_wll_SetVomsGroups(edg_wll_Context, edg_wll_GssConnection *, char *, char *, char *, char *); diff --git a/org.glite.lb.server/interface/store.h b/org.glite.lb.server/interface/store.h index 6f0ebe0..8c55de8 100644 --- a/org.glite.lb.server/interface/store.h +++ b/org.glite.lb.server/interface/store.h @@ -24,26 +24,10 @@ void edg_wll_StoreAnonymous( int /* IN (boolean) */ ); -/* update stored job state according to new event */ - -edg_wll_ErrorCode edg_wll_StepIntState( - edg_wll_Context, /* INOUT */ - edg_wlc_JobId, /* IN */ - edg_wll_Event *, /* IN */ - int, /* IN */ - edg_wll_JobStat * -); - -/* create embriotic job state for DAGs' subjob */ - -edg_wll_ErrorCode edg_wll_StepIntStateEmbriotic( - edg_wll_Context ctx, /* INOUT */ - edg_wll_Event *e /* IN */ -); - int db_store(edg_wll_Context, char *); int db_parent_store(edg_wll_Context, edg_wll_Event *, intJobStat *); int handle_request(edg_wll_Context,char *); +int handle_il_message(edg_wll_Context,char *); int create_reply(const edg_wll_Context,char **); int is_job_local(edg_wll_Context, glite_jobid_const_t jobId); int store_job_server_proxy(edg_wll_Context ctx, edg_wll_Event *event, int *register_to_JP); diff --git a/org.glite.lb.server/src/db_supp.c b/org.glite.lb.server/src/db_supp.c index c246e09..6159362 100644 --- a/org.glite.lb.server/src/db_supp.c +++ b/org.glite.lb.server/src/db_supp.c @@ -63,7 +63,7 @@ int edg_wll_Transaction(edg_wll_Context ctx) { if ((retval = glite_lbu_Transaction(ctx->dbctx)) != 0) edg_wll_SetErrorDB(ctx); -printf("edg_wll_Transaction(%d)\n", retval); +// printf("edg_wll_Transaction(%d)\n", retval); return retval; } @@ -71,7 +71,7 @@ int edg_wll_Commit(edg_wll_Context ctx) { int retval; if ((retval = glite_lbu_Commit(ctx->dbctx)) != 0) edg_wll_SetErrorDB(ctx); -printf("edg_wll_Commit(%d)\n", retval); +// printf("edg_wll_Commit(%d)\n", retval); return retval; } @@ -79,7 +79,7 @@ int edg_wll_Rollback(edg_wll_Context ctx) { int retval; if ((retval = glite_lbu_Rollback(ctx->dbctx)) != 0) edg_wll_SetErrorDB(ctx); -printf("edg_wll_Rollback(%d)\n", retval); +// printf("edg_wll_Rollback(%d)\n", retval); return retval; } diff --git a/org.glite.lb.server/src/dump.c b/org.glite.lb.server/src/dump.c index 1b9df12..1b6771e 100644 --- a/org.glite.lb.server/src/dump.c +++ b/org.glite.lb.server/src/dump.c @@ -20,6 +20,7 @@ #include "server_state.h" #include "purge.h" #include "db_supp.h" +#include "lb_proto.h" static char *time_to_string(time_t t, char **ptr); static int handle_specials(edg_wll_Context,time_t *); diff --git a/org.glite.lb.server/src/jobstat.c b/org.glite.lb.server/src/jobstat.c index 527a928..a1c6227 100644 --- a/org.glite.lb.server/src/jobstat.c +++ b/org.glite.lb.server/src/jobstat.c @@ -14,6 +14,7 @@ #include "glite/lb/events.h" #include "glite/lb/context-int.h" #include "glite/lb/intjobstat.h" +#include "glite/lb/process_event.h" #include "get_events.h" #include "store.h" @@ -317,7 +318,6 @@ int edg_wll_JobStatusServer( #endif whole_cycle = 1; -commit: rollback: if (!whole_cycle) { edg_wll_FreeStatus(&jobstat.pub); @@ -382,7 +382,7 @@ int edg_wll_intJobStatus( jqr[0].attr = EDG_WLL_QUERY_ATTR_JOBID; jqr[0].op = EDG_WLL_QUERY_OP_EQUAL; - jqr[0].value.j = job; + jqr[0].value.j = (glite_jobid_t)job; jqr[1].attr = EDG_WLL_QUERY_ATTR_UNDEF; jqra = (edg_wll_QueryRec **) malloc (2 * sizeof(edg_wll_QueryRec **)); @@ -658,7 +658,7 @@ cleanup: edg_wll_ErrorCode edg_wll_StoreIntStateEmbryonic(edg_wll_Context ctx, - edg_wlc_JobId jobid, + glite_jobid_const_t jobid, char *icnames, char *values, glite_lbu_bufInsert *bi) @@ -691,7 +691,7 @@ cleanup: */ edg_wll_ErrorCode edg_wll_LoadIntState(edg_wll_Context ctx, - edg_wlc_JobId jobid, + glite_jobid_const_t jobid, int lock, int seq, intJobStat **stat) @@ -769,7 +769,7 @@ static char* hist_to_string(int * hist) /* checks whether parent jobid would generate the same sem.num. */ /* as children jobid */ -static int dependent_parent_lock(edg_wll_Context ctx, edg_wlc_JobId p,edg_wlc_JobId c) +static int dependent_parent_lock(edg_wll_Context ctx, glite_jobid_const_t p,glite_jobid_const_t c) { int p_id, c_id; @@ -949,7 +949,7 @@ err: */ edg_wll_ErrorCode edg_wll_StepIntStateParent(edg_wll_Context ctx, - edg_wlc_JobId job, + glite_jobid_const_t job, edg_wll_Event *e, int seq, intJobStat *ijsp, @@ -998,7 +998,7 @@ edg_wll_ErrorCode edg_wll_StepIntStateParent(edg_wll_Context ctx, */ edg_wll_ErrorCode edg_wll_StepIntState(edg_wll_Context ctx, - edg_wlc_JobId job, + glite_jobid_const_t job, edg_wll_Event *e, int seq, edg_wll_JobStat *stat_out) @@ -1066,12 +1066,11 @@ edg_wll_ErrorCode edg_wll_StepIntState(edg_wll_Context ctx, else destroy_intJobStat(&jobstat); } -err: return edg_wll_Error(ctx, NULL, NULL); } -edg_wll_ErrorCode edg_wll_GetSubjobHistogram(edg_wll_Context ctx, edg_wlc_JobId parent_jobid, int *hist) +edg_wll_ErrorCode edg_wll_GetSubjobHistogram(edg_wll_Context ctx, glite_jobid_const_t parent_jobid, int *hist) { char *stmt = NULL,*out = NULL, *rest = NULL; @@ -1117,7 +1116,7 @@ edg_wll_ErrorCode edg_wll_GetSubjobHistogram(edg_wll_Context ctx, edg_wlc_JobId /* Make a histogram of all subjobs belonging to the parent job */ -edg_wll_ErrorCode edg_wll_StoreSubjobHistogram(edg_wll_Context ctx, edg_wlc_JobId parent_jobid, intJobStat *ijs) +edg_wll_ErrorCode edg_wll_StoreSubjobHistogram(edg_wll_Context ctx, glite_jobid_const_t parent_jobid, intJobStat *ijs) { char *stat_enc = NULL; char *stmt; diff --git a/org.glite.lb.server/src/jobstat.h b/org.glite.lb.server/src/jobstat.h index 168add7..b0b916a 100644 --- a/org.glite.lb.server/src/jobstat.h +++ b/org.glite.lb.server/src/jobstat.h @@ -12,11 +12,20 @@ int edg_wll_JobStatusServer(edg_wll_Context, glite_jobid_const_t, int, edg_wll_J int edg_wll_intJobStatus( edg_wll_Context, glite_jobid_const_t, int, intJobStat *, int, int); edg_wll_ErrorCode edg_wll_StoreIntState(edg_wll_Context, intJobStat *, int); -edg_wll_ErrorCode edg_wll_StoreIntStateEmbryonic(edg_wll_Context, edg_wlc_JobId, char *icnames, char *values, glite_lbu_bufInsert *bi); -edg_wll_ErrorCode edg_wll_LoadIntState(edg_wll_Context , edg_wlc_JobId , int, int, intJobStat **); +edg_wll_ErrorCode edg_wll_StoreIntStateEmbryonic(edg_wll_Context, glite_jobid_const_t, char *icnames, char *values, glite_lbu_bufInsert *bi); +edg_wll_ErrorCode edg_wll_LoadIntState(edg_wll_Context , glite_jobid_const_t , int, int, intJobStat **); -edg_wll_ErrorCode edg_wll_StepIntState(edg_wll_Context ctx, edg_wlc_JobId job, edg_wll_Event *e, int seq, edg_wll_JobStat *stat_out); -edg_wll_ErrorCode edg_wll_StepIntStateParent(edg_wll_Context,edg_wlc_JobId,edg_wll_Event *,int,intJobStat *,edg_wll_JobStat *); +/* update stored job state according to new event */ +edg_wll_ErrorCode edg_wll_StepIntState(edg_wll_Context ctx, glite_jobid_const_t job, edg_wll_Event *e, int seq, edg_wll_JobStat *stat_out); + +edg_wll_ErrorCode edg_wll_StepIntStateParent(edg_wll_Context,glite_jobid_const_t,edg_wll_Event *,int,intJobStat *,edg_wll_JobStat *); + +/* create embriotic job state for DAGs' subjob */ + +edg_wll_ErrorCode edg_wll_StepIntStateEmbriotic( + edg_wll_Context ctx, /* INOUT */ + edg_wll_Event *e /* IN */ +); @@ -29,7 +38,7 @@ char* write2rgma_statline(intJobStat *); int add_stringlist(char ***, const char *); -edg_wll_ErrorCode edg_wll_GetSubjobHistogram(edg_wll_Context, edg_wlc_JobId parent_jobid, int *hist); -edg_wll_ErrorCode edg_wll_StoreSubjobHistogram(edg_wll_Context, edg_wlc_JobId parent_jobid, intJobStat *ijs); +edg_wll_ErrorCode edg_wll_GetSubjobHistogram(edg_wll_Context, glite_jobid_const_t parent_jobid, int *hist); +edg_wll_ErrorCode edg_wll_StoreSubjobHistogram(edg_wll_Context, glite_jobid_const_t parent_jobid, intJobStat *ijs); #endif /* GLITE_LB_LBS_JOBSTAT_H*/ diff --git a/org.glite.lb.server/src/lb_authz.c b/org.glite.lb.server/src/lb_authz.c index 74d0e2d..651b123 100644 --- a/org.glite.lb.server/src/lb_authz.c +++ b/org.glite.lb.server/src/lb_authz.c @@ -677,7 +677,7 @@ end: } int -edg_wll_UpdateACL(edg_wll_Context ctx, edg_wlc_JobId job, +edg_wll_UpdateACL(edg_wll_Context ctx, glite_jobid_const_t job, char *user_id, int user_id_type, int permission, int perm_type, int operation) { @@ -771,7 +771,7 @@ end: return ret; } -int edg_wll_GetACL(edg_wll_Context ctx, edg_wlc_JobId jobid, edg_wll_Acl *acl) +int edg_wll_GetACL(edg_wll_Context ctx, glite_jobid_const_t jobid, edg_wll_Acl *acl) { char *q = NULL; char *acl_id = NULL; @@ -856,10 +856,10 @@ int edg_wll_InitAcl(edg_wll_Acl *acl) { return 0; } void edg_wll_FreeAcl(edg_wll_Acl acl) { } int edg_wll_HandleCounterACL(edg_wll_Context ctx, edg_wll_Acl acl, char *aclid, int incr) { return 0; } -int edg_wll_UpdateACL(edg_wll_Context ctx, edg_wlc_JobId job, +int edg_wll_UpdateACL(edg_wll_Context ctx, glite_jobid_const_t job, char *user_id, int user_id_type, int permission, int perm_type, int operation) { return 0; } -int edg_wll_GetACL(edg_wll_Context ctx, edg_wlc_JobId jobid, edg_wll_Acl *acl) { return 0; } +int edg_wll_GetACL(edg_wll_Context ctx, glite_jobid_const_t jobid, edg_wll_Acl *acl) { return 0; } #endif diff --git a/org.glite.lb.server/src/lb_http.c b/org.glite.lb.server/src/lb_http.c index 84a1bd5..99439d2 100644 --- a/org.glite.lb.server/src/lb_http.c +++ b/org.glite.lb.server/src/lb_http.c @@ -27,8 +27,11 @@ int edg_wll_ServerHTTP(edg_wll_Context ctx) if ( ctx->isProxy ) err = edg_wll_http_recv_proxy(ctx,&req,&hdr,&body); else err = edg_wll_http_recv(ctx,&req,&hdr,&body,ctx->connections->serverConnection); - if (req) dprintf(("[%d] request: %s\n",getpid(),req)); - else dprintf(("no request\n")); + if (req) { + dprintf(("[%d] request: %s\n",getpid(),req)); + } else { + dprintf(("no request\n")); + } if (body) dprintf(("request body:\n%s\n\n",body)); if (!err) { diff --git a/org.glite.lb.server/src/lb_proto.c b/org.glite.lb.server/src/lb_proto.c index 6a222dd..00291a0 100644 --- a/org.glite.lb.server/src/lb_proto.c +++ b/org.glite.lb.server/src/lb_proto.c @@ -15,6 +15,7 @@ #include "lb_proto.h" #include "lb_html.h" #include "stats.h" +#include "jobstat.h" #include "get_events.h" #include "purge.h" #include "lb_xml_parse.h" diff --git a/org.glite.lb.server/src/lb_proto.h b/org.glite.lb.server/src/lb_proto.h index 5aa9c54..13dcd5b 100644 --- a/org.glite.lb.server/src/lb_proto.h +++ b/org.glite.lb.server/src/lb_proto.h @@ -22,4 +22,8 @@ extern edg_wll_ErrorCode edg_wll_Proto( extern char *edg_wll_HTTPErrorMessage(int); +extern int edg_wll_UserJobsServer(edg_wll_Context ctx, edg_wlc_JobId **jobs, edg_wll_JobStat **states); + +extern int edg_wll_QuerySequenceCodeServer(edg_wll_Context ctx, edg_wlc_JobId jobid, const char *source, char **seqcode); + #endif /* GLITE_LB_PROTO_H */ diff --git a/org.glite.lb.server/src/load.c b/org.glite.lb.server/src/load.c index dbab5bc..5774af9 100644 --- a/org.glite.lb.server/src/load.c +++ b/org.glite.lb.server/src/load.c @@ -25,6 +25,7 @@ #include "get_events.h" #include "server_state.h" #include "db_supp.h" +#include "lb_proto.h" static int read_line(char **buff, size_t *maxsize, int fd); diff --git a/org.glite.lb.server/src/openserver.c b/org.glite.lb.server/src/openserver.c index d207c52..b4f506c 100644 --- a/org.glite.lb.server/src/openserver.c +++ b/org.glite.lb.server/src/openserver.c @@ -15,7 +15,7 @@ edg_wll_ErrorCode edg_wll_Open(edg_wll_Context ctx, char *cs) char *cols[20]; glite_lbu_Statement stmt; - if (glite_lbu_InitDBContext(&ctx->dbctx) != 0) { + if (glite_lbu_InitDBContext((glite_lbu_DBContext*) &ctx->dbctx) != 0) { char *ed; glite_lbu_DBError(ctx->dbctx, NULL, &ed); diff --git a/org.glite.lb.server/src/purge.h b/org.glite.lb.server/src/purge.h index 97f8b82..35951bf 100644 --- a/org.glite.lb.server/src/purge.h +++ b/org.glite.lb.server/src/purge.h @@ -48,6 +48,10 @@ extern int edg_wll_CreateFileStorage( char **fname ); +extern int edg_wll_DumpEventsServer(edg_wll_Context ctx,const edg_wll_DumpRequest *req,edg_wll_DumpResult *result); + +extern int edg_wll_LoadEventsServer(edg_wll_Context ctx,const edg_wll_LoadRequest *req,edg_wll_LoadResult *result); + #define edg_wll_CreateTmpDumpFile(ctx, f) edg_wll_CreateTmpFileStorage(ctx,ctx->dumpStorage,f) #define edg_wll_CreateTmpPurgeFile(ctx, f) edg_wll_CreateTmpFileStorage(ctx,ctx->purgeStorage,f) diff --git a/org.glite.lb.server/src/query.c b/org.glite.lb.server/src/query.c index f62b752..6b59714 100644 --- a/org.glite.lb.server/src/query.c +++ b/org.glite.lb.server/src/query.c @@ -518,8 +518,8 @@ limit_cycle_cleanup: while(conditions[i][j].attr) { if(conditions[i][j].attr == EDG_WLL_QUERY_ATTR_JOBID) { - dbjob = edg_wlc_JobIdGetUnique(conditions[i][j].value.j); - prefix = glite_jobid_getServer(conditions[i][j].value.c); + dbjob = glite_jobid_getUnique(conditions[i][j].value.j); + prefix = glite_jobid_getServer(conditions[i][j].value.j); trio_asprintf(&zomb_where_temp,"%s%s((p.prefix = '%|Ss') AND (j.jobid = '%|Ss'))", zomb_where, first_or ? " OR " : "", diff --git a/org.glite.lb.server/src/seqcode.c b/org.glite.lb.server/src/seqcode.c index 2edbcc8..cc46616 100644 --- a/org.glite.lb.server/src/seqcode.c +++ b/org.glite.lb.server/src/seqcode.c @@ -13,7 +13,7 @@ #include "lb_authz.h" */ #include "db_supp.h" - +#include "lb_proto.h" int edg_wll_QuerySequenceCodeServer(edg_wll_Context ctx, edg_wlc_JobId jobid, const char *source, char **seqcode) diff --git a/org.glite.lb.server/src/srv_purge.c b/org.glite.lb.server/src/srv_purge.c index e3a7b5d..e60fe8d 100644 --- a/org.glite.lb.server/src/srv_purge.c +++ b/org.glite.lb.server/src/srv_purge.c @@ -398,6 +398,8 @@ abort: return edg_wll_Error(ctx,NULL,NULL); } +/* FIXME: defined but not used */ +#if 0 static void unlock_and_check(edg_wll_Context ctx,edg_wlc_JobId job) { char *job_s,*et,*ed; @@ -413,6 +415,7 @@ static void unlock_and_check(edg_wll_Context ctx,edg_wlc_JobId job) free(et); free(ed); free(job_s); } } +#endif static int dump_events(edg_wll_Context ctx, glite_jobid_const_t job, int dump, char **res) { diff --git a/org.glite.lb.server/src/stats.c b/org.glite.lb.server/src/stats.c index 17bf9de..9ec12f4 100644 --- a/org.glite.lb.server/src/stats.c +++ b/org.glite.lb.server/src/stats.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "glite/lb/events.h" #include "glite/lb/jobstat.h" diff --git a/org.glite.lb.server/src/store.c.T b/org.glite.lb.server/src/store.c.T index 7b11473..f774788 100644 --- a/org.glite.lb.server/src/store.c.T +++ b/org.glite.lb.server/src/store.c.T @@ -36,8 +36,10 @@ static int store_user(edg_wll_Context,const char *,const char *); static int store_job(edg_wll_Context,glite_jobid_const_t,const char *, int, int, int, int); +/* FIXME: 'set_job_grey' defined but not used */ static int set_job_grey(edg_wll_Context ctx, char *jobid); static int store_flesh(edg_wll_Context,edg_wll_Event *,const char *ulm, char *,int); +/* FIXME: 'check_dup' defined but not used */ static int check_dup(edg_wll_Context,edg_wll_Event *); static int check_auth(edg_wll_Context,edg_wll_Event *e); static void lowercase_usertag(edg_wll_Event *ev); @@ -387,13 +389,15 @@ err: static int store_flesh(edg_wll_Context ctx,edg_wll_Event *e,const char *ulm,char *jobid,int no) { +#ifndef LB_EVENTS_BLOB struct { char *key; char *val; } f[20]; + unsigned int i; +#endif char *stmt; - unsigned int i; int err = 0; assert(ulm || e); diff --git a/org.glite.lb.server/src/stored_master.c b/org.glite.lb.server/src/stored_master.c index 4e8ecab..f039a5e 100644 --- a/org.glite.lb.server/src/stored_master.c +++ b/org.glite.lb.server/src/stored_master.c @@ -63,7 +63,7 @@ gss_reader(void *user_data, char *buffer, int max_len) } -// XXX: for easier merge with RC31_3 +// XXX: for easier merge from RC31_3 // after merge, it would be possible to glue // edg_wll_StoreProtoProxy and edg_wll_StoreProtoServer together int edg_wll_StoreProto(edg_wll_Context ctx) diff --git a/org.glite.lb.server/src/userjobs.c b/org.glite.lb.server/src/userjobs.c index 1af2a50..fe91812 100644 --- a/org.glite.lb.server/src/userjobs.c +++ b/org.glite.lb.server/src/userjobs.c @@ -13,6 +13,7 @@ #include "jobstat.h" #include "db_supp.h" #include "query.h" +#include "lb_proto.h" int edg_wll_UserJobsServer( edg_wll_Context ctx, diff --git a/org.glite.lb.server/src/ws_fault.c b/org.glite.lb.server/src/ws_fault.c index 94a8a73..72107ac 100644 --- a/org.glite.lb.server/src/ws_fault.c +++ b/org.glite.lb.server/src/ws_fault.c @@ -39,6 +39,7 @@ void edg_wll_ErrToFault(const edg_wll_Context ctx,struct soap *soap) free(ed); } +/* FIXME: assignment from incompatible pointer type */ detail = soap_faultdetail(soap); detail->__type = GFNUM; #if GSOAP_VERSION >= 20700 diff --git a/org.glite.lb.server/src/ws_query.c b/org.glite.lb.server/src/ws_query.c index ca5d0eb..983c8ef 100644 --- a/org.glite.lb.server/src/ws_query.c +++ b/org.glite.lb.server/src/ws_query.c @@ -16,6 +16,7 @@ #include "get_events.h" #include "ws_fault.h" #include "ws_typeref.h" +#include "lb_proto.h" #if GSOAP_VERSION <= 20602 #define __lb__GetVersion __ns1__GetVersion diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile index 4c4ed55..c37df71 100644 --- a/org.glite.lb.state-machine/Makefile +++ b/org.glite.lb.state-machine/Makefile @@ -74,6 +74,7 @@ install: install -m 644 lb-job-attrs2.xsd ${PREFIX}/interface install -m 644 ${top_srcdir}/interface/lb-job-record.xsd ${PREFIX}/interface install -m 644 ${top_srcdir}/interface/intjobstat.h ${PREFIX}/include/glite/lb + install -m 644 ${top_srcdir}/interface/process_event.h ${PREFIX}/include/glite/lb install -m 644 ${top_srcdir}/interface/seqcode_aux.h ${PREFIX}/include/glite/lb install -m 644 job_attrs.h ${PREFIX}/include/glite/lb install -m 644 job_attrs2.h ${PREFIX}/include/glite/lb diff --git a/org.glite.lb.state-machine/interface/process_event.h b/org.glite.lb.state-machine/interface/process_event.h new file mode 100644 index 0000000..daea0c6 --- /dev/null +++ b/org.glite.lb.state-machine/interface/process_event.h @@ -0,0 +1,7 @@ +#ifndef GLITE_LB_PROCESS_EVENT_H +#define GLITE_LB_PROCESS_EVENT_H + +int processEvent(intJobStat *js, edg_wll_Event *e, int ev_seq, int strict, char **errstring); +int add_stringlist(char ***lptr, const char *new_item); + +#endif diff --git a/org.glite.lb.state-machine/src/process_event.c b/org.glite.lb.state-machine/src/process_event.c index 7479ea8..e4e86cd 100644 --- a/org.glite.lb.state-machine/src/process_event.c +++ b/org.glite.lb.state-machine/src/process_event.c @@ -13,6 +13,7 @@ #include "intjobstat.h" #include "seqcode_aux.h" +#include "process_event.h" /* TBD: share in whole logging or workload */ @@ -71,6 +72,7 @@ int processEvent(intJobStat *js, edg_wll_Event *e, int ev_seq, int strict, char } #define rep(a,b) { free(a); a = (b == NULL) ? NULL : strdup(b); } +#define rep_null(a) { free(a); a = NULL; } #define rep_cond(a,b) { if (b) { free(a); a = strdup(b); } } static void free_stringlist(char ***lptr) @@ -197,7 +199,7 @@ static void reset_branch(intJobStat *js, edg_wll_Event *e) free_stringlist(&js->pub.possible_ce_nodes); free_branch_state(&js->branch_states); js->pub.payload_running = 0; - rep(js->branch_tag_seqcode, NULL); + rep_null(js->branch_tag_seqcode); rep(js->deep_resubmit_seqcode, e->any.seqcode); } @@ -263,9 +265,9 @@ static int processEvent_glite(intJobStat *js, edg_wll_Event *e, int ev_seq, int js->last_seqcode && after_enter_wm(e->any.seqcode,js->last_seqcode)) { - rep(js->branch_tag_seqcode,NULL); - rep(js->deep_resubmit_seqcode,NULL); - rep(js->last_branch_seqcode,NULL); + rep_null(js->branch_tag_seqcode); + rep_null(js->deep_resubmit_seqcode); + rep_null(js->last_branch_seqcode); } if (js->deep_resubmit_seqcode && @@ -902,7 +904,7 @@ static int processEvent_glite(intJobStat *js, edg_wll_Event *e, int ev_seq, int if (js->pub.state != EDG_WLL_JOB_RUNNING) { js->pub.suspended = 0; - rep(js->pub.suspend_reason, NULL); + rep_null(js->pub.suspend_reason); } if (fine_res == RET_GOODBRANCH) { -- 1.8.2.3