marker_iter_start(&iter);
while(iter.marker) {
- fprintf(fp, "marker: %s/%s %d \"%s\"\n", iter.marker->channel, iter.marker->name, (int)imv_read(iter.marker->state), iter.marker->format);
+ fprintf(fp, "marker: %s/%s %d \"%s\" %p\n", iter.marker->channel, iter.marker->name, (int)imv_read(iter.marker->state), iter.marker->format, iter.marker->location);
marker_iter_next(&iter);
}
unlock_markers();
have_listener = 1;
}
-/* The signal handler itself. Signals must be setup so there cannot be
- nested signals. */
-
-void sighandler(int sig)
-{
- DBG("sighandler");
-
- if(!have_listener) {
- create_listener();
- }
-}
-
-/* Called by the app signal handler to chain it to us. */
-
-void chain_signal(void)
-{
- sighandler(USTSIGNAL);
-}
-
static int init_socket(void)
{
return ustcomm_init_app(getpid(), &ustcomm_app);
}
-static int init_signal_handler(void)
-{
- /* Attempt to handler SIGIO. If the main program wants to
- * handle it, fine, it'll override us. They it'll have to
- * use the chaining function.
- */
-
- int result;
- struct sigaction act;
-
- result = sigemptyset(&act.sa_mask);
- if(result == -1) {
- PERROR("sigemptyset");
- return -1;
- }
-
- act.sa_handler = sighandler;
- act.sa_flags = SA_RESTART;
-
- /* Only defer ourselves. Also, try to restart interrupted
- * syscalls to disturb the traced program as little as possible.
- */
- result = sigaction(SIGIO, &act, NULL);
- if(result == -1) {
- PERROR("sigaction");
- return -1;
- }
-
- return 0;
-}
-
#define AUTOPROBE_DISABLED 0
#define AUTOPROBE_ENABLE_ALL 1
#define AUTOPROBE_ENABLE_REGEX 2
if(result && result != -EEXIST)
ERR("ltt_marker_connect (marker = %s/%s, errno = %d)", m->channel, m->name, -result);
- DBG("auto connected marker %s %s to probe default", m->channel, m->name);
+ DBG("auto connected marker %s (addr: %p) %s to probe default", m->channel, m, m->name);
}
ERR("init_socket error");
return;
}
- result = init_signal_handler();
- if(result == -1) {
- ERR("init_signal_handler error");
- return;
- }
+
+ create_listener();
autoprobe_val = getenv("UST_AUTOPROBE");
if(autoprobe_val) {