#include <getopt.h>
#include <stdlib.h>
#include <fcntl.h>
-#include <regex.h>
#include "ustcomm.h"
#include "ustcmd.h"
+#include "usterr.h"
enum command {
START_TRACE,
struct ust_opts {
enum command cmd;
pid_t *pids;
- char* regex;
- regex_t preg;
- int regex_state;
+ char *regex;
};
char *progname = NULL;
opts->pids = NULL;
opts->regex = NULL;
- opts->regex_state = -1;
while (1) {
int option_index = 0;
opts->pids = malloc((argc-optind+1) * sizeof(pid_t));
for(i=optind; i<argc; i++) {
- opts->pids[pididx++] = atoi(argv[i]);
+ /* don't take any chances, use a long long */
+ long long tmp;
+ char *endptr;
+ tmp = strtoull(argv[i], &endptr, 10);
+ if(*endptr != '\0') {
+ ERR("The pid \"%s\" is invalid.", argv[i]);
+ return 1;
+ }
+ opts->pids[pididx++] = (pid_t) tmp;
}
opts->pids[pididx] = -1;
}
- if (opts->cmd == ENABLE_MARKER || opts->cmd == DISABLE_MARKER) {
- if (opts->regex_state = regcomp(&opts->preg, opts->regex, 0)) {
- fprintf(stderr, "Invalid regular expression.\n");
- }
- }
-
return 0;
}
-static void regex_change_m_state(struct ust_opts* opts, pid_t pid) {
- struct USTcmd_cmsf* cmsf = NULL;
- unsigned int i = 0;
- int e = (opts->cmd == ENABLE_MARKER);
-
- if (opts->regex_state != 0) {
- return;
- }
-
- if (ustcmd_get_cmsf(&cmsf, pid)) {
- fprintf(stderr, "error while trying to get markers for PID "
- "%u\n", (unsigned int) pid);
- return;
- }
- while (cmsf[i].channel != NULL) {
- char* mc;
- asprintf(&mc, "%s/%s", cmsf[i].channel, cmsf[i].marker);
- if (regexec(&opts->preg, mc, 0, NULL, 0) == 0) {
- /* We got a match! */
- if (ustcmd_set_marker_state(mc,
- e ? USTCMD_MS_ON : USTCMD_MS_OFF, pid)) {
- fprintf(stderr,
- "error while trying to %sable marker"
- "\"%s\" for PID %u\n",
- e ? "en" : "dis", mc,
- (unsigned int) pid);
- } else {
- printf("sucessfully %sabled marker "
- "\"%s\" for PID %u\n",
- e ? "en" : "dis", mc,
- (unsigned int) pid);
- }
- }
- free(mc);
- ++i;
- }
- ustcmd_free_cmsf(cmsf);
-}
-
int main(int argc, char *argv[])
{
pid_t *pidit;
- struct ustcomm_connection conn;
int result;
struct ust_opts opts;
result = parse_opts_long(argc, argv, &opts);
if(result) {
+ fprintf(stderr, "\n");
usage();
exit(EXIT_FAILURE);
}
exit(EXIT_FAILURE);
}
if (opts.cmd == GET_ONLINE_PIDS) {
- pid_t* pp = ustcmd_get_online_pids();
+ pid_t *pp = ustcmd_get_online_pids();
unsigned int i = 0;
if (pp) {
}
pidit = opts.pids;
- struct USTcmd_cmsf* cmsf = NULL;
+ struct marker_status *cmsf = NULL;
while(*pidit != -1) {
switch (opts.cmd) {
case START_TRACE:
- if (ustcmd_start_trace(*pidit)) {
- fprintf(stderr,
- "error while trying to for trace "
- "with PID %u\n", (unsigned int) *pidit);
+ result = ustcmd_start_trace(*pidit);
+ if (result) {
+ ERR("error while trying to for trace with PID %u\n", (unsigned int) *pidit);
+ break;
+ }
+ //printf("sucessfully started trace for PID %u\n", (unsigned int) *pidit);
break;
- }
- printf("sucessfully started trace for PID %u\n",
- (unsigned int) *pidit);
- break;
case STOP_TRACE:
- if (ustcmd_stop_trace(*pidit)) {
- fprintf(stderr,
- "error while trying to stop trace "
- "for PID %u\n", (unsigned int) *pidit);
+ result = ustcmd_stop_trace(*pidit);
+ if (result) {
+ ERR("error while trying to stop trace for PID %u\n", (unsigned int) *pidit);
+ break;
+ }
+ //printf("sucessfully stopped trace for PID %u\n", (unsigned int) *pidit);
break;
- }
- printf("sucessfully stopped trace for PID %u\n",
- (unsigned int) *pidit);
- break;
case START:
- if (ustcmd_setup_and_start(*pidit)) {
- fprintf(stderr,
- "error while trying to setup/start "
- "trace for PID %u\n",
- (unsigned int) *pidit);
+ result = ustcmd_setup_and_start(*pidit);
+ if (result) {
+ ERR("error while trying to setup/start trace for PID %u\n", (unsigned int) *pidit);
+ break;
+ }
+ //printf("sucessfully setup/started trace for PID %u\n", (unsigned int) *pidit);
break;
- }
- printf("sucessfully setup/started trace for PID %u\n",
- (unsigned int) *pidit);
- break;
case DESTROY:
- if (ustcmd_destroy_trace(*pidit)) {
- fprintf(stderr,
- "error while trying to destroy "
- "trace with PID %u\n",
- (unsigned int) *pidit);
+ result = ustcmd_destroy_trace(*pidit);
+ if (result) {
+ ERR("error while trying to destroy trace with PID %u\n", (unsigned int) *pidit);
+ break;
+ }
+ //printf("sucessfully destroyed trace for PID %u\n", (unsigned int) *pidit);
break;
- }
- printf("sucessfully destroyed trace for PID %u\n",
- (unsigned int) *pidit);
- 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);
+ cmsf = NULL;
+ if (ustcmd_get_cmsf(&cmsf, *pidit)) {
+ fprintf(stderr,
+ "error while trying to list markers for"
+ " PID %u\n", (unsigned int) *pidit);
+ break;
+ }
+ unsigned int i = 0;
+ while (cmsf[i].channel != NULL) {
+ printf("{PID: %u, channel/marker: %s/%s, "
+ "state: %u, fmt: %s}\n",
+ (unsigned int) *pidit,
+ cmsf[i].channel,
+ cmsf[i].marker,
+ cmsf[i].state,
+ cmsf[i].fs);
+ ++i;
+ }
+ ustcmd_free_cmsf(cmsf);
break;
- }
- unsigned int i = 0;
- while (cmsf[i].channel != NULL) {
- printf("{PID: %u, channel/marker: %s/%s, "
- "state: %u, fs: %s}\n",
- (unsigned int) *pidit,
- cmsf[i].channel,
- cmsf[i].marker,
- cmsf[i].state,
- cmsf[i].fs);
- ++i;
- }
- ustcmd_free_cmsf(cmsf);
- break;
case ENABLE_MARKER:
+ if(opts.regex)
+ ustcmd_set_marker_state(opts.regex, 1, *pidit);
+ break;
case DISABLE_MARKER:
- regex_change_m_state(&opts, *pidit);
- break;
+ if(opts.regex)
+ ustcmd_set_marker_state(opts.regex, 0, *pidit);
+ break;
default:
- fprintf(stderr, "error: unknown command...\n");
+ ERR("unknown command\n");
break;
}
pidit++;
}
- exit_free:
if (opts.pids != NULL) {
free(opts.pids);
}
projects / ust.git / blobdiff