* block queue tracing application
*
* Copyright (C) 2005 Jens Axboe <axboe@suse.de>
+ * Copyright (C) 2006 Jens Axboe <axboe@kernel.dk>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "blktrace.h"
#include "barrier.h"
-static char blktrace_version[] = "0.99";
+static char blktrace_version[] = "0.99.3";
/*
* You may want to increase this even more, if you are logging at a high
#define OFILE_BUF (128 * 1024)
-#define RELAYFS_TYPE 0xF0B4A981
+#define DEBUGFS_TYPE 0x64626720
-#define S_OPTS "d:a:A:r:o:kw:Vb:n:D:lh:p:s"
+#define S_OPTS "d:a:A:r:o:kw:Vb:n:D:lh:p:sI:"
static struct option l_opts[] = {
{
.name = "dev",
.flag = NULL,
.val = 'd'
},
+ {
+ .name = "input-devs",
+ .has_arg = required_argument,
+ .flag = NULL,
+ .val = 'I'
+ },
{
.name = "act-mask",
.has_arg = required_argument,
.val = 'p'
},
{
- .name = "sendfile",
+ .name = "no-sendfile",
.has_arg = no_argument,
.flag = NULL,
.val = 's'
unsigned long fs_off;
void *fs_buf;
unsigned long fs_buf_len;
+
+ struct net_connection *nc;
};
struct device_information {
volatile int trace_started;
unsigned long drop_count;
struct thread_information *threads;
- struct net_connection *nc;
+ unsigned long buf_size;
+ unsigned long buf_nr;
+ unsigned int page_size;
+
+ struct cl_host *ch;
+ u32 cl_id;
+ time_t cl_connect_time;
};
static int ncpus;
static struct device_information *device_information;
/* command line option globals */
-static char *relay_path;
+static char *debugfs_path;
static char *output_name;
static char *output_dir;
static int act_mask = ~0U;
#define for_each_dip(__d, __i) \
__for_each_dip(__d, device_information, ndevs, __i)
#define for_each_nc_dip(__nc, __d, __i) \
- __for_each_dip(__d, (__nc)->device_information, (__nc)->ndevs, __i)
+ __for_each_dip(__d, (__nc)->ch->device_information, (__nc)->ch->ndevs, __i)
#define __for_each_tip(__d, __t, __ncpus, __j) \
for (__j = 0, __t = (__d)->threads; __j < __ncpus; __j++, __t++)
#define for_each_tip(__d, __t, __j) \
__for_each_tip(__d, __t, ncpus, __j)
+#define for_each_cl_host(__c) \
+ for (__c = cl_host_list; __c; __c = __c->list_next)
/*
* networking stuff follows. we include a magic number so we know whether
u32 cpu; /* for which cpu */
u32 max_cpus;
u32 len; /* length of following trace data */
+ u32 cl_id; /* id for set of client per-cpu connections */
+ u32 buf_size; /* client buf_size for this trace */
+ u32 buf_nr; /* client buf_nr for this trace */
+ u32 page_size; /* client page_size for this trace */
};
#define TRACE_NET_PORT (8462)
static char hostname[MAXHOSTNAMELEN];
static int net_port = TRACE_NET_PORT;
static int net_mode = 0;
-static int net_use_sendfile;
+static int net_use_sendfile = 1;
-struct net_connection {
- int in_fd;
- time_t connect_time;
+struct cl_host {
+ struct cl_host *list_next;
struct in_addr cl_in_addr;
+ struct net_connection *net_connections;
+ int nconn;
struct device_information *device_information;
int ndevs;
int ncpus;
- int connection_index;
+ int ndevs_done;
};
-#define NET_MAX_CONNECTIONS (1024)
-static struct net_connection net_connections[NET_MAX_CONNECTIONS];
+struct net_connection {
+ int in_fd;
+ struct pollfd pfd;
+ time_t connect_time;
+ struct cl_host *ch;
+ int ncpus;
+};
+
+#define NET_MAX_CL_HOSTS (1024)
+static struct cl_host *cl_host_list;
+static int cl_hosts;
static int net_connects;
-static int net_out_fd = -1;
+
+static int *net_out_fd;
static void handle_sigint(__attribute__((__unused__)) int sig)
{
char tmp[MAXPATHLEN + 64];
snprintf(tmp, sizeof(tmp), "%s/block/%s/dropped",
- relay_path, buts_name);
+ debugfs_path, buts_name);
fd = open(tmp, O_RDONLY);
if (fd < 0) {
struct blk_user_trace_setup buts;
memset(&buts, 0, sizeof(buts));
- buts.buf_size = buf_size;
- buts.buf_nr = buf_nr;
+ buts.buf_size = dip->buf_size;
+ buts.buf_nr = dip->buf_nr;
buts.act_mask = act_mask;
if (ioctl(dip->fd, BLKTRACESETUP, &buts) < 0) {
}
}
-static void wait_for_data(struct thread_information *tip, int events)
+static void wait_for_data(struct thread_information *tip, int timeout)
{
- struct pollfd pfd = { .fd = tip->fd, .events = events };
+ struct pollfd pfd = { .fd = tip->fd, .events = POLLIN };
- do {
- if (poll(&pfd, 1, 100) < 0) {
+ while (!is_done()) {
+ if (poll(&pfd, 1, timeout) < 0) {
perror("poll");
break;
}
- if (pfd.revents & events)
+ if (pfd.revents & POLLIN)
break;
if (tip->ofile_stdout)
break;
- } while (!is_done());
+ }
}
static int read_data_file(struct thread_information *tip, void *buf,
int ret = 0;
do {
- wait_for_data(tip, POLLIN);
+ wait_for_data(tip, 100);
ret = read(tip->fd, buf, len);
if (!ret)
static int read_data_net(struct thread_information *tip, void *buf,
unsigned int len)
{
- struct net_connection *nc = tip->device->nc;
+ struct net_connection *nc = tip->nc;
unsigned int bytes_left = len;
int ret = 0;
{
int ofd = fileno(tip->ofile);
int ret;
+ unsigned long nr;
/*
* extend file, if we have to. use chunks of 16 subbuffers.
*/
- if (tip->fs_off + buf_size > tip->fs_buf_len) {
+ if (tip->fs_off + maxlen > tip->fs_buf_len) {
if (tip->fs_buf) {
munlock(tip->fs_buf, tip->fs_buf_len);
munmap(tip->fs_buf, tip->fs_buf_len);
tip->fs_buf = NULL;
}
- tip->fs_off = tip->fs_size & (page_size - 1);
- tip->fs_buf_len = (16 * buf_size) - tip->fs_off;
+ tip->fs_off = tip->fs_size & (tip->device->page_size - 1);
+ nr = max(16, tip->device->buf_nr);
+ tip->fs_buf_len = (nr * tip->device->buf_size) - tip->fs_off;
tip->fs_max_size += tip->fs_buf_len;
if (ftruncate(ofd, tip->fs_max_size) < 0) {
struct tip_subbuf *ts = malloc(sizeof(*ts));
int ret;
- ts->buf = malloc(buf_size);
+ ts->buf = malloc(tip->device->buf_size);
ts->max_len = maxlen;
ret = tip->read_data(tip, ts->buf, ts->max_len);
ts->len = ret;
tip->data_read += ret;
if (subbuf_fifo_queue(tip, ts))
- return -1;
+ ret = -1;
}
- return ret;
-}
-
-static int get_subbuf_sendfile(struct thread_information *tip,
- unsigned int maxlen)
-{
- struct tip_subbuf *ts;
- struct stat sb;
- unsigned int ready;
-
- wait_for_data(tip, POLLMSG);
-
- /*
- * hack to get last data out, we can't use sendfile for that
- */
- if (is_done())
- return get_subbuf(tip, maxlen);
-
- if (fstat(tip->fd, &sb) < 0) {
- perror("trace stat");
- return -1;
- }
- ready = sb.st_size - tip->data_queued;
- if (!ready) {
- usleep(1000);
- return 0;
+ if (ret <= 0) {
+ free(ts->buf);
+ free(ts);
}
- ts = malloc(sizeof(*ts));
- ts->buf = NULL;
- ts->max_len = 0;
- ts->len = ready;
- tip->data_queued += ready;
-
- if (subbuf_fifo_queue(tip, ts))
- return -1;
-
- return ready;
+ return ret;
}
static void close_thread(struct thread_information *tip)
}
snprintf(tip->fn, sizeof(tip->fn), "%s/block/%s/trace%d",
- relay_path, tip->device->buts_name, tip->cpu);
+ debugfs_path, tip->device->buts_name, tip->cpu);
tip->fd = open(tip->fn, O_RDONLY);
if (tip->fd < 0) {
perror(tip->fn);
}
while (!is_done()) {
- if (tip->get_subbuf(tip, buf_size) < 0)
+ if (tip->get_subbuf(tip, tip->device->buf_size) < 0)
break;
}
/*
* trace is stopped, pull data until we get a short read
*/
- while (tip->get_subbuf(tip, buf_size) > 0)
+ while (tip->get_subbuf(tip, tip->device->buf_size) > 0)
;
tip_ftrunc_final(tip);
hdr.cpu = tip->cpu;
hdr.max_cpus = ncpus;
hdr.len = len;
-
- return write_data_net(net_out_fd, &hdr, sizeof(hdr));
+ hdr.cl_id = getpid();
+ hdr.buf_size = tip->device->buf_size;
+ hdr.buf_nr = tip->device->buf_nr;
+ hdr.page_size = tip->device->page_size;
+
+ return write_data_net(net_out_fd[tip->cpu], &hdr, sizeof(hdr));
}
/*
hdr.len = 0;
strcpy(hdr.buts_name, dip->buts_name);
hdr.cpu = get_dropped_count(dip->buts_name);
+ hdr.cl_id = getpid();
+ hdr.buf_size = dip->buf_size;
+ hdr.buf_nr = dip->buf_nr;
+ hdr.page_size = dip->page_size;
- write_data_net(net_out_fd, &hdr, sizeof(hdr));
+ write_data_net(net_out_fd[0], &hdr, sizeof(hdr));
}
}
{
if (net_send_header(tip, ts->len))
return -1;
- if (write_data_net(net_out_fd, ts->buf, ts->len))
+ if (write_data_net(net_out_fd[tip->cpu], ts->buf, ts->len))
return -1;
free(ts->buf);
static int net_sendfile(struct thread_information *tip, struct tip_subbuf *ts)
{
- int ret = sendfile(net_out_fd, tip->fd, NULL, ts->len);
+ int ret = sendfile(net_out_fd[tip->cpu], tip->fd, NULL, ts->len);
if (ret < 0) {
perror("sendfile");
{
int ret = -1;
- /*
- * currently we cannot use sendfile() on the last bytes read, as they
- * may not be a full subbuffer. get_subbuf_sendfile() falls back to
- * the read approach for those, so use send() to ship them out
- */
- if (ts->buf)
- return flush_subbuf_net(tip, ts);
-
if (net_send_header(tip, ts->len))
goto err;
if (net_sendfile(tip, ts))
goto err;
tip->data_read += ts->len;
- tip->ofile_offset += buf_size;
ret = 1;
err:
free(ts);
return ret;
}
+static int get_subbuf_sendfile(struct thread_information *tip,
+ __attribute__((__unused__)) unsigned int maxlen)
+{
+ struct tip_subbuf *ts;
+ struct stat sb;
+ unsigned int ready;
+
+ wait_for_data(tip, -1);
+
+ if (fstat(tip->fd, &sb) < 0) {
+ perror("trace stat");
+ return -1;
+ }
+
+ ready = sb.st_size - tip->data_queued;
+ if (!ready) {
+ usleep(1000);
+ return 0;
+ }
+
+ ts = malloc(sizeof(*ts));
+ ts->buf = NULL;
+ ts->max_len = 0;
+ ts->len = ready;
+ tip->data_queued += ready;
+
+ if (flush_subbuf_sendfile(tip, ts) < 0)
+ return -1;
+
+ return ready;
+}
+
static int write_data(struct thread_information *tip, void *buf,
unsigned int buf_len)
{
if (!buf_len)
return 0;
- while (1) {
- ret = fwrite(buf, buf_len, 1, tip->ofile);
- if (ret == 1)
- break;
-
- if (ret < 0) {
- perror("write");
- return 1;
- }
+ ret = fwrite(buf, buf_len, 1, tip->ofile);
+ if (ferror(tip->ofile) || ret != 1) {
+ perror("fwrite");
+ clearerr(tip->ofile);
+ return 1;
}
if (tip->ofile_stdout)
* for files, we just wait around for trace threads to exit
*/
if ((output_name && !strcmp(output_name, "-")) ||
- net_mode == Net_client)
+ ((net_mode == Net_client) && !net_use_sendfile))
get_and_write_events();
else {
struct device_information *dip;
if (output_dir)
len = sprintf(dst, "%s/", output_dir);
+ else
+ len = sprintf(dst, "./");
if (net_mode == Net_server) {
- struct net_connection *nc = dip->nc;
+ struct net_connection *nc = tip->nc;
- len += sprintf(dst + len, "%s-", inet_ntoa(nc->cl_in_addr));
- len += strftime(dst + len, 64, "%F-%T/", gmtime(&nc->connect_time));
+ len += sprintf(dst + len, "%s-", inet_ntoa(nc->ch->cl_in_addr));
+ len += strftime(dst + len, 64, "%F-%T/", gmtime(&dip->cl_connect_time));
}
if (stat(dst, &sb) < 0) {
if (net_mode == Net_client) {
if (net_use_sendfile) {
tip->get_subbuf = get_subbuf_sendfile;
- tip->flush_subbuf = flush_subbuf_sendfile;
+ tip->flush_subbuf = NULL;
} else {
tip->get_subbuf = get_subbuf;
tip->flush_subbuf = flush_subbuf_net;
perror(dip->path);
return 1;
}
+ dip->buf_size = buf_size;
+ dip->buf_nr = buf_nr;
+ dip->page_size = page_size;
}
return 0;
fprintf(stderr, "Out of memory, threads (%d)\n", size * ndevs);
return 1;
}
+ memset(thread_information, 0, size * ndevs);
for_each_dip(dip, i) {
if (start_trace(dip)) {
}
static struct device_information *net_get_dip(struct net_connection *nc,
- char *buts_name)
+ struct blktrace_net_hdr *bnh)
{
- struct device_information *dip;
+ struct device_information *dip, *cl_dip = NULL;
+ struct cl_host *ch = nc->ch;
int i;
- for (i = 0; i < nc->ndevs; i++) {
- dip = &nc->device_information[i];
+ for (i = 0; i < ch->ndevs; i++) {
+ dip = &ch->device_information[i];
- if (!strcmp(dip->buts_name, buts_name))
+ if (!strcmp(dip->buts_name, bnh->buts_name))
return dip;
+
+ if (dip->cl_id == bnh->cl_id)
+ cl_dip = dip;
}
- nc->device_information = realloc(nc->device_information, (nc->ndevs + 1) * sizeof(*dip));
- dip = &nc->device_information[nc->ndevs];
+ ch->device_information = realloc(ch->device_information, (ch->ndevs + 1) * sizeof(*dip));
+ dip = &ch->device_information[ch->ndevs];
memset(dip, 0, sizeof(*dip));
dip->fd = -1;
- dip->nc = nc;
- strcpy(dip->buts_name, buts_name);
- dip->path = strdup(buts_name);
+ dip->ch = ch;
+ dip->cl_id = bnh->cl_id;
+ dip->buf_size = bnh->buf_size;
+ dip->buf_nr = bnh->buf_nr;
+ dip->page_size = bnh->page_size;
+
+ if (cl_dip)
+ dip->cl_connect_time = cl_dip->cl_connect_time;
+ else
+ dip->cl_connect_time = nc->connect_time;
+ strcpy(dip->buts_name, bnh->buts_name);
+ dip->path = strdup(bnh->buts_name);
dip->trace_started = 1;
- nc->ndevs++;
+ ch->ndevs++;
dip->threads = malloc(nc->ncpus * sizeof(struct thread_information));
memset(dip->threads, 0, nc->ncpus * sizeof(struct thread_information));
tip->cpu = i;
tip->device = dip;
tip->fd = -1;
-
+ tip->nc = nc;
+
if (tip_open_output(dip, tip))
return NULL;
+
+ tip->nc = NULL;
}
return dip;
struct blktrace_net_hdr *bnh)
{
struct device_information *dip;
+ struct thread_information *tip;
- nc->ncpus = bnh->max_cpus;
- dip = net_get_dip(nc, bnh->buts_name);
+ dip = net_get_dip(nc, bnh);
if (!dip->trace_started) {
fprintf(stderr, "Events for closed devices %s\n", dip->buts_name);
return NULL;
}
- return &dip->threads[bnh->cpu];
+ tip = &dip->threads[bnh->cpu];
+ if (!tip->nc)
+ tip->nc = nc;
+
+ return tip;
}
static int net_get_header(struct net_connection *nc,
/*
* finalize a net client: truncate files, show stats, cleanup, etc
*/
-static void net_client_done(struct net_connection *nc)
+static void device_done(struct net_connection *nc, struct device_information *dip)
{
- struct device_information *dip;
struct thread_information *tip;
- struct net_connection *last_nc;
- int i, j;
+ int i;
- for_each_nc_dip(nc, dip, i)
- __for_each_tip(dip, tip, nc->ncpus, j)
- tip_ftrunc_final(tip);
+ __for_each_tip(dip, tip, nc->ncpus, i)
+ tip_ftrunc_final(tip);
- show_stats(nc->device_information, nc->ndevs, nc->ncpus);
+ show_stats(dip, 1, nc->ncpus);
/*
* cleanup for next run
*/
- for_each_nc_dip(nc, dip, i) {
- __for_each_tip(dip, tip, nc->ncpus, j) {
- if (tip->ofile)
- fclose(tip->ofile);
- }
-
- free(dip->threads);
- free(dip->path);
+ __for_each_tip(dip, tip, nc->ncpus, i) {
+ if (tip->ofile)
+ fclose(tip->ofile);
}
- free(nc->device_information);
- nc->device_information = NULL;
- nc->ncpus = nc->ndevs = 0;
+ free(dip->threads);
+ free(dip->path);
close(nc->in_fd);
nc->in_fd = -1;
- net_connects--;
+ stat_shown = 0;
+}
- /*
- * now put last entry where this one was, a little nasty since we
- * need to adjust dip->nc as well
- */
- if (nc->connection_index != net_connects) {
- last_nc = &net_connections[net_connects];
- *nc = *last_nc;
- for_each_nc_dip(nc, dip, i)
- dip->nc = nc;
+static inline int in_addr_eq(struct in_addr a, struct in_addr b)
+{
+ return a.s_addr == b.s_addr;
+}
+
+static void net_add_client_host(struct cl_host *ch)
+{
+ ch->list_next = cl_host_list;
+ cl_host_list = ch;
+ cl_hosts++;
+}
+
+static void net_remove_client_host(struct cl_host *ch)
+{
+ struct cl_host *p, *c;
+
+ for (p = c = cl_host_list; c; c = c->list_next) {
+ if (c == ch) {
+ if (p == c)
+ cl_host_list = c->list_next;
+ else
+ p->list_next = c->list_next;
+ cl_hosts--;
+ return;
+ }
+ p = c;
}
+}
- stat_shown = 0;
+static struct cl_host *net_find_client_host(struct in_addr cl_in_addr)
+{
+ struct cl_host *ch = cl_host_list;
+
+ while (ch) {
+ if (in_addr_eq(ch->cl_in_addr, cl_in_addr))
+ return ch;
+ ch = ch->list_next;
+ }
+
+ return NULL;
+}
+
+static void net_client_host_done(struct cl_host *ch)
+{
+ free(ch->device_information);
+ free(ch->net_connections);
+ net_connects -= ch->nconn;
+ net_remove_client_host(ch);
+ free(ch);
}
/*
if (!data_is_native) {
bnh.magic = be32_to_cpu(bnh.magic);
bnh.cpu = be32_to_cpu(bnh.cpu);
+ bnh.max_cpus = be32_to_cpu(bnh.max_cpus);
bnh.len = be32_to_cpu(bnh.len);
+ bnh.cl_id = be32_to_cpu(bnh.cl_id);
+ bnh.buf_size = be32_to_cpu(bnh.buf_size);
+ bnh.buf_nr = be32_to_cpu(bnh.buf_nr);
+ bnh.page_size = be32_to_cpu(bnh.page_size);
}
if ((bnh.magic & 0xffffff00) != BLK_IO_TRACE_MAGIC) {
return 1;
}
+ if (nc->ncpus == -1)
+ nc->ncpus = bnh.max_cpus;
+
/*
* len == 0 means that the other end signalled end-of-run
*/
*/
struct device_information *dip;
- dip = net_get_dip(nc, bnh.buts_name);
+ dip = net_get_dip(nc, &bnh);
dip->drop_count = bnh.cpu;
dip->trace_started = 0;
printf("server: end of run for %s\n", dip->buts_name);
- net_client_done(nc);
+
+ device_done(nc, dip);
+
+ if (++nc->ch->ndevs_done == nc->ch->ndevs)
+ net_client_host_done(nc->ch);
+
return 0;
}
{
socklen_t socklen = sizeof(*addr);
struct net_connection *nc;
+ struct cl_host *ch;
+ int in_fd;
- if (net_connects == NET_MAX_CONNECTIONS) {
- fprintf(stderr, "server: no more connections allowed\n");
+ in_fd = accept(listen_fd, (struct sockaddr *) addr, &socklen);
+ if (in_fd < 0) {
+ perror("accept");
return;
}
- nc = &net_connections[net_connects];
- memset(nc, 0, sizeof(*nc));
+ ch = net_find_client_host(addr->sin_addr);
+ if (!ch) {
+ if (cl_hosts == NET_MAX_CL_HOSTS) {
+ fprintf(stderr, "server: no more clients allowed\n");
+ return;
+ }
+ ch = malloc(sizeof(struct cl_host));
+ memset(ch, 0, sizeof(*ch));
+ ch->cl_in_addr = addr->sin_addr;
+ net_add_client_host(ch);
- nc->in_fd = accept(listen_fd, (struct sockaddr *) addr, &socklen);
- if (nc->in_fd < 0) {
- perror("accept");
- return;
+ printf("server: connection from %s\n", inet_ntoa(addr->sin_addr));
}
- printf("server: connection from %s\n", inet_ntoa(addr->sin_addr));
+ ch->net_connections = realloc(ch->net_connections, (ch->nconn + 1) * sizeof(*nc));
+ nc = &ch->net_connections[ch->nconn++];
+ memset(nc, 0, sizeof(*nc));
+
time(&nc->connect_time);
- nc->connection_index = net_connects;
- nc->cl_in_addr = addr->sin_addr;
+ nc->ch = ch;
+ nc->in_fd = in_fd;
+ nc->ncpus = -1;
net_connects++;
}
static void net_server_handle_connections(int listen_fd,
struct sockaddr_in *addr)
{
- struct pollfd pfds[NET_MAX_CONNECTIONS + 1];
- int i, events;
-
+ struct pollfd *pfds = NULL;
+ struct net_connection **ncs = NULL;
+ int max_connects = 0;
+ int i, nconns, events;
+ struct cl_host *ch;
+ struct net_connection *nc;
+
printf("server: waiting for connections...\n");
while (!is_done()) {
+ if (net_connects >= max_connects) {
+ pfds = realloc(pfds, (net_connects + 1) * sizeof(*pfds));
+ ncs = realloc(ncs, (net_connects + 1) * sizeof(*ncs));
+ max_connects = net_connects + 1;
+ }
/*
* the zero entry is for incoming connections, remaining
* entries for clients
*/
pfds[0].fd = listen_fd;
pfds[0].events = POLLIN;
- for (i = 0; i < net_connects; i++) {
- pfds[i + 1].fd = net_connections[i].in_fd;
- pfds[i + 1].events = POLLIN;
+ nconns = 0;
+ for_each_cl_host(ch) {
+ for (i = 0; i < ch->nconn; i++) {
+ nc = &ch->net_connections[i];
+ pfds[nconns + 1].fd = nc->in_fd;
+ pfds[nconns + 1].events = POLLIN;
+ ncs[nconns++] = nc;
+ }
}
- events = poll(pfds, 1 + net_connects, -1);
+ events = poll(pfds, 1 + nconns, -1);
if (events < 0) {
if (errno == EINTR)
continue;
events--;
}
- for (i = 0; events && i < net_connects; i++) {
+ for (i = 0; events && i < nconns; i++) {
if (pfds[i + 1].revents & POLLIN) {
- net_client_data(&net_connections[i]);
+ net_client_data(ncs[i]);
events--;
}
}
/*
* Setup outgoing network connection where we will transmit data
*/
-static int net_setup_client(void)
+static int net_setup_client_cpu(int i, struct sockaddr_in *addr)
{
- struct sockaddr_in addr;
int fd;
fd = socket(AF_INET, SOCK_STREAM, 0);
return 1;
}
+ if (connect(fd, (struct sockaddr *) addr, sizeof(*addr)) < 0) {
+ perror("client: connect");
+ return 1;
+ }
+
+ net_out_fd[i] = fd;
+ return 0;
+}
+
+static int net_setup_client(void)
+{
+ struct sockaddr_in addr;
+ int i;
+
memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
addr.sin_port = htons(net_port);
printf("blktrace: connecting to %s\n", hostname);
- if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- perror("client: connect");
- return 1;
+ net_out_fd = malloc(ncpus * sizeof(*net_out_fd));
+ for (i = 0; i < ncpus; i++) {
+ if (net_setup_client_cpu(i, &addr))
+ return 1;
}
printf("blktrace: connected!\n");
- net_out_fd = fd;
+
return 0;
}
static char usage_str[] = \
- "-d <dev> [ -r relay path ] [ -o <output> ] [-k ] [ -w time ]\n" \
- "[ -a action ] [ -A action mask ] [ -v ]\n\n" \
+ "-d <dev> [ -r debugfs path ] [ -o <output> ] [-k ] [ -w time ]\n" \
+ "[ -a action ] [ -A action mask ] [ -I <devs file> ] [ -v ]\n\n" \
"\t-d Use specified device. May also be given last after options\n" \
- "\t-r Path to mounted relayfs, defaults to /relay\n" \
+ "\t-r Path to mounted debugfs, defaults to /sys/kernel/debug\n" \
"\t-o File(s) to send output to\n" \
"\t-D Directory to prepend to output file names\n" \
"\t-k Kill a running trace\n" \
"\t-l Run in network listen mode (blktrace server)\n" \
"\t-h Run in network client mode, connecting to the given host\n" \
"\t-p Network port to use (default 8462)\n" \
- "\t-s Make the network client use sendfile() to transfer data\n" \
+ "\t-s Make the network client NOT use sendfile() to transfer data\n" \
+ "\t-I Add devices found in <devs file>\n" \
"\t-V Print program version info\n\n";
static void show_usage(char *program)
int main(int argc, char *argv[])
{
- static char default_relay_path[] = "/relay";
+ static char default_debugfs_path[] = "/sys/kernel/debug";
struct statfs st;
int i, c;
int stop_watch = 0;
return 1;
break;
+ case 'I': {
+ char dev_line[256];
+ FILE *ifp = fopen(optarg, "r");
+
+ if (!ifp) {
+ fprintf(stderr,
+ "Invalid file for devices %s\n",
+ optarg);
+ return 1;
+ }
+
+ while (fscanf(ifp, "%s\n", dev_line) == 1)
+ if (resize_devices(strdup(dev_line)) != 0)
+ return 1;
+ break;
+ }
+
+
case 'r':
- relay_path = optarg;
+ debugfs_path = optarg;
break;
case 'o':
net_port = atoi(optarg);
break;
case 's':
- net_use_sendfile = 1;
+ net_use_sendfile = 0;
break;
default:
show_usage(argv[0]);
page_size = getpagesize();
- if (net_mode == Net_server)
+ if (net_mode == Net_server) {
+ if (output_name) {
+ fprintf(stderr, "-o ignored in server mode\n");
+ output_name = NULL;
+ }
+
return net_server();
+ }
while (optind < argc) {
if (resize_devices(argv[optind++]) != 0)
return 1;
}
- if (!relay_path)
- relay_path = default_relay_path;
-
if (act_mask_tmp != 0)
act_mask = act_mask_tmp;
- if (statfs(relay_path, &st) < 0) {
+ if (!debugfs_path)
+ debugfs_path = default_debugfs_path;
+
+ if (statfs(debugfs_path, &st) < 0) {
perror("statfs");
fprintf(stderr,"%s does not appear to be a valid path\n",
- relay_path);
+ debugfs_path);
return 1;
- } else if (st.f_type != (long) RELAYFS_TYPE) {
- fprintf(stderr,"%s does not appear to be a relay filesystem\n",
- relay_path);
+ } else if (st.f_type != (long) DEBUGFS_TYPE) {
+ fprintf(stderr,"%s does not appear to be a debug filesystem\n",
+ debugfs_path);
return 1;
}
signal(SIGHUP, handle_sigint);
signal(SIGTERM, handle_sigint);
signal(SIGALRM, handle_sigint);
+ signal(SIGPIPE, SIG_IGN);
if (net_mode == Net_client && net_setup_client())
return 1;
projects / blktrace.git / blobdiff