1) Uploading the initial (untested) version of the multiple_user_jobs.c example.

2) A minor exception check in connection pool search routine.

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 13da018..ecf2649 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -141,7 +141,7 @@ THRPLUSLIB:=libglite_lb_clientpp_${thrflavour}.la
 TOOLS:=dump load purge lb_dump_exporter ${LB_PERF_TOOLS}
 EXAMPLES:=log_usertag_proxy job_log job_reg feed_shark notify query_ext query_seq_code stats abort_job change_acl stresslog flood_proxy dagids stress_context parse_eventsfile
 
-EXAMPLES_CL=user_jobs job_status 
+EXAMPLES_CL=user_jobs job_status multiple_user_jobs
 EXAMPLES_CL_THR=user_jobs_threaded
 FAKE_EXAMPLES:=job_log_fake
 

diff --git a/org.glite.lb.client/examples/multiple_user_jobs.c b/org.glite.lb.client/examples/multiple_user_jobs.c
new file mode 100644 (file)
index 0000000..b4efbb9
--- /dev/null
+++ b/org.glite.lb.client/examples/multiple_user_jobs.c
@@ -0,0 +1,128 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <expat.h>
+
+#include "glite/lb/context.h"
+#include "glite/lb/xml_conversions.h"
+#include "glite/lb/consumer.h"
+
+int use_proxy = 0;
+
+int (*user_jobs)(edg_wll_Context, edg_wlc_JobId **, edg_wll_JobStat **);
+
+
+void
+usage(char *me)
+{
+        fprintf(stderr,"This example demonstrates the use of several user identities provided byi\n"
+               "proxy files to access a single bkserver and retrieve appropriate information.\n\n"
+               "usage: %s [-h] <proxy files>\n"
+                "\t-h, --help\t show this help\n"
+               "\t<proxy files>\t A list of proxy files to use to contact the bkserver\n"
+               "\t             \t Give \"default\" for default (EDG_WLL_PARAM_X509_PROXY == NULL)\n"
+                "\n"
+        ,me);
+
+}
+
+int main(int argc,char **argv)
+{
+       edg_wll_Context *p_ctx;
+       char            *errt,*errd;
+       edg_wlc_JobId           **jobs = NULL;
+       edg_wll_JobStat         **states = NULL;
+       int             i,j,k;
+       int             proxy_file_no = 0;
+       int             no_of_runs;
+
+       if ((argc<2) || !strcmp(argv[1], "-h")) {usage(argv[0]); exit(0);}
+
+       no_of_runs = argc-1;
+
+       p_ctx = (edg_wll_Context*) calloc (sizeof(edg_wll_Context), no_of_runs);
+       jobs = (edg_wlc_JobId**) calloc (sizeof(edg_wlc_JobId*), no_of_runs);
+       states = (edg_wll_JobStat**) calloc (sizeof(edg_wll_JobStat*), no_of_runs);
+
+       user_jobs = edg_wll_UserJobs;
+       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 (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;
+
+       }
+
+       for (k=0; k < no_of_runs; k++) {
+               printf("Jobs retrieved using file No. %d (%s)\n"
+                       "------------------------------------------\n", k + 1, argv[k + 1]);
+               for (i=0; states[k][i].state != EDG_WLL_JOB_UNDEF; i++) {       
+                       char *id = edg_wlc_JobIdUnparse(states[k][i].jobId),
+                            *st = edg_wll_StatToString(states[k][i].state);
+                       
+                       if (!states[k][i].parent_job) {
+                               if (states[k][i].jobtype == EDG_WLL_STAT_SIMPLE) { 
+                                       printf("      %s .... %s %s\n", id, st, (states[k][i].state==EDG_WLL_JOB_DONE) ? edg_wll_done_codeToString(states[k][i].done_code) : "" );
+                               }
+                               else if ((states[k][i].jobtype == EDG_WLL_STAT_DAG) || 
+                                       (states[k][i].jobtype == EDG_WLL_STAT_COLLECTION)) {
+                                       printf("%s  %s .... %s %s\n", (states[k][i].jobtype==EDG_WLL_STAT_DAG)?"DAG ":"COLL",id, st, (states[k][i].state==EDG_WLL_JOB_DONE) ? edg_wll_done_codeToString(states[k][i].done_code) : "");
+                                       for (j=0; states[k][j].state != EDG_WLL_JOB_UNDEF; j++) {
+                                               if (states[k][j].parent_job) {
+                                                       char *par_id = edg_wlc_JobIdUnparse(states[k][j].parent_job);
+                                                       
+                                                       if (!strcmp(id,par_id)) {
+                                                               char *sub_id = edg_wlc_JobIdUnparse(states[k][j].jobId),
+                                                                    *sub_st = edg_wll_StatToString(states[k][j].state);
+                                                               
+                                                               printf(" `-       %s .... %s %s\n", sub_id, sub_st, (states[k][j].state==EDG_WLL_JOB_DONE) ? edg_wll_done_codeToString(states[k][j].done_code) : "");
+                                                               free(sub_id);
+                                                               free(sub_st);
+                                                       }
+                                                       free(par_id);
+                                               }       
+                                       }
+                               }
+                       }
+                               
+                       free(id);
+                       free(st);
+               }
+       }
+
+       printf("\nFound %d jobs\n",i);
+
+err:
+       if  (jobs) {
+               for (k=0; k < no_of_runs; k++) {
+                       if (jobs[k])
+                               for (i=0; jobs[k][i]; i++)  edg_wlc_JobIdFree(jobs[i]); 
+               }
+               free(jobs);
+       }
+
+       if  (states) {
+               for (k=0; k < no_of_runs; k++) {
+                       if (states[k])
+                               for (i=0; states[k][i].state; i++)  edg_wll_FreeStatus(&states[i]);     
+               }
+               free(states);
+       }
+
+       for (k=0; k < no_of_runs; k++) {
+               if (edg_wll_Error(p_ctx[k],&errt,&errd)) {
+                       fprintf(stderr,"%s: %s (%s)\n",argv[0],errt,errd);
+                       return 1;
+               }
+       }
+
+
+       for (k=0; k < no_of_runs; k++) {
+               edg_wll_FreeContext(p_ctx[k]);
+       }
+
+       return 0;
+}
+

diff --git a/org.glite.lb.client/src/connection.c b/org.glite.lb.client/src/connection.c
index 87b681d..d2adcf6 100644 (file)
--- a/org.glite.lb.client/src/connection.c
+++ b/org.glite.lb.client/src/connection.c
@@ -68,8 +68,9 @@ int ConnectionIndex(edg_wll_Context ctx, const char *name, int port)
                     !strcmp(name, ctx->connections->connPool[i].peerName) &&   // Server names must be equal
                   (port == ctx->connections->connPool[i].peerPort) &&          // Ports must be equal
                        (!using_certfile ||                                     // we are either using the default cert file
-                               ((ctx->connections->connPool[i].certfile->st_ino == statinfo.st_ino) &&  // or checking which file
-                                (ctx->connections->connPool[i].certfile->st_dev == statinfo.st_dev)))) { // this conn uses to auth.
+                               ((ctx->connections->connPool[i].certfile) &&    // or checking which file
+                                (ctx->connections->connPool[i].certfile->st_ino == statinfo.st_ino) &&  // this conn
+                                (ctx->connections->connPool[i].certfile->st_dev == statinfo.st_dev)))) { // uses to auth.
 
 
                        /* TryLock (next line) is in fact used only