clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-09-04 20:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

start refactoring tcp_info usage

Browse Source
This commit is contained in:
Roberto De Ioris
2012-12-21 11:50:05 +01:00
parent dda86dbc9c
commit 35566a8533
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/master.c
+22 -11
View File
@@ -485,8 +485,9 @@ clear:
}
#ifdef __linux__
int get_linux_tcp_info(int fd) {
int uwsgi_get_tcp_info(int fd) {
#if defined(__linux__) || defined(__FreeBSD__)
socklen_t tis = sizeof(struct tcp_info);
if (!getsockopt(fd, IPPROTO_TCP, TCP_INFO, &uwsgi.shared->ti, &tis)) {
@@ -495,32 +496,42 @@ int get_linux_tcp_info(int fd) {
return -1;
}
#if defined(__linux__)
uwsgi.shared->load = uwsgi.shared->ti.tcpi_unacked;
uwsgi.shared->max_load = uwsgi.shared->ti.tcpi_sacked;
#elif defined(__FreeBSD__)
uwsgi.shared->load = uwsgi.shared->ti.tcpi_unacked;
uwsgi.shared->max_load = uwsgi.shared->ti.tcpi_sacked;
#endif
uwsgi.shared->options[UWSGI_OPTION_BACKLOG_STATUS] = uwsgi.shared->ti.tcpi_unacked;
uwsgi.shared->options[UWSGI_OPTION_BACKLOG_STATUS] = uwsgi.shared->load;
if (uwsgi.vassal_sos_backlog > 0 && uwsgi.has_emperor) {
if ((int) uwsgi.shared->ti.tcpi_unacked >= uwsgi.vassal_sos_backlog) {
if ((int) uwsgi.shared->load >= uwsgi.vassal_sos_backlog) {
// ask emperor for help
char byte = 30;
if (write(uwsgi.emperor_fd, &byte, 1) != 1) {
uwsgi_error("write()");
}
else {
uwsgi_log("asking emperor for reinforcements (backlog: %d)...\n", (int) uwsgi.shared->ti.tcpi_unacked);
uwsgi_log("asking emperor for reinforcements (backlog: %d)...\n", (int) uwsgi.shared->load);
}
}
}
if (uwsgi.shared->ti.tcpi_unacked >= uwsgi.shared->ti.tcpi_sacked) {
uwsgi_log_verbose("*** uWSGI listen queue of socket %d full !!! (%d/%d) ***\n", fd, uwsgi.shared->ti.tcpi_unacked, uwsgi.shared->ti.tcpi_sacked);
if (uwsgi.shared->load >= uwsgi.shared->max_load) {
uwsgi_log_verbose("*** uWSGI listen queue of socket %d full !!! (%d/%d) ***\n", fd, uwsgi.shared->load, uwsgi.shared->max_load);
uwsgi.shared->options[UWSGI_OPTION_BACKLOG_ERRORS]++;
}
return uwsgi.shared->ti.tcpi_unacked;
return uwsgi.shared->load;
}
#endif
return -1;
}
#ifdef __linux__
#include <linux/sockios.h>
#ifdef UNBIT
@@ -1277,21 +1288,21 @@ health_cycle:
check_interval = 1;
#ifdef __linux__
// get listen_queue status
struct uwsgi_socket *uwsgi_sock = uwsgi.sockets;
while (uwsgi_sock) {
if (uwsgi_sock->family == AF_INET) {
uwsgi_sock->queue = get_linux_tcp_info(uwsgi_sock->fd);
uwsgi_sock->queue = uwsgi_get_tcp_info(uwsgi_sock->fd);
}
#ifdef __linux__
#ifdef SIOBKLGQ
else if (uwsgi_sock->family == AF_UNIX) {
uwsgi_sock->queue = get_linux_unbit_SIOBKLGQ(uwsgi_sock->fd);
}
#endif
#endif
uwsgi_sock = uwsgi_sock->next;
}
#endif
for (i = 1; i <= uwsgi.numproc; i++) {
/* first check for harakiri */
plugins/python/uwsgi_pymodule.c
-4
View File
@@ -175,11 +175,7 @@ char *uwsgi_encode_pydict(PyObject * pydict, uint16_t * size) {
PyObject *py_uwsgi_listen_queue(PyObject * self, PyObject * args) {
#ifdef __linux__
return PyInt_FromLong(uwsgi.shared->options[UWSGI_OPTION_BACKLOG_STATUS]);
#else
return NULL;
#endif
}
PyObject *py_uwsgi_close(PyObject * self, PyObject * args) {
uwsgi.h
+2 -1
View File
@@ -2111,10 +2111,11 @@ struct uwsgi_shared {
int worker_log_pipe[2];
#ifdef __linux__
#if defined(__linux__) || defined(__FreeBSD__)
struct tcp_info ti;
#endif
uint64_t load;
uint64_t max_load;
struct uwsgi_cron cron[MAX_CRONS];
int cron_cnt;