mirror of
https://github.com/clearlinux/uwsgi.git
synced 2026-11-21 19:02:53 +00:00
added --fastrouter-harakiri
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
extern struct uwsgi_server uwsgi;
|
||||
|
||||
struct uwsgi_gateway *register_fat_gateway(char *name, void (*loop)(void)) {
|
||||
struct uwsgi_gateway *register_fat_gateway(char *name, void (*loop)(int)) {
|
||||
|
||||
struct uwsgi_gateway *ug;
|
||||
int num=1,i;
|
||||
@@ -29,7 +29,7 @@ struct uwsgi_gateway *register_fat_gateway(char *name, void (*loop)(void)) {
|
||||
return ug;
|
||||
}
|
||||
|
||||
struct uwsgi_gateway *register_gateway(char *name, void (*loop)(void)) {
|
||||
struct uwsgi_gateway *register_gateway(char *name, void (*loop)(int)) {
|
||||
|
||||
pid_t gw_pid;
|
||||
pid_t orig_pid = getpid();
|
||||
@@ -47,6 +47,9 @@ struct uwsgi_gateway *register_gateway(char *name, void (*loop)(void)) {
|
||||
}
|
||||
}
|
||||
|
||||
if (uwsgi.master_process)
|
||||
uwsgi.shared->gateways_harakiri[uwsgi.gateways_cnt] = 0;
|
||||
|
||||
gw_pid = uwsgi_fork(name);
|
||||
if (gw_pid < 0) {
|
||||
uwsgi_error("fork()");
|
||||
@@ -65,7 +68,7 @@ struct uwsgi_gateway *register_gateway(char *name, void (*loop)(void)) {
|
||||
// wait for child end
|
||||
//waitpid(-1, &i, 0);
|
||||
}
|
||||
loop();
|
||||
loop(uwsgi.gateways_cnt);
|
||||
// never here !!! (i hope)
|
||||
exit(1);
|
||||
}
|
||||
@@ -76,7 +79,7 @@ struct uwsgi_gateway *register_gateway(char *name, void (*loop)(void)) {
|
||||
else {
|
||||
if (gw_pid == 0) {
|
||||
if (uwsgi.master_as_root) uwsgi_as_root();
|
||||
loop();
|
||||
loop(uwsgi.gateways_cnt);
|
||||
// never here !!! (i hope)
|
||||
exit(1);
|
||||
}
|
||||
@@ -102,6 +105,9 @@ void gateway_respawn(int id) {
|
||||
|
||||
pid_t gw_pid;
|
||||
struct uwsgi_gateway *ug = &uwsgi.gateways[id];
|
||||
|
||||
if (uwsgi.master_process)
|
||||
uwsgi.shared->gateways_harakiri[id] = 0;
|
||||
|
||||
gw_pid = uwsgi_fork(ug->name);
|
||||
if (gw_pid < 0) {
|
||||
@@ -116,7 +122,7 @@ void gateway_respawn(int id) {
|
||||
uwsgi_error("prctl()");
|
||||
}
|
||||
#endif
|
||||
ug->loop();
|
||||
ug->loop(id);
|
||||
// never here !!! (i hope)
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@@ -1422,6 +1422,18 @@ int master_loop(char **argv, char **environ) {
|
||||
// need to find a better way
|
||||
//uwsgi.workers[i].last_running_time = uwsgi.workers[i].running_time;
|
||||
}
|
||||
|
||||
for (i = 0; i < uwsgi.gateways_cnt; i++) {
|
||||
if (ushared->gateways_harakiri[i] > 0) {
|
||||
if (ushared->gateways_harakiri[i] < (time_t) uwsgi.current_time) {
|
||||
if (uwsgi.gateways[i].pid > 0) {
|
||||
kill(uwsgi.gateways[i].pid, SIGKILL);
|
||||
}
|
||||
ushared->gateways_harakiri[i] = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < uwsgi.mules_cnt; i++) {
|
||||
if (uwsgi.mules[i].harakiri > 0) {
|
||||
if (uwsgi.mules[i].harakiri < (time_t) uwsgi.current_time) {
|
||||
|
||||
@@ -244,7 +244,7 @@ void uwsgi_erlang_rpc(int fd, erlang_pid *from, ei_x_buff *x) {
|
||||
|
||||
}
|
||||
|
||||
void erlang_loop() {
|
||||
void erlang_loop(int id) {
|
||||
|
||||
ErlConnect econn;
|
||||
//ErlMessage em;
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
#define LONG_ARGS_FASTROUTER_TOLERANCE 150009
|
||||
#define LONG_ARGS_FASTROUTER_STATS 150010
|
||||
#define LONG_ARGS_FASTROUTER_ZERG 150011
|
||||
#define LONG_ARGS_FASTROUTER_HARAKIRI 150012
|
||||
|
||||
#define FASTROUTER_STATUS_FREE 0
|
||||
#define FASTROUTER_STATUS_CONNECTING 1
|
||||
@@ -81,6 +82,7 @@ struct uwsgi_fastrouter {
|
||||
int i_am_cheap;
|
||||
|
||||
int tolerance;
|
||||
int harakiri;
|
||||
} ufr;
|
||||
|
||||
static void fastrouter_go_cheap(void) {
|
||||
@@ -143,6 +145,7 @@ struct option fastrouter_options[] = {
|
||||
{"fastrouter-stats", required_argument, 0, LONG_ARGS_FASTROUTER_STATS},
|
||||
{"fastrouter-stats-server", required_argument, 0, LONG_ARGS_FASTROUTER_STATS},
|
||||
{"fastrouter-ss", required_argument, 0, LONG_ARGS_FASTROUTER_STATS},
|
||||
{"fastrouter-harakiri", required_argument, 0, LONG_ARGS_FASTROUTER_HARAKIRI},
|
||||
{0, 0, 0, 0},
|
||||
};
|
||||
|
||||
@@ -290,7 +293,7 @@ struct fastrouter_session *alloc_fr_session() {
|
||||
return uwsgi_malloc(sizeof(struct fastrouter_session));
|
||||
}
|
||||
|
||||
void fastrouter_loop() {
|
||||
void fastrouter_loop(int id) {
|
||||
|
||||
int nevents;
|
||||
int interesting_fd;
|
||||
@@ -434,8 +437,16 @@ void fastrouter_loop() {
|
||||
}
|
||||
}
|
||||
|
||||
if (uwsgi.master_process && ufr.harakiri > 0) {
|
||||
uwsgi.shared->gateways_harakiri[id] = 0;
|
||||
}
|
||||
|
||||
nevents = event_queue_wait_multi(ufr.queue, delta, events, ufr.nevents);
|
||||
|
||||
if (uwsgi.master_process && ufr.harakiri > 0) {
|
||||
uwsgi.shared->gateways_harakiri[id] = time(NULL) + ufr.harakiri;
|
||||
}
|
||||
|
||||
if (nevents == 0) {
|
||||
expire_timeouts(fr_table);
|
||||
}
|
||||
@@ -847,6 +858,9 @@ int fastrouter_opt(int i, char *optarg) {
|
||||
case LONG_ARGS_FASTROUTER_EVENTS:
|
||||
ufr.nevents = atoi(optarg);
|
||||
return 1;
|
||||
case LONG_ARGS_FASTROUTER_HARAKIRI:
|
||||
ufr.harakiri = atoi(optarg);
|
||||
return 1;
|
||||
case LONG_ARGS_FASTROUTER_USE_PATTERN:
|
||||
ufr.pattern = optarg;
|
||||
// optimization
|
||||
|
||||
+1
-1
@@ -429,7 +429,7 @@ int http_parse(struct http_session *h_session) {
|
||||
|
||||
}
|
||||
|
||||
void http_loop() {
|
||||
void http_loop(int id) {
|
||||
|
||||
int uhttp_queue;
|
||||
int uhttp_subserver = -1;
|
||||
|
||||
@@ -321,7 +321,7 @@ union uwsgi_sockaddr_ptr {
|
||||
struct uwsgi_gateway {
|
||||
|
||||
char *name;
|
||||
void (*loop) (void);
|
||||
void (*loop) (int);
|
||||
pid_t pid;
|
||||
int num;
|
||||
int use_signals;
|
||||
@@ -1746,6 +1746,8 @@ struct uwsgi_shared {
|
||||
uint64_t load;
|
||||
struct uwsgi_cron cron[MAX_CRONS];
|
||||
int cron_cnt;
|
||||
|
||||
time_t gateways_harakiri[MAX_GATEWAYS];
|
||||
};
|
||||
|
||||
struct uwsgi_core {
|
||||
@@ -2146,8 +2148,8 @@ char *uwsgi_cheap_string(char *, int);
|
||||
int uwsgi_parse_array(char *, uint16_t, char **, uint16_t *, uint8_t *);
|
||||
|
||||
|
||||
struct uwsgi_gateway *register_gateway(char *, void (*)(void));
|
||||
struct uwsgi_gateway *register_fat_gateway(char *, void (*)(void));
|
||||
struct uwsgi_gateway *register_gateway(char *, void (*)(int));
|
||||
struct uwsgi_gateway *register_fat_gateway(char *, void (*)(int));
|
||||
void gateway_respawn(int);
|
||||
|
||||
char *uwsgi_open_and_read(char *, int *, int, char *[]);
|
||||
|
||||
Reference in New Issue
Block a user