projects
/
project
/
ubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logd: implement oneshot mode for stream log read
[project/ubox.git]
/
log
/
logd.c
diff --git
a/log/logd.c
b/log/logd.c
index
915348e
..
ee30984
100644
(file)
--- a/
log/logd.c
+++ b/
log/logd.c
@@
-34,12
+34,14
@@
static LIST_HEAD(clients);
enum {
READ_LINES,
READ_STREAM,
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_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 =
};
static const struct blobmsg_policy write_policy =
@@
-68,6
+70,14
@@
static void client_notify_state(struct ustream *s)
client_close(s);
}
client_close(s);
}
+static void client_notify_write(struct ustream *s, int bytes)
+{
+ if (ustream_pending_data(s, true))
+ return;
+
+ client_close(s);
+}
+
static void
log_fill_msg(struct blob_buf *b, struct log_head *l)
{
static void
log_fill_msg(struct blob_buf *b, struct log_head *l)
{
@@
-75,7
+85,7
@@
log_fill_msg(struct blob_buf *b, struct log_head *l)
blobmsg_add_u32(b, "id", l->id);
blobmsg_add_u32(b, "priority", l->priority);
blobmsg_add_u32(b, "source", l->source);
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 * 1000LL
);
+ blobmsg_add_u64(b, "time",
(((__u64) l->ts.tv_sec) * 1000) + (l->ts.tv_nsec / 1000000)
);
}
static int
}
static int
@@
-84,12
+94,13
@@
read_log(struct ubus_context *ctx, struct ubus_object *obj,
struct blob_attr *msg)
{
struct client *cl;
struct blob_attr *msg)
{
struct client *cl;
- struct blob_attr *tb[__READ_MAX] = {
0
};
+ struct blob_attr *tb[__READ_MAX] = {};
struct log_head *l;
int count = 0;
int fds[2];
int ret;
bool stream = true;
struct log_head *l;
int count = 0;
int fds[2];
int ret;
bool stream = true;
+ bool oneshot = false;
void *c, *e;
if (!stream)
void *c, *e;
if (!stream)
@@
-101,15
+112,17
@@
read_log(struct ubus_context *ctx, struct ubus_object *obj,
count = blobmsg_get_u32(tb[READ_LINES]);
if (tb[READ_STREAM])
stream = blobmsg_get_bool(tb[READ_STREAM]);
count = blobmsg_get_u32(tb[READ_LINES]);
if (tb[READ_STREAM])
stream = blobmsg_get_bool(tb[READ_STREAM]);
- }
-
- if (pipe(fds) == -1) {
- fprintf(stderr, "logd: failed to create pipe: %s\n", strerror(errno));
- return -1;
+ if (tb[READ_ONESHOT])
+ oneshot = blobmsg_get_bool(tb[READ_ONESHOT]);
}
l = log_list(count, NULL);
if (stream) {
}
l = log_list(count, NULL);
if (stream) {
+ if (pipe(fds) == -1) {
+ fprintf(stderr, "logd: failed to create pipe: %s\n", strerror(errno));
+ return -1;
+ }
+
ubus_request_set_fd(ctx, req, fds[0]);
cl = calloc(1, sizeof(*cl));
cl->s.stream.notify_state = client_notify_state;
ubus_request_set_fd(ctx, req, fds[0]);
cl = calloc(1, sizeof(*cl));
cl->s.stream.notify_state = client_notify_state;
@@
-124,6
+137,11
@@
read_log(struct ubus_context *ctx, struct ubus_object *obj,
if (ret < 0)
break;
}
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);
c = blobmsg_open_array(&b, "log");
} else {
blob_buf_init(&b, 0);
c = blobmsg_open_array(&b, "log");