From: Jiří Filipovič <fila@ics.muni.cz>
Date: Tue, 12 Oct 2010 12:49:33 +0000 (+0000)
Subject: - fixed double free
X-Git-Tag: glite-lb-client_R_4_1_5_1~21
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=52fd2c0b2e9e13d28c0b80e377788175ff84b734;p=jra1mw.git

- fixed double free
- longer statistics
- new states transition
---

diff --git a/org.glite.lb.server/src/stats.c b/org.glite.lb.server/src/stats.c
index d1d8273..41edb2e 100644
--- a/org.glite.lb.server/src/stats.c
+++ b/org.glite.lb.server/src/stats.c
@@ -48,6 +48,7 @@ static struct _edg_wll_StatsArchive default_archives[] = {
 	{ 10, 60 },
 	{ 60, 30 },
 	{ 900, 12 },
+	{ 3600, 168 },
 	{ 0, 0 }
 };
 
@@ -67,6 +68,7 @@ static edg_wll_Stats default_stats[] = {
 	{ STATS_DURATION_FROMTO, default_group, EDG_WLL_JOB_SUBMITTED, EDG_WLL_JOB_RUNNING, 0, default_archives },
 	{ STATS_DURATION_FROMTO, default_group, EDG_WLL_JOB_SUBMITTED, EDG_WLL_JOB_DONE, EDG_WLL_STAT_OK, default_archives },
         { STATS_DURATION_FROMTO, default_group, EDG_WLL_JOB_SUBMITTED, EDG_WLL_JOB_DONE, EDG_WLL_STAT_FAILED, default_archives },
+	{ STATS_DURATION_FROMTO, default_group, EDG_WLL_JOB_SCHEDULED, EDG_WLL_JOB_RUNNING, 0, default_archives },
         { STATS_DURATION_FROMTO, default_group, EDG_WLL_JOB_RUNNING, EDG_WLL_JOB_DONE, EDG_WLL_STAT_OK, default_archives },
         { STATS_DURATION_FROMTO, default_group, EDG_WLL_JOB_RUNNING, EDG_WLL_JOB_DONE, EDG_WLL_STAT_FAILED, default_archives },
 	{ STATS_UNDEF, }
@@ -754,8 +756,8 @@ int edg_wll_StateRateServer(
 		}
 
 		if ((err = stateRateRequest(ctx, stats, g, from, to, &((*rates)[0]), res_from, res_to))){
-			free(*rates);
-                        free(*groups);
+			free(*rates); *rates = NULL;
+                        free(*groups); *groups = NULL;
 			goto cleanup;
 		}
 		(*groups)[0] = strdup(g->destination); 
@@ -987,9 +989,9 @@ int edg_wll_StateDurationFromToServer(
         	}
 
 		if ((err = stateDurationFromToRequest(ctx, stats, g, from, to, &((*durations)[0]), &((*dispersions)[0]), res_from, res_to))){
-			free(*durations);
-			free(*dispersions);
-			free(*groups);
+			free(*durations); *durations = NULL;
+			free(*dispersions); *dispersions = NULL;
+			free(*groups); *groups = NULL; 
 			goto cleanup;
 		}
 		(*groups)[0] = strdup(g->destination);