#include <stdlib.h>
#include <fcntl.h>
-#include "ustcomm.h"
-#include "ustcmd.h"
+#include "ust/ustcmd.h"
#include "usterr.h"
enum command {
GET_ONLINE_PIDS,
SET_SUBBUF_SIZE,
SET_SUBBUF_NUM,
+ GET_SUBBUF_SIZE,
+ GET_SUBBUF_NUM,
+ GET_SOCK_PATH,
+ SET_SOCK_PATH,
+ FORCE_SWITCH,
UNKNOWN
};
--destroy-trace\t\t\tDestroy the trace\n\
--set-subbuf-size \"CHANNEL/bytes\"\tSet the size of subbuffers per channel\n\
--set-subbuf-num \"CHANNEL/n\"\tSet the number of subbuffers per channel\n\
+ --set-sock-path\t\t\tSet the path of the daemon socket\n\
+ --get-subbuf-size \"CHANNEL\"\t\tGet the size of subbuffers per channel\n\
+ --get-subbuf-num \"CHANNEL\"\t\tGet the number of subbuffers per channel\n\
+ --get-sock-path\t\t\tGet the path of the daemon socket\n\
--enable-marker \"CHANNEL/MARKER\"\tEnable a marker\n\
--disable-marker \"CHANNEL/MARKER\"\tDisable a marker\n\
--list-markers\t\t\tList the markers of the process, their\n\t\t\t\t\t state and format string\n\
+ --force-switch\t\t\tForce a subbuffer switch\n\
\
");
}
{ "online-pids", 0, 0, GET_ONLINE_PIDS },
{ "set-subbuf-size", 1, 0, SET_SUBBUF_SIZE },
{ "set-subbuf-num", 1, 0, SET_SUBBUF_NUM },
+ { "get-subbuf-size", 1, 0, GET_SUBBUF_SIZE },
+ { "get-subbuf-num", 1, 0, GET_SUBBUF_NUM },
+ { "get-sock-path", 0, 0, GET_SOCK_PATH },
+ { "set-sock-path", 1, 0, SET_SOCK_PATH },
+ { "force-switch", 0, 0, FORCE_SWITCH },
{ 0, 0, 0, 0 }
};
case DISABLE_MARKER:
case SET_SUBBUF_SIZE:
case SET_SUBBUF_NUM:
+ case GET_SUBBUF_SIZE:
+ case GET_SUBBUF_NUM:
+ case SET_SOCK_PATH:
opts->regex = strdup(optarg);
break;
if (argc - optind > 0 && opts->cmd != GET_ONLINE_PIDS) {
int i;
int pididx=0;
- opts->pids = malloc((argc-optind+1) * sizeof(pid_t));
+ opts->pids = zmalloc((argc-optind+1) * sizeof(pid_t));
for(i=optind; i<argc; i++) {
/* don't take any chances, use a long long */
{
pid_t *pidit;
int result;
+ int retval = EXIT_SUCCESS;
+ char *tmp;
struct ust_opts opts;
progname = argv[0];
result = ustcmd_create_trace(*pidit);
if (result) {
ERR("error while trying to create trace with PID %u\n", (unsigned int) *pidit);
+ retval = EXIT_FAILURE;
break;
}
break;
result = ustcmd_start_trace(*pidit);
if (result) {
ERR("error while trying to for trace with PID %u\n", (unsigned int) *pidit);
+ retval = EXIT_FAILURE;
break;
}
break;
result = ustcmd_stop_trace(*pidit);
if (result) {
ERR("error while trying to stop trace for PID %u\n", (unsigned int) *pidit);
+ retval = EXIT_FAILURE;
break;
}
break;
result = ustcmd_destroy_trace(*pidit);
if (result) {
ERR("error while trying to destroy trace with PID %u\n", (unsigned int) *pidit);
+ retval = EXIT_FAILURE;
break;
}
break;
case LIST_MARKERS:
cmsf = NULL;
if (ustcmd_get_cmsf(&cmsf, *pidit)) {
- fprintf(stderr,
- "error while trying to list markers for"
- " PID %u\n", (unsigned int) *pidit);
+ ERR("error while trying to list markers for PID %u\n", (unsigned int) *pidit);
+ retval = EXIT_FAILURE;
break;
}
unsigned int i = 0;
break;
case ENABLE_MARKER:
- if(opts.regex)
- ustcmd_set_marker_state(opts.regex, 1, *pidit);
+ if (opts.regex) {
+ if (ustcmd_set_marker_state(opts.regex, 1, *pidit)) {
+ ERR("error while trying to enable marker %s with PID %u\n",
+ opts.regex, (unsigned int) *pidit);
+ retval = EXIT_FAILURE;
+ }
+ }
break;
case DISABLE_MARKER:
- if(opts.regex)
- ustcmd_set_marker_state(opts.regex, 0, *pidit);
+ if (opts.regex) {
+ if (ustcmd_set_marker_state(opts.regex, 0, *pidit)) {
+ ERR("error while trying to disable marker %s with PID %u\n",
+ opts.regex, (unsigned int) *pidit);
+ retval = EXIT_FAILURE;
+ }
+ }
break;
case SET_SUBBUF_SIZE:
- ustcmd_set_subbuf_size(opts.regex, *pidit);
+ if (opts.regex) {
+ if (ustcmd_set_subbuf_size(opts.regex, *pidit)) {
+ ERR("error while trying to set the size of subbuffers with PID %u\n",
+ (unsigned int) *pidit);
+ retval = EXIT_FAILURE;
+ }
+ }
break;
case SET_SUBBUF_NUM:
- ustcmd_set_subbuf_num(opts.regex, *pidit);
+ if (opts.regex) {
+ if (ustcmd_set_subbuf_num(opts.regex, *pidit)) {
+ ERR("error while trying to set the number of subbuffers with PID %u\n",
+ (unsigned int) *pidit);
+ retval = EXIT_FAILURE;
+ }
+ }
+ break;
+
+ case GET_SUBBUF_SIZE:
+ result = ustcmd_get_subbuf_size(opts.regex, *pidit);
+ if (result == -1) {
+ ERR("error while trying to get_subuf_size with PID %u\n", (unsigned int) *pidit);
+ retval = EXIT_FAILURE;
+ break;
+ }
+
+ printf("the size of subbufers is %d\n", result);
+ break;
+
+ case GET_SUBBUF_NUM:
+ result = ustcmd_get_subbuf_num(opts.regex, *pidit);
+ if (result == -1) {
+ ERR("error while trying to get_subuf_num with PID %u\n", (unsigned int) *pidit);
+ retval = EXIT_FAILURE;
+ break;
+ }
+
+ printf("the number of subbufers is %d\n", result);
break;
case ALLOC_TRACE:
result = ustcmd_alloc_trace(*pidit);
if (result) {
ERR("error while trying to alloc trace with PID %u\n", (unsigned int) *pidit);
+ retval = EXIT_FAILURE;
+ }
+ break;
+
+ case GET_SOCK_PATH:
+ result = ustcmd_get_sock_path(&tmp, *pidit);
+ if (result) {
+ ERR("error while trying to get sock path for PID %u\n", (unsigned int) *pidit);
+ retval = EXIT_FAILURE;
break;
}
+ printf("the socket path is %s\n", tmp);
+ free(tmp);
+ break;
+
+ case SET_SOCK_PATH:
+ result = ustcmd_set_sock_path(opts.regex, *pidit);
+ if (result) {
+ ERR("error while trying to set sock path for PID %u\n", (unsigned int) *pidit);
+ retval = EXIT_FAILURE;
+ }
+ break;
+
+ case FORCE_SWITCH:
+ result = ustcmd_force_switch(*pidit);
+ if (result) {
+ ERR("error while trying to force switch for PID %u\n", (unsigned int) *pidit);
+ retval = EXIT_FAILURE;
+ }
break;
default:
ERR("unknown command\n");
- break;
+ retval = EXIT_FAILURE;
+ break;
}
pidit++;
free(opts.regex);
}
- return 0;
+ return retval;
}
projects / ust.git / blobdiff