diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/ivyperf.c | 5 | ||||
-rw-r--r-- | tools/ivyprobe.c | 10 | ||||
-rw-r--r-- | tools/ivythroughput.cpp | 5 |
3 files changed, 11 insertions, 9 deletions
diff --git a/tools/ivyperf.c b/tools/ivyperf.c index 07453e3..8babd35 100644 --- a/tools/ivyperf.c +++ b/tools/ivyperf.c @@ -76,7 +76,7 @@ void TimerCall(TimerId id, void *user_data, unsigned long delta) if ( count == 0 ) fprintf(stderr, "." ); } -void binCB( IvyClientPtr app, void *user_data, int id, char* regexp, IvyBindEvent event ) +void binCB( IvyClientPtr app, void *user_data, int id, const char* regexp, IvyBindEvent event ) { char *app_name = IvyGetApplicationName( app ); switch ( event ) @@ -87,6 +87,9 @@ void binCB( IvyClientPtr app, void *user_data, int id, char* regexp, IvyBindEve case IvyRemoveBind: printf("Application:%s bind '%s' REMOVED\n", app_name, regexp ); break; + case IvyChangeBind: + printf("Application:%s bind '%s' CHANGED\n", app_name, regexp ); + break; case IvyFilterBind: printf("Application:%s bind '%s' FILTRED\n", app_name, regexp ); break; diff --git a/tools/ivyprobe.c b/tools/ivyprobe.c index ed16455..a70d1bb 100644 --- a/tools/ivyprobe.c +++ b/tools/ivyprobe.c @@ -147,14 +147,14 @@ void HandleStdin (Channel channel, HANDLE fd, void *data) arg = strtok (NULL, "'"); Chop(arg); if (arg) { - IvyBinding bind; + IvyBinding binding; const char *errbuf; int erroffset; - bind = IvyBindingCompile(arg, & erroffset, & errbuf); - if (bind==NULL) { + binding = IvyBindingCompile(arg, & erroffset, & errbuf); + if (binding==NULL) { printf("Error compiling '%s', %s, not bound\n", arg, errbuf); } else { - IvyBindingFree( bind ); + IvyBindingFree( binding ); IvyBindMsg (Callback, NULL, arg); } } @@ -249,7 +249,7 @@ void ApplicationCallback (IvyClientPtr app, void *user_data, IvyApplicationEvent break; } } -void IvyPrintBindCallback( IvyClientPtr app, void *user_data, int id, char* regexp, IvyBindEvent event) +void IvyPrintBindCallback( IvyClientPtr app, void *user_data, int id, const char* regexp, IvyBindEvent event) { switch ( event ) { case IvyAddBind: diff --git a/tools/ivythroughput.cpp b/tools/ivythroughput.cpp index 513e6eb..1803e66 100644 --- a/tools/ivythroughput.cpp +++ b/tools/ivythroughput.cpp @@ -86,8 +86,7 @@ bool getMessages (const char*fileName, ListOfString &messages, unsigned int numM bool getRegexps (const char*fileName, ListOfString ®exps, unsigned int numReg); double currentTime(); -void binCB( IvyClientPtr app, void *user_data, int id, char* regexp, IvyBindEvent event ) ; -void binCBR( IvyClientPtr app, void *user_data, int id, char* regexp, IvyBindEvent event ) ; +void binCB( IvyClientPtr app, void *user_data, int id, const char* regexp, IvyBindEvent event ) ; void congestCB ( IvyClientPtr app, void *user_data, IvyApplicationEvent event ) ; void stopCB (TimerId id, void *user_data, unsigned long delta); void sendAllMessageCB (TimerId id, void *user_data, unsigned long delta); @@ -442,7 +441,7 @@ double currentTime() # | |_) | | | | | | | | |____ | |_) | # |_.__/ |_| |_| |_| \_____| |____/ */ -void binCB( IvyClientPtr app, void *user_data, int id, char* regexp, IvyBindEvent event ) +void binCB( IvyClientPtr app, void *user_data, int id, const char* regexp, IvyBindEvent event ) { string appName = IvyGetApplicationName( app ); static MapBindByClnt bindByClnt; |