X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=log%2Flogd.c;h=18788fed9a3cfa342e29cefc6498aeebbba337ef;hb=d73e7d288f3a417e9a7add972038019b34e8acf7;hp=0407f4c7b82392817fb1f7558a9c3617668548e1;hpb=12728c38621c6271dd2102d3e11cf95ff42eeff8;p=project%2Fubox.git diff --git a/log/logd.c b/log/logd.c index 0407f4c..18788fe 100644 --- a/log/logd.c +++ b/log/logd.c @@ -14,6 +14,7 @@ #include #include #include +#include #include @@ -30,8 +31,18 @@ static struct blob_buf b; static struct ubus_auto_conn conn; static LIST_HEAD(clients); -static const struct blobmsg_policy read_policy = - { .name = "lines", .type = BLOBMSG_TYPE_INT32 }; +enum { + READ_LINES, + READ_STREAM, + READ_ONESHOT, + __READ_MAX +}; + +static const struct blobmsg_policy read_policy[__READ_MAX] = { + [READ_LINES] = { .name = "lines", .type = BLOBMSG_TYPE_INT32 }, + [READ_STREAM] = { .name = "stream", .type = BLOBMSG_TYPE_BOOL }, + [READ_ONESHOT] = { .name = "oneshot", .type = BLOBMSG_TYPE_BOOL }, +}; static const struct blobmsg_policy write_policy = { .name = "event", .type = BLOBMSG_TYPE_STRING }; @@ -54,20 +65,27 @@ client_close(struct ustream *s) free(cl); } -static void -client_notify_write(struct ustream *s, int bytes) +static void client_notify_state(struct ustream *s) { - if (s->w.data_bytes < 128 && ustream_read_blocked(s)) - ustream_set_read_blocked(s, false); + client_close(s); } -static void client_notify_state(struct ustream *s) +static void client_notify_write(struct ustream *s, int bytes) { - if (!s->eof) + if (ustream_pending_data(s, true)) return; - if (!s->w.data_bytes) - return client_close(s); + client_close(s); +} + +static void +log_fill_msg(struct blob_buf *b, struct log_head *l) +{ + blobmsg_add_string(b, "msg", l->data); + blobmsg_add_u32(b, "id", l->id); + blobmsg_add_u32(b, "priority", l->priority); + blobmsg_add_u32(b, "source", l->source); + blobmsg_add_u64(b, "time", (((__u64) l->ts.tv_sec) * 1000) + (l->ts.tv_nsec / 1000000)); } static int @@ -76,38 +94,67 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj, struct blob_attr *msg) { struct client *cl; - struct blob_attr *tb; + struct blob_attr *tb[__READ_MAX] = {}; struct log_head *l; int count = 0; int fds[2]; + int ret; + bool stream = true; + bool oneshot = false; + void *c, *e; + + if (!stream) + count = 100; if (msg) { - blobmsg_parse(&read_policy, 1, &tb, blob_data(msg), blob_len(msg)); - if (tb) - count = blobmsg_get_u32(tb); + blobmsg_parse(read_policy, __READ_MAX, tb, blob_data(msg), blob_len(msg)); + if (tb[READ_LINES]) + count = blobmsg_get_u32(tb[READ_LINES]); + if (tb[READ_STREAM]) + stream = blobmsg_get_bool(tb[READ_STREAM]); + if (tb[READ_ONESHOT]) + oneshot = blobmsg_get_bool(tb[READ_ONESHOT]); } - pipe(fds); - ubus_request_set_fd(ctx, req, fds[0]); - - cl = calloc(1, sizeof(*cl)); - cl->s.stream.notify_write = client_notify_write; - cl->s.stream.notify_state = client_notify_state; - cl->fd = fds[1]; - ustream_fd_init(&cl->s, cl->fd); - list_add(&cl->list, &clients); l = log_list(count, NULL); - while ((!tb || count) && l) { + if (stream) { + if (pipe(fds) == -1) { + fprintf(stderr, "logd: failed to create pipe: %m\n"); + return -1; + } + + ubus_request_set_fd(ctx, req, fds[0]); + cl = calloc(1, sizeof(*cl)); + cl->s.stream.notify_state = client_notify_state; + cl->fd = fds[1]; + ustream_fd_init(&cl->s, cl->fd); + list_add(&cl->list, &clients); + while ((!tb[READ_LINES] || count) && l) { + blob_buf_init(&b, 0); + log_fill_msg(&b, l); + l = log_list(count, l); + ret = ustream_write(&cl->s.stream, (void *) b.head, blob_len(b.head) + sizeof(struct blob_attr), false); + if (ret < 0) + break; + } + + if (oneshot) { + cl->s.stream.notify_write = client_notify_write; + client_notify_write(&cl->s.stream, 0); + } + } else { blob_buf_init(&b, 0); - blobmsg_add_string(&b, "msg", l->data); - blobmsg_add_u32(&b, "id", l->id); - blobmsg_add_u32(&b, "priority", l->priority); - blobmsg_add_u32(&b, "source", l->source); - blobmsg_add_u64(&b, "time", l->ts.tv_sec); - l = log_list(count, l); - if (ustream_write(&cl->s.stream, (void *) b.head, blob_len(b.head) + sizeof(struct blob_attr), false) <= 0) - break; + c = blobmsg_open_array(&b, "log"); + while ((!tb[READ_LINES] || count) && l) { + e = blobmsg_open_table(&b, NULL); + log_fill_msg(&b, l); + blobmsg_close_table(&b, e); + l = log_list(count, l); + } + blobmsg_close_array(&b, c); + ubus_send_reply(ctx, req, b.head); } + blob_buf_free(&b); return 0; } @@ -120,10 +167,18 @@ write_log(struct ubus_context *ctx, struct ubus_object *obj, char *event; if (msg) { + int len; + blobmsg_parse(&write_policy, 1, &tb, blob_data(msg), blob_len(msg)); if (tb) { event = blobmsg_get_string(tb); - log_add(event, strlen(event) + 1, SOURCE_SYSLOG); + len = strlen(event) + 1; + if (len > LOG_LINE_SIZE) { + len = LOG_LINE_SIZE; + event[len - 1] = 0; + } + + log_add(event, len, SOURCE_SYSLOG); } } @@ -131,7 +186,7 @@ write_log(struct ubus_context *ctx, struct ubus_object *obj, } static const struct ubus_method log_methods[] = { - { .name = "read", .handler = read_log, .policy = &read_policy, .n_policy = 1 }, + UBUS_METHOD("read", read_log, read_policy), { .name = "write", .handler = write_log, .policy = &write_policy, .n_policy = 1 }, }; @@ -153,15 +208,17 @@ ubus_notify_log(struct log_head *l) if (list_empty(&clients)) return; - list_for_each_entry(c, &clients, list) { - blob_buf_init(&b, 0); - blobmsg_add_string(&b, "msg", l->data); - blobmsg_add_u32(&b, "id", l->id); - blobmsg_add_u32(&b, "priority", l->priority); - blobmsg_add_u32(&b, "source", l->source); - blobmsg_add_u64(&b, "time", (((__u64) l->ts.tv_sec) * 1000) + (l->ts.tv_nsec / 1000000)); + blob_buf_init(&b, 0); + blobmsg_add_string(&b, "msg", l->data); + blobmsg_add_u32(&b, "id", l->id); + blobmsg_add_u32(&b, "priority", l->priority); + blobmsg_add_u32(&b, "source", l->source); + blobmsg_add_u64(&b, "time", (((__u64) l->ts.tv_sec) * 1000) + (l->ts.tv_nsec / 1000000)); + + list_for_each_entry(c, &clients, list) ustream_write(&c->s.stream, (void *) b.head, blob_len(b.head) + sizeof(struct blob_attr), false); - } + + blob_buf_free(&b); } static void @@ -170,23 +227,38 @@ ubus_connect_handler(struct ubus_context *ctx) int ret; ret = ubus_add_object(ctx, &log_object); - if (ret) + if (ret) { fprintf(stderr, "Failed to add object: %s\n", ubus_strerror(ret)); + exit(1); + } fprintf(stderr, "log: connected to ubus\n"); } int main(int argc, char **argv) { + int ch, log_size = 16; + signal(SIGPIPE, SIG_IGN); + while ((ch = getopt(argc, argv, "S:")) != -1) { + switch (ch) { + case 'S': + log_size = atoi(optarg); + if (log_size < 1) + log_size = 16; + break; + } + } + log_size *= 1024; uloop_init(); - log_init(); + log_init(log_size); conn.cb = ubus_connect_handler; ubus_auto_connect(&conn); uloop_run(); log_shutdown(); uloop_done(); + ubus_auto_shutdown(&conn); return 0; }