imported CE statistics

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index f3abc86..3fde357 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -107,7 +107,7 @@ LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS}
 INSTALL:=libtool --mode=install install
 
 LIBOBJS:=connection.o consumer.o notification.o prod_proto.o \
-       producer.o uiwrap.o
+       producer.o uiwrap.o statistics.o
 FAKELIBOBJS:=consumer_fake.o producer_fake.o
 
 PLUSOBJS:=Event.o Job.o JobStatus.o Notification.o ServerConnection.o
@@ -135,7 +135,7 @@ PLUSLIB:=libglite_lb_clientpp_${nothrflavour}.la
 THRPLUSLIB:=libglite_lb_clientpp_${thrflavour}.la
 
 TOOLS:=dump load purge
-EXAMPLES:=log_usertag_proxy job_log job_reg feed_shark notify query_ext query_seq_code
+EXAMPLES:=log_usertag_proxy job_log job_reg feed_shark notify query_ext query_seq_code stats
 FAKE_EXAMPLES:=job_log_fake
 
 version_info=-version-info `echo ${version} | cut -d. -f1,2 | tr . :`

diff --git a/org.glite.lb.client/examples/stats.c b/org.glite.lb.client/examples/stats.c
new file mode 100644 (file)
index 0000000..2f32cc6
--- /dev/null
+++ b/org.glite.lb.client/examples/stats.c
@@ -0,0 +1,82 @@
+#include <stdio.h>
+#include <time.h>
+#include <string.h>
+
+#include "glite/lb/statistics.h"
+
+
+int main(int argc,char **argv)
+{
+       edg_wll_Context ctx;
+       edg_wll_QueryRec        group[2];
+       time_t  now,from,to;
+       char    *cfrom,*cto;
+       int     from_res,to_res;
+       float   val;
+
+
+       edg_wll_InitContext(&ctx);
+
+       if (argc != 2) { 
+               fprintf(stderr,"usage: %s <CE name>\n",argv[0]);
+               return 1;
+       }       
+
+/* the only supported grouping for now */
+       group[0].attr = EDG_WLL_QUERY_ATTR_DESTINATION;
+       group[0].op = EDG_WLL_QUERY_OP_EQUAL;
+       group[0].value.c = argv[1];
+       group[1].attr = EDG_WLL_QUERY_ATTR_UNDEF;
+
+
+       time(&now);
+       to = now;
+       from = now - 60;
+       
+/* not implemented yet
+       if (edg_wll_StateDuration(ctx,group,EDG_WLL_JOB_SCHEDULED,0,
+                               &from,&to,&val,&from_res,&to_res))
+       {
+               char    *et,*ed;
+               edg_wll_Error(ctx,&et,&ed);
+               fprintf(stderr,"edg_wll_StateDuration(): %s, %s\n",et,ed);
+               return 1;
+       }
+
+       cfrom = strdup(ctime(&from));
+       cto = strdup(ctime(&to));
+       cfrom[strlen(cfrom)-1] = 0;
+       cto[strlen(cto)-1] = 0;
+
+       printf("Average queue traversal time at \"%s\": %f s\n"
+              "  Measuered from %s to %s\n"
+              "  With resolution from %d to %d s\n",
+              argv[1],val,cfrom,cto,from_res,to_res);
+
+*/
+
+       to = now;
+       from = now - 60;
+
+       if (edg_wll_StateRate(ctx,group,EDG_WLL_JOB_DONE,EDG_WLL_STAT_FAILED,
+                               &from,&to,&val,&from_res,&to_res))
+       {
+               char    *et,*ed;
+               edg_wll_Error(ctx,&et,&ed);
+               fprintf(stderr,"edg_wll_StateRate(): %s, %s\n",et,ed);
+               return 1;
+       }
+
+       cfrom = strdup(ctime(&from));
+       cto = strdup(ctime(&to));
+       cfrom[strlen(cfrom)-1] = 0;
+       cto[strlen(cto)-1] = 0;
+
+       printf("Average failure rate at \"%s\": %f jobs/s\n"
+              "  Measuered from %s to %s\n"
+              "  With resolution from %d to %d s\n",
+              argv[1],val,cfrom,cto,from_res,to_res);
+
+       return 0;
+}
+

diff --git a/org.glite.lb.client/src/statistics.c b/org.glite.lb.client/src/statistics.c
new file mode 100644 (file)
index 0000000..9e59484
--- /dev/null
+++ b/org.glite.lb.client/src/statistics.c
@@ -0,0 +1,186 @@
+#ident "$Header$"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+
+#include "glite/lb/statistics.h"
+#include "glite/lb/context.h"
+#include "glite/lb/context-int.h"
+#include "glite/lb/xml_parse.h"
+#include "glite/lb/mini_http.h"
+
+#include "connection.h"
+
+
+
+static const char* const request_headers[] = {
+       "Cache-Control: no-cache",
+       "Accept: application/x-dglb",
+       "User-Agent: edg_wll_Api/" PROTO_VERSION "/" COMP_PROTO,
+       "Content-Type: application/x-dglb",
+       NULL
+};
+
+static int set_server_name_and_port(edg_wll_Context, const edg_wll_QueryRec **);
+
+
+
+/** Count the number of jobs which entered the specified state.
+ */
+
+int edg_wll_StateRate(
+       edg_wll_Context ctx,
+       const edg_wll_QueryRec  *group,
+       edg_wll_JobStatCode     major,
+       int                     minor,
+       time_t  *from, 
+       time_t  *to,
+       float   *rate,
+       int     *res_from,
+       int     *res_to)
+
+{      
+       char    *response = NULL, *send_mess = NULL, *message = NULL;
+       float   not_returned;
+       
+       
+       edg_wll_ResetError(ctx);
+
+       edg_wll_StatsRequestToXML(ctx, "Rate", group, major, minor, from, to, &send_mess);
+       
+       if (set_server_name_and_port(ctx, NULL))
+               goto err;
+
+       ctx->p_tmp_timeout = ctx->p_query_timeout;
+
+       if (edg_wll_http_send_recv(ctx, "POST /statsRequest HTTP/1.1",request_headers, send_mess,
+                       &response,NULL,&message)) 
+               goto err;
+         
+       if (http_check_status(ctx,response))
+               goto err;
+
+       edg_wll_ParseStatsResult(ctx,message, from, to, rate, 
+                       &not_returned, res_from, res_to);
+
+err:
+       free(response);
+       free(message);
+
+       return edg_wll_Error(ctx,NULL,NULL);
+}
+
+
+
+/** Compute average time for which jobs stay in the specified state.
+ */
+
+int edg_wll_StateDuration(
+       edg_wll_Context ctx,
+       const edg_wll_QueryRec  *group,
+       edg_wll_JobStatCode     major,
+       int                     minor,
+       time_t  *from, 
+       time_t  *to,
+       float   *duration,
+       int     *res_from,
+       int     *res_to)
+{
+       char    *response = NULL, *send_mess = NULL, *message = NULL;
+       float   not_returned;
+       
+       
+       edg_wll_ResetError(ctx);
+
+       edg_wll_StatsRequestToXML(ctx, "Duration", group, major, minor, from, to, &send_mess);
+       
+       if (set_server_name_and_port(ctx, NULL))
+               goto err;
+
+       ctx->p_tmp_timeout = ctx->p_query_timeout;
+
+       if (edg_wll_http_send_recv(ctx, "POST /statsRequest HTTP/1.1",request_headers, send_mess,
+                       &response,NULL,&message)) 
+               goto err;
+         
+       if (http_check_status(ctx,response))
+               goto err;
+
+       edg_wll_ParseStatsResult(ctx,message, from, to, &not_returned, 
+                       duration, res_from, res_to);
+
+err:
+       free(response);
+       free(message);
+
+       return edg_wll_Error(ctx,NULL,NULL);
+}
+
+
+
+static int set_server_name_and_port(edg_wll_Context ctx, const edg_wll_QueryRec **job_conditions)
+{
+       int                             i = 0, j,
+                                       found = 0,
+                                       error = 0;
+       int                             srvPort = 0,
+                                       srvPortTmp;
+       char               *srvName = NULL,
+                                  *srvNameTmp;
+
+
+       if ( job_conditions ) for ( j = 0; job_conditions[j]; j++ )
+               for ( i = 0; (job_conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
+                       if ( job_conditions[j][i].attr == EDG_WLL_QUERY_ATTR_JOBID)
+                       {
+                               edg_wlc_JobIdGetServerParts(job_conditions[j][i].value.j,&srvNameTmp,&srvPortTmp);
+                               if ( found )
+                               {
+                                       if ( strcmp(srvName, srvNameTmp) || (srvPort != srvPortTmp) )
+                                       {
+                                               free(srvNameTmp); free(srvName);
+                                               return edg_wll_SetError(ctx, EINVAL, "Two different servers specifieed in one query");
+                                       }
+                                       free(srvNameTmp);
+                               }
+                               else
+                               {
+                                       srvName = srvNameTmp;
+                                       srvPort = srvPortTmp;
+                                       found = 1;
+                               }
+                       }       
+
+       if ( found && !ctx->p_query_server_override)
+       { 
+               if (!ctx->srvName)
+               {
+                       ctx->srvName = strdup(srvName);
+                       ctx->srvPort = srvPort;
+                       free(srvName);
+               }
+               else if (strcmp(srvName, ctx->srvName) || (srvPort != ctx->srvPort))
+               {
+                       free(ctx->srvName);
+                       ctx->srvName = strdup(srvName);
+                       ctx->srvPort = srvPort;
+                       free(srvName);
+               }
+       }
+       else if ( !ctx->srvName || !ctx->srvPort )
+       {
+               if (!ctx->p_query_server) 
+                       return(edg_wll_SetError(ctx, (edg_wll_ErrorCode) EINVAL, "Hostname of server to query is not set"));
+               else ctx->srvName = strdup(ctx->p_query_server);
+               if (!ctx->p_query_server_port)
+                       return(edg_wll_SetError(ctx, (edg_wll_ErrorCode) EINVAL, "Port of server to query is not set"));
+               else ctx->srvPort = ctx->p_query_server_port;
+       }
+               
+       return(error);
+}
+
+