* [PATCH 1/3] trace-cmd: move *_tracing_file into trace-util.c
2011-01-04 20:43 trace-cmd: fix python bindings Darren Hart
@ 2011-01-04 20:43 ` Darren Hart
2011-01-04 20:43 ` [PATCH 2/3] trace-cmd: move trace-usage to lib objects Darren Hart
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Darren Hart @ 2011-01-04 20:43 UTC (permalink / raw)
To: Linux Kernel Mailing List, Steven Rostedt, Tom Zanussi
Cc: Darren Hart, Steven Rostedt, Tom Zanussi
Make tracecmd_(get|put)_tracing_file available to shared objects, such
the python ctracecmd.so module generated by the SWIG mechanism.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Steven Rostedt <rostedt@goodmis.org>
CC: Tom Zanussi <tom.zanussi@intel.com>
---
trace-cmd.c | 111 +++++++++++++++++++--------------------------------------
trace-util.c | 24 ++++++++++++
2 files changed, 61 insertions(+), 74 deletions(-)
diff --git a/trace-cmd.c b/trace-cmd.c
index f8992a8..293bb98 100644
--- a/trace-cmd.c
+++ b/trace-cmd.c
@@ -55,19 +55,6 @@
int silence_warnings;
int show_status;
-static char *get_tracing_file(const char *name);
-static void put_tracing_file(char *file);
-
-char *tracecmd_get_tracing_file(const char *name)
-{
- return get_tracing_file(name);
-}
-
-void tracecmd_put_tracing_file(char *name)
-{
- put_tracing_file(name);
-}
-
static int tracing_on_init_val;
static int rt_prio;
@@ -305,11 +292,11 @@ static void clear_trace(void)
char *path;
/* reset the trace */
- path = get_tracing_file("trace");
+ path = tracecmd_get_tracing_file("trace");
fp = fopen(path, "w");
if (!fp)
die("writing to '%s'", path);
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
fwrite("0", 1, 1, fp);
fclose(fp);
}
@@ -320,11 +307,11 @@ static void reset_max_latency(void)
char *path;
/* reset the trace */
- path = get_tracing_file("tracing_max_latency");
+ path = tracecmd_get_tracing_file("tracing_max_latency");
fp = fopen(path, "w");
if (!fp)
die("writing to '%s'", path);
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
fwrite("0", 1, 1, fp);
fclose(fp);
}
@@ -335,7 +322,7 @@ static void update_ftrace_pid(const char *pid)
int ret;
int fd;
- path = get_tracing_file("set_ftrace_pid");
+ path = tracecmd_get_tracing_file("set_ftrace_pid");
if (!path)
return;
@@ -399,30 +386,6 @@ void run_cmd(int argc, char **argv)
waitpid(pid, &status, 0);
}
-static char *get_tracing_file(const char *name)
-{
- static const char *tracing;
- char *file;
-
- if (!tracing) {
- tracing = tracecmd_find_tracing_dir();
- if (!tracing)
- die("Can't find tracing dir");
- }
-
- file = malloc_or_die(strlen(tracing) + strlen(name) + 2);
- if (!file)
- return NULL;
-
- sprintf(file, "%s/%s", tracing, name);
- return file;
-}
-
-static void put_tracing_file(char *file)
-{
- free(file);
-}
-
static void show_events(void)
{
char buf[BUFSIZ];
@@ -430,11 +393,11 @@ static void show_events(void)
FILE *fp;
size_t n;
- path = get_tracing_file("available_events");
+ path = tracecmd_get_tracing_file("available_events");
fp = fopen(path, "r");
if (!fp)
die("reading %s", path);
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
do {
n = fread(buf, 1, BUFSIZ, fp);
@@ -451,11 +414,11 @@ static void show_plugins(void)
FILE *fp;
size_t n;
- path = get_tracing_file("available_tracers");
+ path = tracecmd_get_tracing_file("available_tracers");
fp = fopen(path, "r");
if (!fp)
die("reading %s", path);
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
do {
n = fread(buf, 1, BUFSIZ, fp);
@@ -470,11 +433,11 @@ static void set_plugin(const char *name)
FILE *fp;
char *path;
- path = get_tracing_file("current_tracer");
+ path = tracecmd_get_tracing_file("current_tracer");
fp = fopen(path, "w");
if (!fp)
die("writing to '%s'", path);
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
fwrite(name, 1, strlen(name), fp);
fclose(fp);
@@ -487,11 +450,11 @@ static void show_options(void)
FILE *fp;
size_t n;
- path = get_tracing_file("trace_options");
+ path = tracecmd_get_tracing_file("trace_options");
fp = fopen(path, "r");
if (!fp)
die("reading %s", path);
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
do {
n = fread(buf, 1, BUFSIZ, fp);
@@ -516,11 +479,11 @@ static void set_option(const char *option)
FILE *fp;
char *path;
- path = get_tracing_file("trace_options");
+ path = tracecmd_get_tracing_file("trace_options");
fp = fopen(path, "w");
if (!fp)
die("writing to '%s'", path);
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
fwrite(option, 1, strlen(option), fp);
fclose(fp);
@@ -548,11 +511,11 @@ static void old_update_events(const char *name, char update)
name = "*:*";
/* need to use old way */
- path = get_tracing_file("set_event");
+ path = tracecmd_get_tracing_file("set_event");
fp = fopen(path, "w");
if (!fp)
die("opening '%s'", path);
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
/* Disable the event with "!" */
if (update == '0')
@@ -611,13 +574,13 @@ static int update_glob(const char *name, const char *filter,
len = strlen(name) + strlen("events//enable") + 1;
str = malloc_or_die(len);
snprintf(str, len, "events/%s/enable", name);
- path = get_tracing_file(str);
+ path = tracecmd_get_tracing_file(str);
free(str);
globbuf.gl_offs = 0;
printf("path = %s\n", path);
ret = glob(path, GLOB_ONLYDIR, NULL, &globbuf);
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
if (ret < 0)
return 0;
@@ -660,11 +623,11 @@ static void filter_all_systems(const char *filter)
int ret;
int i;
- path = get_tracing_file("events/*/filter");
+ path = tracecmd_get_tracing_file("events/*/filter");
globbuf.gl_offs = 0;
ret = glob(path, 0, NULL, &globbuf);
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
if (ret < 0)
die("No filters found");
@@ -689,12 +652,12 @@ static void update_event(const char *name, const char *filter,
int ret2;
/* Check if the kernel has the events/enable file */
- path = get_tracing_file("events/enable");
+ path = tracecmd_get_tracing_file("events/enable");
ret = stat(path, &st);
if (ret < 0) {
if (filter_only)
return;
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
/* old kernel */
old_update_events(name, update);
return;
@@ -713,14 +676,14 @@ static void update_event(const char *name, const char *filter,
filter_all_systems("0");
if (filter_only) {
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
return;
}
fp = fopen(path, "w");
if (!fp)
die("writing to '%s'", path);
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
ret = fwrite(&update, 1, 1, fp);
fclose(fp);
if (ret < 0)
@@ -740,7 +703,7 @@ static void update_event(const char *name, const char *filter,
if (!strlen(ptr) || strcmp(ptr, "*") == 0) {
ret = update_glob(str, filter, filter_only, update);
free(str);
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
if (!ret)
goto fail;
return;
@@ -785,9 +748,9 @@ static void check_tracing_enabled(void)
char *path;
if (fd < 0) {
- path = get_tracing_file("tracing_enabled");
+ path = tracecmd_get_tracing_file("tracing_enabled");
fd = open(path, O_WRONLY);
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
if (fd < 0)
return;
@@ -805,11 +768,11 @@ static int open_tracing_on(void)
if (fd >= 0)
return fd;
- path = get_tracing_file("tracing_on");
+ path = tracecmd_get_tracing_file("tracing_on");
fd = open(path, O_RDWR);
if (fd < 0)
die("opening '%s'", path);
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
tracing_on_fd = fd;
return fd;
@@ -892,7 +855,7 @@ static void update_filter(const char *event_name, const char *field,
strlen("events//filter") + 1);
sprintf(filter_name, "events/%s/filter", event_name);
- path = get_tracing_file(filter_name);
+ path = tracecmd_get_tracing_file(filter_name);
free(filter_name);
/* Ignore if file does not exist */
@@ -928,7 +891,7 @@ static void update_filter(const char *event_name, const char *field,
free(filter);
out:
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
}
static void update_pid_event_filters(const char *pid)
@@ -1321,7 +1284,7 @@ static int trace_empty(void)
* that is without a '#' the trace is not empty.
* Otherwise it is.
*/
- path = get_tracing_file("trace");
+ path = tracecmd_get_tracing_file("trace");
fp = fopen(path, "r");
if (!fp)
die("reading '%s'", path);
@@ -1334,7 +1297,7 @@ static int trace_empty(void)
}
} while (line && n > 0);
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
fclose(fp);
@@ -1347,7 +1310,7 @@ static void write_func_file(const char *file, struct func_list **list)
char *path;
int fd;
- path = get_tracing_file(file);
+ path = tracecmd_get_tracing_file(file);
fd = open(path, O_WRONLY | O_TRUNC);
if (fd < 0)
@@ -1363,7 +1326,7 @@ static void write_func_file(const char *file, struct func_list **list)
close(fd);
free:
- put_tracing_file(path);
+ tracecmd_put_tracing_file(path);
}
static void set_funcs(void)
@@ -1398,7 +1361,7 @@ void set_buffer_size(void)
snprintf(buf, BUFSIZ, "%d", buffer_size);
- path = get_tracing_file("buffer_size_kb");
+ path = tracecmd_get_tracing_file("buffer_size_kb");
fd = open(path, O_WRONLY);
if (fd < 0)
die("can't open %s", path);
diff --git a/trace-util.c b/trace-util.c
index 9e0ceca..970e6bc 100644
--- a/trace-util.c
+++ b/trace-util.c
@@ -830,3 +830,27 @@ void tracecmd_unload_plugins(struct plugin_list *plugin_list)
free(list);
}
}
+
+char *tracecmd_get_tracing_file(const char *name)
+{
+ static const char *tracing;
+ char *file;
+
+ if (!tracing) {
+ tracing = tracecmd_find_tracing_dir();
+ if (!tracing)
+ die("Can't find tracing dir");
+ }
+
+ file = malloc_or_die(strlen(tracing) + strlen(name) + 2);
+ if (!file)
+ return NULL;
+
+ sprintf(file, "%s/%s", tracing, name);
+ return file;
+}
+
+void tracecmd_put_tracing_file(char *name)
+{
+ free(name);
+}
--
1.7.1
^ permalink raw reply [flat|nested] 5+ messages in thread