From: David Goulet Date: Mon, 4 Nov 2013 18:19:06 +0000 (-0500) Subject: Fix: arguments in the wrong order for fd-limit X-Git-Tag: v2.3.1~4 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=2f51ddea80006c300f0db892ef126cf2088a63ff;p=lttng-tools.git Fix: arguments in the wrong order for fd-limit This is related to a bug we've been seeing with a very HIGH load of applications registering at the same time where the get/put counters get out of sync. exhausting the fd pool quite rapidely even though there was no fd leak. Acked-by: Mathieu Desnoyers Signed-off-by: David Goulet --- diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c index ff5749a11..edf52410f 100644 --- a/src/bin/lttng-sessiond/main.c +++ b/src/bin/lttng-sessiond/main.c @@ -1551,7 +1551,7 @@ static void *thread_dispatch_ust_registration(void *data) if (ret < 0) { PERROR("close ust sock dispatch %d", ust_cmd->sock); } - lttng_fd_put(1, LTTNG_FD_APPS); + lttng_fd_put(LTTNG_FD_APPS, 1); free(ust_cmd); goto error; } @@ -1565,7 +1565,7 @@ static void *thread_dispatch_ust_registration(void *data) if (ret < 0) { PERROR("close ust sock dispatch %d", ust_cmd->sock); } - lttng_fd_put(1, LTTNG_FD_APPS); + lttng_fd_put(LTTNG_FD_APPS, 1); free(wait_node); free(ust_cmd); continue; @@ -1613,7 +1613,7 @@ static void *thread_dispatch_ust_registration(void *data) if (ret < 0) { PERROR("close ust sock dispatch %d", ust_cmd->sock); } - lttng_fd_put(1, LTTNG_FD_APPS); + lttng_fd_put(LTTNG_FD_APPS, 1); } free(ust_cmd); }