From cd16f06f917f1196063443b23d5118b0284fc223 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 16 Mar 2011 13:15:45 +0000 Subject: [PATCH] More context initialization checks. --- org.glite.lb.client/examples/abort_job.c | 5 ++++- org.glite.lb.client/examples/change_acl.c | 5 ++++- org.glite.lb.client/examples/dagids.c | 6 +++++- org.glite.lb.client/examples/done_failed_events.c | 5 ++++- org.glite.lb.client/examples/feed_shark.c | 5 ++++- org.glite.lb.client/examples/flood_proxy.c | 5 ++++- org.glite.lb.client/examples/job_log.c | 5 ++++- org.glite.lb.client/examples/job_reg.c | 6 +++++- org.glite.lb.client/examples/log_usertag_proxy.c | 5 ++++- org.glite.lb.client/examples/multiple_user_jobs.c | 5 ++++- org.glite.lb.client/examples/parse_eventsfile.c | 6 +++++- org.glite.lb.client/examples/query_seq_code.c | 5 ++++- org.glite.lb.client/examples/stats-duration-fromto.c | 5 ++++- org.glite.lb.client/examples/stats.c | 5 ++++- org.glite.lb.client/examples/stress_context.c | 5 ++++- org.glite.lb.client/examples/stresslog.c | 5 ++++- org.glite.lb.client/examples/test_changed_jdl.c | 5 ++++- org.glite.lb.client/examples/user_jobs.c | 5 ++++- org.glite.lb.client/examples/user_jobs_threaded.c | 5 ++++- org.glite.lb.client/src/perftest_jobreg.c | 6 +++++- org.glite.lb.client/src/perftest_logjobs.c | 5 ++++- 21 files changed, 88 insertions(+), 21 deletions(-) diff --git a/org.glite.lb.client/examples/abort_job.c b/org.glite.lb.client/examples/abort_job.c index 6735881..208f481 100644 --- a/org.glite.lb.client/examples/abort_job.c +++ b/org.glite.lb.client/examples/abort_job.c @@ -71,7 +71,10 @@ int main(int argc,char **argv) scanf("%c",&a); if (a != 'y' && a != 'Y') return 1; - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } if (edg_wlc_JobIdParse(argv[1],&job)) { fprintf(stderr,"%s: can't parse job ID\n",argv[1]); diff --git a/org.glite.lb.client/examples/change_acl.c b/org.glite.lb.client/examples/change_acl.c index 77e2f70..392c44b 100644 --- a/org.glite.lb.client/examples/change_acl.c +++ b/org.glite.lb.client/examples/change_acl.c @@ -67,7 +67,10 @@ main(int argc, char *argv[]) break; } - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } if (edg_wlc_JobIdParse(argv[optind], &jobid)) { fprintf(stderr,"can't parse job ID\n"); diff --git a/org.glite.lb.client/examples/dagids.c b/org.glite.lb.client/examples/dagids.c index 634e23e..0cd35bf 100644 --- a/org.glite.lb.client/examples/dagids.c +++ b/org.glite.lb.client/examples/dagids.c @@ -46,7 +46,11 @@ int main(int argc, char *argv[]) edg_wlc_JobId jobid,*subjobs; - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } + opterr = 0; do { diff --git a/org.glite.lb.client/examples/done_failed_events.c b/org.glite.lb.client/examples/done_failed_events.c index 8d468fb..2bd9881 100644 --- a/org.glite.lb.client/examples/done_failed_events.c +++ b/org.glite.lb.client/examples/done_failed_events.c @@ -46,7 +46,10 @@ int main(int argc,char **argv) { edg_wll_QueryRec cond[3],jcond[2]; /* [2] is terminator */ edg_wll_Event *events = NULL; - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } if (argc != 3) usage(argv[0]); diff --git a/org.glite.lb.client/examples/feed_shark.c b/org.glite.lb.client/examples/feed_shark.c index 5019b42..45cc92b 100644 --- a/org.glite.lb.client/examples/feed_shark.c +++ b/org.glite.lb.client/examples/feed_shark.c @@ -41,7 +41,10 @@ int main(int argc,char *argv[]) time_t valid = 0; struct timeval timeout; - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } /* parse options, reflect them in the LB context */ while ((o = getopt(argc,argv,"s:")) >= 0) switch (o) { diff --git a/org.glite.lb.client/examples/flood_proxy.c b/org.glite.lb.client/examples/flood_proxy.c index dd1954b..2a49c61 100644 --- a/org.glite.lb.client/examples/flood_proxy.c +++ b/org.glite.lb.client/examples/flood_proxy.c @@ -77,7 +77,10 @@ static void slave() int err; char *et,*ed; - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } edg_wlc_JobIdParse("https://fake.server/fakejob",&job); if ((err = edg_wll_SetLoggingJobProxy(ctx,job,NULL,"some user",0))) edg_wll_Error(ctx,&et,&ed); diff --git a/org.glite.lb.client/examples/job_log.c b/org.glite.lb.client/examples/job_log.c index c87697e..4a0b63a 100644 --- a/org.glite.lb.client/examples/job_log.c +++ b/org.glite.lb.client/examples/job_log.c @@ -72,7 +72,10 @@ int main(int argc,char **argv) if (argc < 2) help(argv[0]); - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } while ((opt=getopt(argc,argv,"r:d:xX:")) != -1) switch (opt) { diff --git a/org.glite.lb.client/examples/job_reg.c b/org.glite.lb.client/examples/job_reg.c index 6cdd141..5e33246 100644 --- a/org.glite.lb.client/examples/job_reg.c +++ b/org.glite.lb.client/examples/job_reg.c @@ -47,7 +47,11 @@ int main(int argc, char *argv[]) edg_wlc_JobId jobid,*subjobs; - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } + opterr = 0; do { diff --git a/org.glite.lb.client/examples/log_usertag_proxy.c b/org.glite.lb.client/examples/log_usertag_proxy.c index f889864..86ae162 100644 --- a/org.glite.lb.client/examples/log_usertag_proxy.c +++ b/org.glite.lb.client/examples/log_usertag_proxy.c @@ -84,7 +84,10 @@ int main(int argc, char *argv[]) if ( (errno = edg_wlc_JobIdParse(jobid_s, &jobid)) ) { perror(jobid_s); return 1; } - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } if ( !user ) { /* diff --git a/org.glite.lb.client/examples/multiple_user_jobs.c b/org.glite.lb.client/examples/multiple_user_jobs.c index d11e9bd..c169725 100644 --- a/org.glite.lb.client/examples/multiple_user_jobs.c +++ b/org.glite.lb.client/examples/multiple_user_jobs.c @@ -63,7 +63,10 @@ int main(int argc,char **argv) for ( i = 1; i <= no_of_runs; i++ ) { printf ("Proxy file No. %d: %s\n",i,argv[i]); - edg_wll_InitContext(&p_ctx[i-1]); + if (edg_wll_InitContext(&p_ctx[i-1]) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } if (strcmp(argv[i],"default")) edg_wll_SetParam(p_ctx[i-1], EDG_WLL_PARAM_X509_PROXY, argv[i]); if (user_jobs(p_ctx[i-1],&jobs[i-1],&states[i-1])) goto err; diff --git a/org.glite.lb.client/examples/parse_eventsfile.c b/org.glite.lb.client/examples/parse_eventsfile.c index d4d1a25..576f66a 100644 --- a/org.glite.lb.client/examples/parse_eventsfile.c +++ b/org.glite.lb.client/examples/parse_eventsfile.c @@ -54,7 +54,11 @@ int main(int argc, char *argv[]) edg_wll_LogLine (*unparse)(edg_wll_Context context,edg_wll_Event *event); const char *parse_str,*unparse_str; - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } + opterr = 0; me = strdup(argv[0]); diff --git a/org.glite.lb.client/examples/query_seq_code.c b/org.glite.lb.client/examples/query_seq_code.c index edc0840..bb55f95 100644 --- a/org.glite.lb.client/examples/query_seq_code.c +++ b/org.glite.lb.client/examples/query_seq_code.c @@ -68,7 +68,10 @@ int main(int argc, char *argv[]) if ( (errno = edg_wlc_JobIdParse(jobid_s, &jobid)) ) { perror(jobid_s); return 1; } - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } edg_wll_SetParam(ctx, EDG_WLL_PARAM_SOURCE, EDG_WLL_SOURCE_USER_INTERFACE); edg_wll_SetParam(ctx, EDG_WLL_PARAM_LBPROXY_SERVE_SOCK, server); diff --git a/org.glite.lb.client/examples/stats-duration-fromto.c b/org.glite.lb.client/examples/stats-duration-fromto.c index 62f1eb2..bcca113 100644 --- a/org.glite.lb.client/examples/stats-duration-fromto.c +++ b/org.glite.lb.client/examples/stats-duration-fromto.c @@ -38,7 +38,10 @@ int main(int argc,char **argv) char **groups; int i; - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } if (argc < 3) { fprintf(stderr,"usage: %s CE state_from state_to\n",argv[0]); diff --git a/org.glite.lb.client/examples/stats.c b/org.glite.lb.client/examples/stats.c index 7e0bd05..3e9cd1e 100644 --- a/org.glite.lb.client/examples/stats.c +++ b/org.glite.lb.client/examples/stats.c @@ -40,7 +40,10 @@ int main(int argc,char **argv) int i; - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } if (!strcmp(argv[1],"-n")) { era = atoi(argv[2]); diff --git a/org.glite.lb.client/examples/stress_context.c b/org.glite.lb.client/examples/stress_context.c index c51b5d1..1071617 100644 --- a/org.glite.lb.client/examples/stress_context.c +++ b/org.glite.lb.client/examples/stress_context.c @@ -65,7 +65,10 @@ static void slave(int num) while (!stop) { - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } edg_wll_SetParam(ctx, EDG_WLL_PARAM_SOURCE, EDG_WLL_SOURCE_WORKLOAD_MANAGER); if (edg_wll_SetLoggingJobProxy(ctx,job,NULL,"/I/am/the/user",EDG_WLL_SEQ_NORMAL) && !stop) { diff --git a/org.glite.lb.client/examples/stresslog.c b/org.glite.lb.client/examples/stresslog.c index 0b58200..9e33470 100644 --- a/org.glite.lb.client/examples/stresslog.c +++ b/org.glite.lb.client/examples/stresslog.c @@ -56,7 +56,10 @@ int main(int argc, char *argv[]) edg_wlc_JobId jobid,*subjobs; FILE *f; - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } opterr = 0; diff --git a/org.glite.lb.client/examples/test_changed_jdl.c b/org.glite.lb.client/examples/test_changed_jdl.c index 3d97bd6..c64315b 100644 --- a/org.glite.lb.client/examples/test_changed_jdl.c +++ b/org.glite.lb.client/examples/test_changed_jdl.c @@ -30,7 +30,10 @@ int main(int argc,char **argv) edg_wll_JobStat stat; time_t valid = 0; - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } memset(&chj,0,sizeof chj); chj[0].op = EDG_WLL_QUERY_OP_CHANGED; diff --git a/org.glite.lb.client/examples/user_jobs.c b/org.glite.lb.client/examples/user_jobs.c index 85186b6..f50e853 100644 --- a/org.glite.lb.client/examples/user_jobs.c +++ b/org.glite.lb.client/examples/user_jobs.c @@ -63,7 +63,10 @@ int main(int argc,char **argv) break; } - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } if ( user_jobs == edg_wll_UserJobsProxy && owner ) edg_wll_SetParam(ctx, EDG_WLL_PARAM_LBPROXY_USER, owner); diff --git a/org.glite.lb.client/examples/user_jobs_threaded.c b/org.glite.lb.client/examples/user_jobs_threaded.c index 8885dcd..f261c2c 100644 --- a/org.glite.lb.client/examples/user_jobs_threaded.c +++ b/org.glite.lb.client/examples/user_jobs_threaded.c @@ -97,7 +97,10 @@ void *thread_code(thread_code_args *arguments) { user_jobs = edg_wll_UserJobsProxy; } - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + pthread_exit(NULL); + } if ( user_jobs == edg_wll_UserJobsProxy && arguments->owner ) edg_wll_SetParam(ctx, EDG_WLL_PARAM_LBPROXY_USER, arguments->owner); diff --git a/org.glite.lb.client/src/perftest_jobreg.c b/org.glite.lb.client/src/perftest_jobreg.c index 80cdc81..4da3897 100644 --- a/org.glite.lb.client/src/perftest_jobreg.c +++ b/org.glite.lb.client/src/perftest_jobreg.c @@ -71,7 +71,11 @@ int main(int argc, char *argv[]) struct timeval start, stop; - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } + opterr = 0; do { diff --git a/org.glite.lb.client/src/perftest_logjobs.c b/org.glite.lb.client/src/perftest_logjobs.c index d558d06..aaa69d3 100644 --- a/org.glite.lb.client/src/perftest_logjobs.c +++ b/org.glite.lb.client/src/perftest_logjobs.c @@ -198,7 +198,10 @@ main(int argc, char *argv[]) struct timeval log_timeout = { tv_sec: 2, tv_usec: 0 }; - edg_wll_InitContext(&ctx); + if (edg_wll_InitContext(&ctx) != 0) { + fprintf(stderr, "Couldn't create L&B context.\n"); + return 1; + } opterr = 0; -- 1.8.2.3