From 766632ac8aaf679fc27e8acc39b1550cb8a82672 Mon Sep 17 00:00:00 2001 From: compudj Date: Wed, 20 Dec 2006 17:51:50 +0000 Subject: [PATCH] update ioctl git-svn-id: http://ltt.polymtl.ca/svn@2311 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt-control/configure.in | 2 +- ltt-control/liblttctl/liblttctl.c | 8 ++++---- ltt-control/liblttctl/lttctl.h | 1 - ltt-control/lttd/lttd.c | 8 ++++---- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ltt-control/configure.in b/ltt-control/configure.in index c766ee5..8f59e32 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.32-05122006) +AM_INIT_AUTOMAKE(ltt-control,0.33-20122006) AM_CONFIG_HEADER(config.h) AM_PROG_LIBTOOL diff --git a/ltt-control/liblttctl/liblttctl.c b/ltt-control/liblttctl/liblttctl.c index 4690d7b..61bca62 100644 --- a/ltt-control/liblttctl/liblttctl.c +++ b/ltt-control/liblttctl/liblttctl.c @@ -107,7 +107,7 @@ static ssize_t lttctl_netlink_sendto(const struct lttctl_handle *h, const void *msg, size_t len) { int status = sendto(h->fd, msg, len, 0, - (struct sockaddr *)&h->peer, sizeof(h->peer)); + (struct sockaddr *)&h->peer, sizeof(h->peer)); if (status < 0) lttctl_errno = LTTCTL_ERR_SEND; @@ -172,7 +172,7 @@ static ssize_t lttctl_netlink_recvfrom(const struct lttctl_handle *h, } } status = recvfrom(h->fd, buf, len, 0, - (struct sockaddr *)&h->peer, &addrlen); + (struct sockaddr *)&h->peer, &addrlen); if (status < 0) { lttctl_errno = LTTCTL_ERR_RECV; @@ -450,12 +450,12 @@ int lttctl_stop(const struct lttctl_handle *h, { struct { struct nlmsghdr nlh; - lttctl_peer_msg_t msg; + lttctl_peer_msg_t msg; } req; struct { struct nlmsghdr nlh; struct nlmsgerr nlerr; - lttctl_peer_msg_t msg; + lttctl_peer_msg_t msg; } ack; int err; diff --git a/ltt-control/liblttctl/lttctl.h b/ltt-control/liblttctl/lttctl.h index 8dae012..053c0f4 100644 --- a/ltt-control/liblttctl/lttctl.h +++ b/ltt-control/liblttctl/lttctl.h @@ -96,5 +96,4 @@ int lttctl_stop(const struct lttctl_handle *handle, char *name); #define LTTCTLM_BASE 0x10 #define LTTCTLM_CONTROL (LTTCTLM_BASE + 1) /* LTT control message */ - #endif //_LIBLTT_H diff --git a/ltt-control/lttd/lttd.c b/ltt-control/lttd/lttd.c index 1d17090..3498342 100644 --- a/ltt-control/lttd/lttd.c +++ b/ltt-control/lttd/lttd.c @@ -41,13 +41,13 @@ #include /* Get the next sub buffer that can be read. */ -#define RELAY_GET_SUBBUF _IOR(0xF4, 0x00,__u32) +#define RELAY_GET_SUBBUF _IOR(0xF5, 0x00,__u32) /* Release the oldest reserved (by "get") sub buffer. */ -#define RELAY_PUT_SUBBUF _IOW(0xF4, 0x01,__u32) +#define RELAY_PUT_SUBBUF _IOW(0xF5, 0x01,__u32) /* returns the number of sub buffers in the per cpu channel. */ -#define RELAY_GET_N_SUBBUFS _IOR(0xF4, 0x02,__u32) +#define RELAY_GET_N_SUBBUFS _IOR(0xF5, 0x02,__u32) /* returns the size of the sub buffers. */ -#define RELAY_GET_SUBBUF_SIZE _IOR(0xF4, 0x03,__u32) +#define RELAY_GET_SUBBUF_SIZE _IOR(0xF5, 0x03,__u32) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) #include -- 2.34.1