#include <lttng/session.h>
#include <lttng/tracker.h>
-#define MESSAGE_PREFIX "[lttng-ptrace] "
+#define MESSAGE_PREFIX "[lttng-trace] "
#define NR_HANDLES 2
#ifndef PTRACE_EVENT_STOP
#endif
#define PERROR(msg) perror(msg "\n")
-#define ERR(fmt, args...) fprintf(stderr, fmt, ## args)
+#define ERR(fmt, args...) fprintf(stderr, fmt "\n", ## args)
#ifdef DEBUG
-#define DBG(fmt, args...) printf(fmt, ## args)
+#define DBG(fmt, args...) printf(fmt "\n", ## args)
#else
#define DBG(fmt, args...)
#endif
}
static
-int lttng_trace_ctx_init(struct lttng_trace_ctx *ctx)
+int lttng_trace_ctx_init(struct lttng_trace_ctx *ctx, const char *cmd_name)
{
- pid_t pid;
- char pid_str[12];
- int ret;
char datetime[16];
struct tm *timeinfo;
strcpy(ctx->session_name, session_name);
} else {
memset(ctx, 0, sizeof(*ctx));
- strcpy(ctx->session_name, "lttng-ptrace-");
- pid = getpid();
- ret = sprintf(pid_str, "%d", (int) pid);
- if (ret < 0)
- return -1;
- strcat(ctx->session_name, pid_str);
+ strncpy(ctx->session_name, cmd_name, LTTNG_NAME_MAX - 1);
+ ctx->session_name[LTTNG_NAME_MAX - 1] = '\0';
strcat(ctx->session_name, "-");
strcat(ctx->session_name, datetime);
}
}
strcpy(ctx->path, output_path);
} else {
- strcpy(ctx->path, "/tmp/lttng-ptrace/");
+ strcpy(ctx->path, "/tmp/lttng-trace/");
strcat(ctx->path, ctx->session_name);
}
return 0;
return EXIT_SUCCESS;
}
- if (lttng_trace_ctx_init(&ptrace_ctx))
+ if (lttng_trace_ctx_init(&ptrace_ctx, argv[skip_args]))
abort();
act.sa_sigaction = sighandler;
}
fprintf(stderr, "%sTracing session `%s` created. It can be customized using the `lttng` command.\n", MESSAGE_PREFIX, ptrace_ctx.session_name);
if (!opt_no_pause) {
- fprintf(stderr, "Press <ENTER> key when ready to run the child process.\n");
+ fprintf(stderr, "%sPress <ENTER> key when ready to run the child process.\n", MESSAGE_PREFIX);
getchar();
}