From: Aleš Křenek Date: Thu, 14 Jun 2007 10:53:49 +0000 (+0000) Subject: padding between fleshes in edg_wll_EventCode X-Git-Tag: glite-lb-build_R_1_6_0_1~54 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=92e35b59eb114229ab38b5e8ac4773bfb292378e;p=jra1mw.git padding between fleshes in edg_wll_EventCode --- diff --git a/org.glite.lb.client-interface/interface/events.h.T b/org.glite.lb.client-interface/interface/events.h.T index f9f5693..4b6326d 100644 --- a/org.glite.lb.client-interface/interface/events.h.T +++ b/org.glite.lb.client-interface/interface/events.h.T @@ -43,11 +43,22 @@ typedef enum _edg_wll_EventCode { /** invalid code, e.g. uninitialized variable */ EDG_WLL_EVENT_UNDEF = 0, @@@{ +my $flesh = 'gLite'; #XXX +my $fleshno = 0; +my $eventno = $fleshno; for my $e (sort { $event->{order}->{$a} <=> $event->{order}->{$b} } $event->getTypes) { my $u = uc $e; my $c = getTypeComment $event $e; - gen "\tEDG_WLL_EVENT_$u,\t/**< $c */\n"; + + if ($flesh ne $event->{flesh}->{$e}) { + $flesh = $event->{flesh}->{$e}; + gen "/* new flesh $flesh */\n"; + $fleshno += 100; + $eventno = $fleshno; + } + $eventno++; + gen "\tEDG_WLL_EVENT_$u = $eventno,\t/**< $c */\n"; } @@@} EDG_WLL_EVENT__LAST, /**< last currently supported event code */ diff --git a/org.glite.lb.client/src/args.c.T b/org.glite.lb.client/src/args.c.T index f7ed2ed..d140c2f 100644 --- a/org.glite.lb.client/src/args.c.T +++ b/org.glite.lb.client/src/args.c.T @@ -228,6 +228,7 @@ static void read_event(const edg_wll_Args* o, char* arg, char* par) // list type int i; printf("Available events: extra options\n"); +/* XXX: holes in edg_wll_EventCode */ for (i = EDG_WLL_EVENT_UNDEF + 1; i < EDG_WLL_EVENT__LAST; i++) { char* e = edg_wll_EventToString(i); diff --git a/org.glite.lb.common/src/events.c.T b/org.glite.lb.common/src/events.c.T index 7d62fd9..a0be7d6 100644 --- a/org.glite.lb.common/src/events.c.T +++ b/org.glite.lb.common/src/events.c.T @@ -21,9 +21,28 @@ static const struct timeval null_timeval = {0,0}; static const char *eventNames[] = { "Undefined", @@@{ +my $flesh = 'gLite'; #XXX +my $fleshno = 0; +my $eventno = $fleshno; + for my $e (sort { $event->{order}->{$a} <=> $event->{order}->{$b} } $event->getTypes) { - gen "\t\"$e\",\n"; + + if ($flesh ne $event->{flesh}->{$e}) { + $flesh = $event->{flesh}->{$e}; + $fleshno += 100; + + gen "\t"; + while ($eventno < $fleshno) { + gen "NULL, "; + $eventno++; + if (($eventno % 10) == 0) { gen "\n\t"; } + } + gen "\n"; + } + + $eventno++; + gen "\t\"$e\", /* $eventno */\n"; } @@@} "SysCmpStat",