From 16a2495766e1cf1111d26993539fd112001f0e18 Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Thu, 13 Jun 2019 14:36:58 +0300 Subject: [PATCH] messages refactoring --- src/device.c | 10 +++++----- src/http/server.c | 8 ++++---- src/main.c | 2 +- src/stream.c | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/device.c b/src/device.c index 5f87266..dba776c 100644 --- a/src/device.c +++ b/src/device.c @@ -279,9 +279,9 @@ int device_grab_buffer(struct device_t *dev) { return -1; } - LOG_DEBUG("Got a new frame in buffer index=%u; bytesused=%u", buf_info.index, buf_info.bytesused); + LOG_DEBUG("Got a new frame in buffer: index=%u, bytesused=%u", buf_info.index, buf_info.bytesused); if (buf_info.index >= dev->run->n_buffers) { - LOG_ERROR("Got invalid buffer index=%u; nbuffers=%u", buf_info.index, dev->run->n_buffers); + LOG_ERROR("Got invalid buffer: index=%u, nbuffers=%u", buf_info.index, dev->run->n_buffers); return -1; } @@ -390,7 +390,7 @@ static int _device_apply_dv_timings(struct device_t *dev) { LOG_DEBUG("Calling ioctl(VIDIOC_QUERY_DV_TIMINGS) ..."); if (xioctl(dev->run->fd, VIDIOC_QUERY_DV_TIMINGS, &dv_timings) == 0) { - LOG_INFO("Got new DV timings: resolution=%ux%u; pixclk=%llu", + LOG_INFO("Got new DV timings: resolution=%ux%u, pixclk=%llu", dv_timings.bt.width, dv_timings.bt.height, dv_timings.bt.pixelclock); @@ -431,7 +431,7 @@ static int _device_open_format(struct device_t *dev) { // Set format LOG_DEBUG("Calling ioctl(VIDIOC_S_FMT) ..."); if (xioctl(dev->run->fd, VIDIOC_S_FMT, &fmt) < 0) { - LOG_PERROR("Unable to set pixelformat=%s; resolution=%ux%u", + LOG_PERROR("Unable to set pixelformat=%s, resolution=%ux%u", _format_to_string_supported(dev->format), dev->run->width, dev->run->height); @@ -602,7 +602,7 @@ static int _device_apply_resolution(struct device_t *dev, unsigned width, unsign width == 0 || width > VIDEO_MAX_WIDTH || height == 0 || height > VIDEO_MAX_HEIGHT ) { - LOG_ERROR("Requested forbidden resolution=%ux%u: min=1x1; max=%ux%u", + LOG_ERROR("Requested forbidden resolution=%ux%u: min=1x1, max=%ux%u", width, height, VIDEO_MAX_WIDTH, VIDEO_MAX_HEIGHT); return -1; } diff --git a/src/http/server.c b/src/http/server.c index 4ebadb9..f139023 100644 --- a/src/http/server.c +++ b/src/http/server.c @@ -208,7 +208,7 @@ int http_server_listen(struct http_server_t *server) { # define MAX_SUN_PATH (sizeof(unix_addr.sun_path) - 1) if (strlen(server->unix_path) > MAX_SUN_PATH) { - LOG_ERROR("UNIX socket path is too long, max=%zu", MAX_SUN_PATH); + LOG_ERROR("UNIX socket path is too long; max=%zu", MAX_SUN_PATH); return -1; } @@ -568,7 +568,7 @@ static void _http_callback_stream(struct evhttp_request *request, void *v_server } evhttp_connection_get_peer(conn, &client_addr, &client_port); - LOG_INFO("HTTP: Registered the new stream client: [%s]:%u; id=%s; clients now: %u", + LOG_INFO("HTTP: Registered the new stream client: [%s]:%u, id=%s; clients now: %u", client_addr, client_port, client->id, server->run->stream_clients_count); buf_event = evhttp_connection_get_bufferevent(conn); @@ -845,13 +845,13 @@ static bool _expose_new_picture_unsafe(struct http_server_t *server) { ) { EXPOSED(expose_cmp_time) = get_now_monotonic(); EXPOSED(expose_end_time) = EXPOSED(expose_cmp_time); - LOG_VERBOSE("HTTP: dropped same frame number %u; comparsion time = %.06Lf", + LOG_VERBOSE("HTTP: dropped same frame number %u; cmp_time=%.06Lf", EXPOSED(dropped), EXPOSED(expose_cmp_time) - EXPOSED(expose_begin_time)); EXPOSED(dropped) += 1; return false; // Not updated } else { EXPOSED(expose_cmp_time) = get_now_monotonic(); - LOG_VERBOSE("HTTP: passed same frame check (frames are differ); comparsion time = %.06Lf", + LOG_VERBOSE("HTTP: passed same frame check (frames are differ); cmp_time=%.06Lf", EXPOSED(expose_cmp_time) - EXPOSED(expose_begin_time)); } } diff --git a/src/main.c b/src/main.c index 034bd1f..c64a433 100644 --- a/src/main.c +++ b/src/main.c @@ -203,7 +203,7 @@ static int _parse_options(int argc, char *argv[], struct device_t *dev, struct e # define OPT_UNSIGNED(_dest, _name, _min, _max) { \ errno = 0; char *_end = NULL; int _tmp = strtol(optarg, &_end, 0); \ if (errno || *_end || _tmp < _min || _tmp > _max) { \ - printf("Invalid value for '%s=%s'; min=%u; max=%u\n", _name, optarg, _min, _max); \ + printf("Invalid value for '%s=%s': min=%u, max=%u\n", _name, optarg, _min, _max); \ return -1; \ } \ _dest = _tmp; \ diff --git a/src/stream.c b/src/stream.c index d22a140..10f7f41 100644 --- a/src/stream.c +++ b/src/stream.c @@ -157,9 +157,9 @@ void stream_loop(struct stream_t *stream) { if (!ready_worker->job_failed) { if (ready_worker->job_timely) { _stream_expose_picture(stream, ready_worker->buf_index, captured_fps); - LOG_PERF("##### Encoded picture exposed; worker = %u", ready_worker->number); + LOG_PERF("##### Encoded picture exposed; worker=%u", ready_worker->number); } else { - LOG_PERF("----- Encoded picture dropped; worker = %u", ready_worker->number); + LOG_PERF("----- Encoded picture dropped; worker=%u", ready_worker->number); } } else { break; @@ -224,7 +224,7 @@ void stream_loop(struct stream_t *stream) { { if (now < grab_after) { fluency_passed += 1; - LOG_VERBOSE("Passed %u frames for fluency: now=%.03Lf; grab_after=%.03Lf", fluency_passed, now, grab_after); + LOG_VERBOSE("Passed %u frames for fluency: now=%.03Lf, grab_after=%.03Lf", fluency_passed, now, grab_after); goto pass_frame; } fluency_passed = 0; @@ -233,14 +233,14 @@ void stream_loop(struct stream_t *stream) { captured_fps = captured_fps_accum; captured_fps_accum = 0; captured_fps_second = now_second; - LOG_PERF("A new second has come, Captured-FPS = %u", captured_fps); + LOG_PERF("A new second has come; captured_fps=%u", captured_fps); } captured_fps_accum += 1; long double fluency_delay = _workers_pool_get_fluency_delay(pool); grab_after = now + fluency_delay; - LOG_VERBOSE("Fluency: delay=%.03Lf; grab_after=%.03Lf", fluency_delay, grab_after); + LOG_VERBOSE("Fluency: delay=%.03Lf, grab_after=%.03Lf", fluency_delay, grab_after); } _workers_pool_assign(pool, ready_worker, buf_index); @@ -295,7 +295,7 @@ void stream_switch_slowdown(struct stream_t *stream, bool slowdown) { static struct _workers_pool_t *_stream_init_loop(struct stream_t *stream) { struct _workers_pool_t *pool = NULL; - LOG_DEBUG("%s: stream->proc->stop = %d", __FUNCTION__, atomic_load(&stream->proc->stop)); + LOG_DEBUG("%s: stream->proc->stop=%d", __FUNCTION__, atomic_load(&stream->proc->stop)); while (!atomic_load(&stream->proc->stop)) { SEP_INFO('='); @@ -467,7 +467,7 @@ static void *__worker_thread(void *v_worker) { worker->last_comp_time = last_comp_time; A_MUTEX_UNLOCK(&worker->last_comp_time_mutex); - LOG_VERBOSE("Compressed JPEG size=%zu; time=%0.3Lf; worker=%u; buffer=%u", + LOG_VERBOSE("Compressed new JPEG: size=%zu, time=%0.3Lf, worker=%u, buffer=%u", PICTURE(used), last_comp_time, worker->number, worker->buf_index); } else { worker->job_failed = true;