summaryrefslogtreecommitdiffstats
path: root/events.c
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2015-08-14 01:29:11 +0200
committerSuren A. Chilingaryan <csa@suren.me>2015-08-14 01:29:11 +0200
commit90d5d3239426fa7490973aa6c8f13493f5735aa3 (patch)
treec6f7853053a41006401f7a0161e4966f6af8bbed /events.c
parentc43543ef5b90ad6619edb336c2feef8238121592 (diff)
downloadipecamera-90d5d3239426fa7490973aa6c8f13493f5735aa3.tar.gz
ipecamera-90d5d3239426fa7490973aa6c8f13493f5735aa3.tar.bz2
ipecamera-90d5d3239426fa7490973aa6c8f13493f5735aa3.tar.xz
ipecamera-90d5d3239426fa7490973aa6c8f13493f5735aa3.zip
More lost event debugging
Diffstat (limited to 'events.c')
-rw-r--r--events.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/events.c b/events.c
index 8f740b8..e719e2d 100644
--- a/events.c
+++ b/events.c
@@ -71,8 +71,11 @@ int ipecamera_stream(pcilib_context_t *vctx, pcilib_event_callback_t callback, v
#else /* IPECAMERA_ANNOUNCE_READY */
while (ctx->reported_id != ctx->event_id) {
#endif /* IPECAMERA_ANNOUNCE_READY */
- if ((ctx->event_id - ctx->reported_id) > (ctx->buffer_size - IPECAMERA_RESERVE_BUFFERS)) ctx->reported_id = ctx->event_id - (ctx->buffer_size - 1 - IPECAMERA_RESERVE_BUFFERS);
- else ++ctx->reported_id;
+ if ((ctx->event_id - ctx->reported_id) > (ctx->buffer_size - IPECAMERA_RESERVE_BUFFERS)) {
+ ipecamera_debug(HARDWARE, "Skipping events %zu to %zu as preprocessing is too slow. We are currently %zu buffers beyond, but only %zu buffers are available and safety limit is %zu",
+ ctx->reported_id, ctx->event_id - (ctx->buffer_size - 1 - IPECAMERA_RESERVE_BUFFERS), ctx->event_id - ctx->reported_id, ctx->buffer_size, IPECAMERA_RESERVE_BUFFERS);
+ ctx->reported_id = ctx->event_id - (ctx->buffer_size - 1 - IPECAMERA_RESERVE_BUFFERS);
+ } else ++ctx->reported_id;
memcpy(&info, ctx->frame + ((ctx->reported_id-1)%ctx->buffer_size), sizeof(ipecamera_event_info_t));
@@ -167,8 +170,11 @@ int ipecamera_next_event(pcilib_context_t *vctx, pcilib_timeout_t timeout, pcili
}
retry:
- if ((ctx->event_id - ctx->reported_id) > (ctx->buffer_size - IPECAMERA_RESERVE_BUFFERS)) ctx->reported_id = ctx->event_id - (ctx->buffer_size - 1 - IPECAMERA_RESERVE_BUFFERS);
- else ++ctx->reported_id;
+ if ((ctx->event_id - ctx->reported_id) > (ctx->buffer_size - IPECAMERA_RESERVE_BUFFERS)) {
+ ipecamera_debug(HARDWARE, "Skipping events %zu to %zu as preprocessing is too slow. We are currently %zu buffers beyond, but only %zu buffers are available and safety limit is %zu",
+ ctx->reported_id, ctx->event_id - (ctx->buffer_size - 1 - IPECAMERA_RESERVE_BUFFERS), ctx->event_id - ctx->reported_id, ctx->buffer_size, IPECAMERA_RESERVE_BUFFERS);
+ ctx->reported_id = ctx->event_id - (ctx->buffer_size - 1 - IPECAMERA_RESERVE_BUFFERS);
+ } else ++ctx->reported_id;
if (evid) *evid = ctx->reported_id;