technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Various libunit fixes.

Browse Source 
This patch contains various logging improvements and bugfixes found
during Java module development.
This commit is contained in:
Max Romanov
2019-02-28 15:52:36 +03:00
parent b92dc6036c
commit ec7319d32c
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/nxt_unit.c
View File

@@ -1047,8 +1047,11 @@ nxt_unit_response_realloc(nxt_unit_request_info_t *req,
+ max_fields_count * sizeof(nxt_unit_field_t) + max_fields_count * sizeof(nxt_unit_field_t)
+ max_fields_size; + max_fields_size;
nxt_unit_req_debug(req, "realloc %"PRIu32"", buf_size);
buf = nxt_unit_response_buf_alloc(req, buf_size); buf = nxt_unit_response_buf_alloc(req, buf_size);
if (nxt_slow_path(buf == NULL)) { if (nxt_slow_path(buf == NULL)) {
nxt_unit_req_warn(req, "realloc: new buf allocation failed");
return NXT_UNIT_ERROR; return NXT_UNIT_ERROR;
} }
@@ -1063,23 +1066,29 @@ nxt_unit_response_realloc(nxt_unit_request_info_t *req,
f = resp->fields; f = resp->fields;
for (i = 0; i < req->response->fields_count; i++) { for (i = 0; i < req->response->fields_count; i++) {
src = req->request->fields + i; src = req->response->fields + i;
if (nxt_slow_path(src->skip != 0)) { if (nxt_slow_path(src->skip != 0)) {
continue; continue;
} }
if (nxt_slow_path(src->name_length + src->value_length if (nxt_slow_path(src->name_length + src->value_length + 2
> (uint32_t) (buf->end - p))) > (uint32_t) (buf->end - p)))
{ {
nxt_unit_req_warn(req, "realloc: not enough space for field"
" #%"PRIu32" (%p), (%"PRIu32" + %"PRIu32") required",
i, src, src->name_length, src->value_length);
goto fail; goto fail;
} }
nxt_unit_sptr_set(&f->name, p); nxt_unit_sptr_set(&f->name, p);
p = nxt_cpymem(p, nxt_unit_sptr_get(&src->name), src->name_length); p = nxt_cpymem(p, nxt_unit_sptr_get(&src->name), src->name_length);
*p++ = '\0';
nxt_unit_sptr_set(&f->value, p); nxt_unit_sptr_set(&f->value, p);
p = nxt_cpymem(p, nxt_unit_sptr_get(&src->value), src->value_length); p = nxt_cpymem(p, nxt_unit_sptr_get(&src->value), src->value_length);
*p++ = '\0';
f->hash = src->hash; f->hash = src->hash;
f->skip = 0; f->skip = 0;
@@ -1094,6 +1103,10 @@ nxt_unit_response_realloc(nxt_unit_request_info_t *req,
if (nxt_slow_path(req->response->piggyback_content_length if (nxt_slow_path(req->response->piggyback_content_length
> (uint32_t) (buf->end - p))) > (uint32_t) (buf->end - p)))
{ {
nxt_unit_req_warn(req, "realloc: not enought space for content"
" #%"PRIu32", %"PRIu32" required",
i, req->response->piggyback_content_length);
goto fail; goto fail;
} }
@@ -1162,7 +1175,7 @@ nxt_unit_response_add_field(nxt_unit_request_info_t *req,
buf = req->response_buf; buf = req->response_buf;
if (nxt_slow_path(name_length + value_length if (nxt_slow_path(name_length + value_length + 2
> (uint32_t) (buf->end - buf->free))) > (uint32_t) (buf->end - buf->free)))
{ {
nxt_unit_req_warn(req, "add_field: response buffer overflow"); nxt_unit_req_warn(req, "add_field: response buffer overflow");
@@ -1179,9 +1192,11 @@ nxt_unit_response_add_field(nxt_unit_request_info_t *req,
nxt_unit_sptr_set(&f->name, buf->free); nxt_unit_sptr_set(&f->name, buf->free);
buf->free = nxt_cpymem(buf->free, name, name_length); buf->free = nxt_cpymem(buf->free, name, name_length);
*buf->free++ = '\0';
nxt_unit_sptr_set(&f->value, buf->free); nxt_unit_sptr_set(&f->value, buf->free);
buf->free = nxt_cpymem(buf->free, value, value_length); buf->free = nxt_cpymem(buf->free, value, value_length);
*buf->free++ = '\0';
f->hash = nxt_unit_field_hash(name, name_length); f->hash = nxt_unit_field_hash(name, name_length);
f->skip = 0; f->skip = 0;
@@ -1565,7 +1580,9 @@ nxt_unit_buf_next(nxt_unit_buf_t *buf)
lnk = &mmap_buf->link; lnk = &mmap_buf->link;
if (lnk == nxt_queue_last(&req_impl->incoming_buf)) { if (lnk == nxt_queue_last(&req_impl->incoming_buf)
|| lnk == nxt_queue_last(&req_impl->outgoing_buf))
{
return NULL; return NULL;
} }
@@ -1710,6 +1727,9 @@ nxt_unit_response_write_cb(nxt_unit_request_info_t *req,
} }
while (!read_info->eof) { while (!read_info->eof) {
nxt_unit_req_debug(req, "write_cb, alloc %"PRIu32"",
read_info->buf_size);
buf = nxt_unit_response_buf_alloc(req, nxt_min(read_info->buf_size, buf = nxt_unit_response_buf_alloc(req, nxt_min(read_info->buf_size,
PORT_MMAP_DATA_SIZE)); PORT_MMAP_DATA_SIZE));
if (nxt_slow_path(buf == NULL)) { if (nxt_slow_path(buf == NULL)) {
@@ -2449,14 +2469,12 @@ nxt_unit_mmap_read(nxt_unit_ctx_t *ctx, nxt_unit_recv_msg_t *recv_msg,
b->buf.end = b->buf.start + size; b->buf.end = b->buf.start + size;
b->hdr = hdr; b->hdr = hdr;
nxt_unit_debug(ctx, "#%"PRIu32": mmap_read: [%p,%d] %d->%d,(%d,%d,%d)\n" nxt_unit_debug(ctx, "#%"PRIu32": mmap_read: [%p,%d] %d->%d,(%d,%d,%d)",
"%.*s",
recv_msg->port_msg.stream, recv_msg->port_msg.stream,
start, (int) size, start, (int) size,
(int) hdr->src_pid, (int) hdr->dst_pid, (int) hdr->src_pid, (int) hdr->dst_pid,
(int) hdr->id, (int) mmap_msg->chunk_id, (int) hdr->id, (int) mmap_msg->chunk_id,
(int) mmap_msg->size, (int) mmap_msg->size);
(int) size, (char *) start);
} }
pthread_mutex_unlock(&process->incoming.mutex); pthread_mutex_unlock(&process->incoming.mutex);