From: František Dvořák <valtri@civ.zcu.cz>
Date: Wed, 22 Jun 2011 16:34:02 +0000 (+0000)
Subject: Use less memory on server during query, when states are not requested, SB #46437.
X-Git-Tag: glite-lbjp-common_R_3_0_8_1~27
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=a0d242624b9e3ddf73de503142262d8af186bd69;p=jra1mw.git

Use less memory on server during query, when states are not requested, SB #46437.
---

diff --git a/org.glite.lb.client/examples/user_jobs.c b/org.glite.lb.client/examples/user_jobs.c
index f50e853..8518349 100644
--- a/org.glite.lb.client/examples/user_jobs.c
+++ b/org.glite.lb.client/examples/user_jobs.c
@@ -20,6 +20,7 @@ limitations under the License.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <getopt.h>
 
 #include "glite/lb/context.h"
 #include "glite/lb/xml_conversions.h"
@@ -31,13 +32,27 @@ limitations under the License.
 
 int use_proxy = 0;
 
+static const char *get_opt_string = "hxn";
+
+static struct option opts[] = {
+	{"help",	0,	NULL,	'h'},
+	{"proxy",	0,	NULL,	'x'},
+	{"no-states",	0,	NULL,	'n'},
+	{NULL,	0,	NULL,	0}
+};
+
 int (*user_jobs)(edg_wll_Context, edg_wlc_JobId **, edg_wll_JobStat **);
 
 
 void
 usage(char *me)
 {
-	fprintf(stderr,"usage: %s [-h] [-x] [userid]\n", me);
+	fprintf(stderr,"usage: %s [options] [userid]\n"
+		"\t-h, --help     	show this help\n"
+		"\t-x, --proxy    	contact proxy\n"
+		"\t-n, --no-states	do not show job states"
+		"\n",
+		me);
 }
 
 int main(int argc,char **argv)
@@ -46,21 +61,31 @@ int main(int argc,char **argv)
 	char		*errt,*errd;
 	edg_wlc_JobId		*jobs = NULL;
 	edg_wll_JobStat		*states = NULL;
-	int		i,j;
+	int		opt,i,j;
 	char 		*owner = NULL;
+	int		show_states = 1;
 
 	user_jobs = edg_wll_UserJobs;
-	for ( i = 1; i < argc; i++ ) {
-		if ( !strcmp(argv[i], "-h") || !strcmp(argv[i], "--help") ) {
+
+	while ((opt = getopt_long(argc, argv, get_opt_string, opts, NULL)) != EOF) {
+		switch (opt) {
+		case 'h':
 			usage(argv[0]);
 			exit(0);
-		} else if ( !strcmp(argv[i], "-x") ) {
+		case 'x':
 			user_jobs = edg_wll_UserJobsProxy;
-			continue;
+			break;
+		case 'n':
+			show_states = 0;
+			break;
+		default:
+			if (owner || !optarg) {
+				usage(argv[0]);
+				exit(1);
+			}
+			owner = strdup(optarg);
+			break;
 		}
-
-		owner = strdup(argv[i]);
-		break; 	
 	}
 
 	if (edg_wll_InitContext(&ctx) != 0) {
@@ -70,8 +95,8 @@ int main(int argc,char **argv)
 	if ( user_jobs == edg_wll_UserJobsProxy  && owner )
 		edg_wll_SetParam(ctx, EDG_WLL_PARAM_LBPROXY_USER, owner);
 
-	if (user_jobs(ctx,&jobs,&states)) goto err;
- 	for (i=0; states[i].state != EDG_WLL_JOB_UNDEF; i++) {	
+	if (user_jobs(ctx,&jobs,show_states ? &states : NULL)) goto err;
+ 	for (i=0; states && states[i].state != EDG_WLL_JOB_UNDEF; i++) {
 		char *id = edg_wlc_JobIdUnparse(states[i].jobId),
 		     *st = edg_wll_StatToString(states[i].state);
 		
@@ -103,6 +128,13 @@ int main(int argc,char **argv)
 		free(id);
 		free(st);
 	}
+	if (!show_states) {
+		for (i = 0; jobs[i]; i++) {
+			char *id = edg_wlc_JobIdUnparse(jobs[i]);
+			printf("	%s\n", id);
+			free(id);
+		}
+	}
 
 	printf("\nFound %d jobs\n",i);
 
diff --git a/org.glite.lb.server/src/lb_proto.c b/org.glite.lb.server/src/lb_proto.c
index 17ceb6f..247c369 100644
--- a/org.glite.lb.server/src/lb_proto.c
+++ b/org.glite.lb.server/src/lb_proto.c
@@ -931,10 +931,8 @@ edg_wll_ErrorCode edg_wll_Proto(edg_wll_Context ctx,
 						retCode;
  
 				if (flags & EDG_WLL_STAT_NO_JOBS) { 
-					flags -= EDG_WLL_STAT_NO_JOBS;
 					jobsOut = NULL;
 					if (flags & EDG_WLL_STAT_NO_STATES) {
-						flags -= EDG_WLL_STAT_NO_STATES;
 						statesOut = NULL;
 						retCode = edg_wll_QueryJobsServer(ctx, (const edg_wll_QueryRec **)conditions, flags, NULL, NULL);
 					}
@@ -943,7 +941,6 @@ edg_wll_ErrorCode edg_wll_Proto(edg_wll_Context ctx,
 				}
 				else {
 					if (flags & EDG_WLL_STAT_NO_STATES) {
-						flags -= EDG_WLL_STAT_NO_STATES;
 						statesOut = NULL;
 						retCode = edg_wll_QueryJobsServer(ctx, (const edg_wll_QueryRec **)conditions, flags, &jobsOut, NULL);
 					}
diff --git a/org.glite.lb.server/src/query.c b/org.glite.lb.server/src/query.c
index 1020b5e..9fcda60 100644
--- a/org.glite.lb.server/src/query.c
+++ b/org.glite.lb.server/src/query.c
@@ -349,6 +349,7 @@ typedef struct {
 	glite_jobid_t *jobs;
 	edg_wll_JobStat *states;
 	size_t maxn, n;
+	int flags;
 } queryjobs_cb_data_t;
 
 
@@ -364,15 +365,19 @@ static int queryjobs_cb(edg_wll_Context ctx, glite_jobid_t jobid, edg_wll_JobSta
 			return edg_wll_SetError(ctx, errno ? : ENOMEM, NULL);
 		store->jobs = tmp;
 
-		if ((tmp = realloc(store->states, maxn * sizeof(*store->states))) == NULL)
-			return edg_wll_SetError(ctx, errno ? : ENOMEM, NULL);
-		store->states = tmp;
+		if (!(store->flags & EDG_WLL_STAT_NO_STATES)) {
+			if ((tmp = realloc(store->states, maxn * sizeof(*store->states))) == NULL)
+				return edg_wll_SetError(ctx, errno ? : ENOMEM, NULL);
+			store->states = tmp;
+		}
 
 		store->maxn = maxn;
 	}
 	store->jobs[n] = jobid;
-	if (status) store->states[n] = *status;
-	else memset(&store->states[n], 0, sizeof(*store->states));
+	if (!(store->flags & EDG_WLL_STAT_NO_STATES)) {
+		if (status) store->states[n] = *status;
+		else memset(&store->states[n], 0, sizeof(*store->states));
+	}
 	store->n++;
 
 	return 0;
@@ -390,6 +395,7 @@ int edg_wll_QueryJobsServer(
 	size_t i;
 
 	memset(&store, 0, sizeof store);
+	store.flags = flags;
 	if (edg_wll_QueryJobsServerStream(ctx, conditions, flags, queryjobs_cb, &store))
 		goto cleanup;