daemon/defer: minor changes

diff --git a/daemon/defer.c b/daemon/defer.c
index 0670a4848ab704d2e73d15960c429cfa3691231d..177f008e194690e60f14c04c4e70bff556b671f0 100644 (file)
--- a/daemon/defer.c
+++ b/daemon/defer.c
@@ -218,7 +218,6 @@ static inline int classify(const union kr_sockaddr *addr, bool stream)
 }
 
 
-
 /// Push query to a queue according to its priority and activate idle.
 static inline void push_query(struct protolayer_iter_ctx *ctx, int priority, bool to_head_end)
 {
@@ -341,6 +340,8 @@ static inline void process_single_deferred(void)
 
        if (age_ns >= REQ_TIMEOUT) {
                VERBOSE_LOG("    BREAK (timeout)\n");
+               kr_log_warning(DEFER, "Data from %s too long in queue, dropping.\n",
+                       kr_straddr(ctx->comm->src_addr));  // TODO make it notice as it's intended behavior of defer?
                break_query(ctx, ETIME);
                return;
        }
@@ -417,16 +418,16 @@ static enum protolayer_iter_cb_result pl_defer_unwrap(
                return protolayer_continue(ctx);
 
        defer_sample_addr((const union kr_sockaddr *)ctx->comm->src_addr, ctx->session->stream);
-       struct pl_defer_iter_data *data = iter_data;
+       struct pl_defer_iter_data *idata = iter_data;
        struct pl_defer_sess_data *sdata = sess_data;
-       data->req_stamp = defer_sample_state.stamp;
+       idata->req_stamp = defer_sample_state.stamp;
 
        VERBOSE_LOG("  %s UNWRAP\n",
                        kr_straddr(ctx->comm->src_addr));
 
        if (queue_len(sdata->queue) > 0) {  // stream with preceding packet already deferred
                queue_push(sdata->queue, ctx);
-               waiting_requests_size += data->size = protolayer_iter_size_est(ctx, false);
+               waiting_requests_size += idata->size = protolayer_iter_size_est(ctx, false);
                        // payload counted in session wire buffer
                VERBOSE_LOG("    PUSH as follow-up\n");
                return protolayer_async();
@@ -446,7 +447,7 @@ static enum protolayer_iter_cb_result pl_defer_unwrap(
                waiting_requests_size += sdata->size = protolayer_sess_size_est(ctx->session);
        }
        push_query(ctx, priority, false);
-       waiting_requests_size += data->size = protolayer_iter_size_est(ctx, !ctx->session->stream);
+       waiting_requests_size += idata->size = protolayer_iter_size_est(ctx, !ctx->session->stream);
                // for stream, payload is counted in session wire buffer
 
        if (waiting_requests_size > MAX_WAITING_REQS_SIZE) {
@@ -454,6 +455,8 @@ static enum protolayer_iter_cb_result pl_defer_unwrap(
                defer_sample_start(&prev_sample_state);
                do {
                        process_single_deferred();  // possibly defers again without decreasing waiting_requests_size
+                               // If the unwrapped query is to be processed here,
+                               // it is the last iteration and the query is processed after returning.
                        defer_sample_restart();
                } while (waiting_requests_size > MAX_WAITING_REQS_SIZE);
                defer_sample_stop(&prev_sample_state, true);

diff --git a/daemon/defer.h b/daemon/defer.h
index 20e4ac92b3d56b871d558815cb6ba763c9e6ee8b..b0a94fb5053db3ab38bfa264c5271def3aead71e 100644 (file)
--- a/daemon/defer.h
+++ b/daemon/defer.h
@@ -50,8 +50,14 @@ static inline void defer_sample_addr(const union kr_sockaddr *addr, bool stream)
 
        if (defer_sample_state.addr.ip.sa_family != AF_UNSPEC) {
                // TODO: this costs performance, so only in some debug mode?
-               kr_assert(kr_sockaddr_cmp(&addr->ip, &defer_sample_state.addr.ip) == kr_ok());
-               return;
+               if (kr_fails_assert(kr_sockaddr_cmp(&addr->ip, &defer_sample_state.addr.ip) == kr_ok())) {
+                       kr_log_error(DEFER, "%s != %s\n",
+                               kr_straddr(&addr->ip),
+                               kr_straddr(&defer_sample_state.addr.ip));
+                       abort(); // TODO change this to warning or remove before releasing
+                       return;
+               }
+
        }
 
        switch (addr->ip.sa_family) {

diff --git a/daemon/io.c b/daemon/io.c
index 02ebd5b425903ce7711ece2cbfc1a867edf4bd22..8093a4b0dda0638de9f6eedf4cbdbdc51e4cd3e1 100644 (file)
--- a/daemon/io.c
+++ b/daemon/io.c
@@ -379,7 +379,7 @@ static void tcp_recv(uv_stream_t *handle, ssize_t nread, const uv_buf_t *buf)
 
 static void tcp_accept_internal(uv_stream_t *master, int status, enum kr_proto grp)
 {
-       if (status != 0) {
+       if (status != 0) {
                return;
        }
 

diff --git a/daemon/main.c b/daemon/main.c
index 646a003d0357ee1ff83f87a6460f36f84b8442a0..142cdbe5c9ddc6521411359a633b86b3f2b5cd64 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -572,7 +572,7 @@ int main(int argc, char **argv)
        }
 
        if (!defer_initialized) {
-               kr_log_warning(SYSTEM, "Prioritization not initialized from Lua, using hardcoded default.");
+               kr_log_warning(SYSTEM, "Prioritization not initialized from Lua, using hardcoded default.\n");
                ret = defer_init("defer", 1);
                if (ret) {
                        ret = EXIT_FAILURE;