-/* Copyright (C) 2009 Pierre-Marc Fournier
+/*
+ * Copyright (C) 2009 Pierre-Marc Fournier
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
#include <signal.h>
#include <ust/marker.h>
+#include <ust/ustctl.h>
#include "usterr.h"
#include "tp.h"
-#include "tracer.h"
void inthandler(int sig)
{
struct sigaction act;
result = sigemptyset(&act.sa_mask);
- if(result == -1) {
+ if (result == -1) {
PERROR("sigemptyset");
return -1;
}
* syscalls to disturb the traced program as little as possible.
*/
result = sigaction(SIGINT, &act, NULL);
- if(result == -1) {
+ if (result == -1) {
PERROR("sigaction");
return -1;
}
printf("Hello, World!\n");
sleep(1);
- for(i=0; i<50; i++) {
- trace_mark(ust, bar, "str %s", "FOOBAZ");
- trace_mark(ust, bar2, "number1 %d number2 %d", 53, 9800);
- trace_hello_tptest(i);
+ for (i = 0; i < 50; i++) {
+ ust_marker(bar, "str %s", "FOOBAZ");
+ ust_marker(bar2, "number1 %d number2 %d", 53, 9800);
+ tracepoint(hello_tptest, i);
usleep(100000);
}
- scanf("%*s");
+ if (scanf("%*s") == EOF)
+ PERROR("scanf failed");
- ltt_trace_stop("auto");
- ltt_trace_destroy("auto", 0);
+ ustctl_stop_trace(getpid(), "auto");
+ ustctl_destroy_trace(getpid(), "auto");
DBG("TRACE STOPPED");
- scanf("%*s");
+ if (scanf("%*s") == EOF)
+ PERROR("scanf failed");
return 0;
}