From c2ffa20f31e1587187810c98c2294ce94134b30e Mon Sep 17 00:00:00 2001 From: compudj Date: Sat, 16 Sep 2006 07:27:24 +0000 Subject: [PATCH] update ltt-control for debugfs git-svn-id: http://ltt.polymtl.ca/svn@2113 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt-control/configure.in | 2 +- ltt-control/lttctl/lttctl.c | 2 +- ltt-control/lttctl/lttctl_distributed.sh | 4 ++-- ltt-control/lttd/lttd.c | 28 ++++++++++++------------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ltt-control/configure.in b/ltt-control/configure.in index a916aa6..74a7ab5 100644 --- a/ltt-control/configure.in +++ b/ltt-control/configure.in @@ -23,7 +23,7 @@ AC_PREREQ(2.57) AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS) #AC_WITH_LTDL # not needed ? -AM_INIT_AUTOMAKE(ltt-control,0.21-13092006) +AM_INIT_AUTOMAKE(ltt-control,0.22-16092006) AM_CONFIG_HEADER(config.h) AM_PROG_LIBTOOL diff --git a/ltt-control/lttctl/lttctl.c b/ltt-control/lttctl/lttctl.c index fc865b1..45a2ff7 100644 --- a/ltt-control/lttctl/lttctl.c +++ b/ltt-control/lttctl/lttctl.c @@ -81,7 +81,7 @@ void show_arguments(void) printf(" (for hybrid traces)\n"); printf("-t Trace root path. (ex. /root/traces/example_trace)\n"); printf("-T Type of trace (ex. relay)\n"); - printf("-l LTT channels root path. (ex. /mnt/relayfs/ltt)\n"); + printf("-l LTT channels root path. (ex. /mnt/debugfs/ltt)\n"); printf("-Z Size of the low data rate subbuffers (will be rounded to next page size)\n"); printf("-X Number of low data rate subbuffers\n"); printf("-V Size of the medium data rate subbuffers (will be rounded to next page size)\n"); diff --git a/ltt-control/lttctl/lttctl_distributed.sh b/ltt-control/lttctl/lttctl_distributed.sh index d7c982c..4e75182 100644 --- a/ltt-control/lttctl/lttctl_distributed.sh +++ b/ltt-control/lttctl/lttctl_distributed.sh @@ -42,12 +42,12 @@ UDP_SERVER=udpserver UDP_CLIENT=udpclient PATH_TRACE=/root/trace-ltt/ -PATH_RELAYFS=/relayfs/ltt/ +PATH_DEBUGFS=/debugfs/ltt/ SET_LTT_FACILITIES="export LTT_FACILITIES=/home/ercle/NEW_GENERATION_LTTV/share/LinuxTraceToolkitViewer/facilities/" SET_LTT_DAEMON="export LTT_DAEMON=/home/ercle/NEW_GENERATION_LTTV/bin/lttd" START_DAEMON="/home/ercle/NEW_GENERATION_LTTV/bin/lttctl -d -n \ -trace1 -t $PATH_TRACE -l $PATH_RELAYFS >/dev/null" +trace1 -t $PATH_TRACE -l $PATH_DEBUGFS >/dev/null" STOP_DAEMON="/home/ercle/NEW_GENERATION_LTTV/bin/lttctl -n trace1 -q >/dev/null" REMOVE_DAEMON="/home/ercle/NEW_GENERATION_LTTV/bin/lttctl -n trace1 -r >/dev/null" diff --git a/ltt-control/lttd/lttd.c b/ltt-control/lttd/lttd.c index e931df5..c2b0826 100644 --- a/ltt-control/lttd/lttd.c +++ b/ltt-control/lttd/lttd.c @@ -2,8 +2,8 @@ * * Linux Trace Toolkit Daemon * - * This is a simple daemon that reads a few relayfs channels and save them in a - * trace. + * This is a simple daemon that reads a few relay+debugfs channels and save + * them in a trace. * * * Copyright 2005 - @@ -36,13 +36,13 @@ #include /* Get the next sub buffer that can be read. */ -#define RELAYFS_GET_SUBBUF _IOR(0xF4, 0x00,__u32) +#define RELAY_GET_SUBBUF _IOR(0xF4, 0x00,__u32) /* Release the oldest reserved (by "get") sub buffer. */ -#define RELAYFS_PUT_SUBBUF _IOW(0xF4, 0x01,__u32) +#define RELAY_PUT_SUBBUF _IOW(0xF4, 0x01,__u32) /* returns the number of sub buffers in the per cpu channel. */ -#define RELAYFS_GET_N_SUBBUFS _IOR(0xF4, 0x02,__u32) +#define RELAY_GET_N_SUBBUFS _IOR(0xF4, 0x02,__u32) /* returns the size of the sub buffers. */ -#define RELAYFS_GET_SUBBUF_SIZE _IOR(0xF4, 0x03,__u32) +#define RELAY_GET_SUBBUF_SIZE _IOR(0xF4, 0x03,__u32) @@ -79,7 +79,7 @@ static int dump_normal_only = 0; /* Args : * * -t directory Directory name of the trace to write to. Will be created. - * -c directory Root directory of the relayfs trace channels. + * -c directory Root directory of the debugfs trace channels. * -d Run in background (daemon). * -a Trace append mode. * -s Send SIGUSR1 to parent when ready for IO. @@ -90,7 +90,7 @@ void show_arguments(void) printf("\n"); printf("-t directory Directory name of the trace to write to.\n" " It will be created.\n"); - printf("-c directory Root directory of the relayfs trace channels.\n"); + printf("-c directory Root directory of the debugfs trace channels.\n"); printf("-d Run in background (daemon).\n"); printf("-a Append to an possibly existing trace.\n"); printf("-N Number of threads to start.\n"); @@ -186,7 +186,7 @@ void show_info(void) { printf("Linux Trace Toolkit Trace Daemon\n"); printf("\n"); - printf("Reading from relayfs directory : %s\n", channel_name); + printf("Reading from debugfs directory : %s\n", channel_name); printf("Writing to trace directory : %s\n", trace_name); printf("\n"); } @@ -334,7 +334,7 @@ int read_subbuffer(struct fd_pair *pair) int err, ret=0; - err = ioctl(pair->channel, RELAYFS_GET_SUBBUF, + err = ioctl(pair->channel, RELAY_GET_SUBBUF, &consumed_old); printf("cookie : %u\n", consumed_old); if(err != 0) { @@ -362,7 +362,7 @@ int read_subbuffer(struct fd_pair *pair) } #endif //0 write_error: - err = ioctl(pair->channel, RELAYFS_PUT_SUBBUF, &consumed_old); + err = ioctl(pair->channel, RELAY_PUT_SUBBUF, &consumed_old); if(err != 0) { ret = errno; if(errno == EFAULT) { @@ -395,13 +395,13 @@ int map_channels(struct channel_trace_fd *fd_pairs) for(i=0;inum_pairs;i++) { struct fd_pair *pair = &fd_pairs->pair[i]; - ret = ioctl(pair->channel, RELAYFS_GET_N_SUBBUFS, + ret = ioctl(pair->channel, RELAY_GET_N_SUBBUFS, &pair->n_subbufs); if(ret != 0) { perror("Error in getting the number of subbuffers"); goto end; } - ret = ioctl(pair->channel, RELAYFS_GET_SUBBUF_SIZE, + ret = ioctl(pair->channel, RELAY_GET_SUBBUF_SIZE, &pair->subbuf_size); if(ret != 0) { perror("Error in getting the size of the subbuffers"); @@ -480,7 +480,7 @@ int unmap_channels(struct channel_trace_fd *fd_pairs) * * Thread worker. * - * Read the relayfs channels and write them in the paired tracefiles. + * Read the debugfs channels and write them in the paired tracefiles. * * @fd_pairs : paired channels and trace files. * -- 2.34.1