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

reverted subscription string usage

Browse Source
This commit is contained in:
roberto@oneoric64
2011-12-04 15:30:08 +01:00
parent 7b8bff1a08
commit 26dc19df7d
2 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/fastrouter/fastrouter.c
+3 -18
View File
@@ -152,28 +152,13 @@ void fastrouter_manage_subscription(char *key, uint16_t keylen, char *val, uint1
usr->address_len = vallen;
}
else if (!uwsgi_strncmp("modifier1", 9, key, keylen)) {
if (vallen == 1) {
usr->modifier1 = *val;
}
else {
usr->modifier1 = uwsgi_str_num(val, vallen);
}
usr->modifier1 = uwsgi_str_num(val, vallen);
}
else if (!uwsgi_strncmp("cores", 5, key, keylen)) {
if (vallen == 8) {
memcpy(&usr->cores, val, vallen);
}
else {
usr->cores = uwsgi_str_num(val, vallen);
}
usr->cores = uwsgi_str_num(val, vallen);
}
else if (!uwsgi_strncmp("load", 4, key, keylen)) {
if (vallen == 8) {
memcpy(&usr->load, val, vallen);
}
else {
usr->load = uwsgi_str_num(val, vallen);
}
usr->load = uwsgi_str_num(val, vallen);
}
}
subscription.c
+9 -8
View File
@@ -356,11 +356,14 @@ struct uwsgi_subscribe_node *uwsgi_add_subscribe_node(struct uwsgi_subscribe_slo
void uwsgi_send_subscription(char *udp_address, char *key, size_t keysize, uint8_t modifier1, uint8_t modifier2, uint8_t cmd) {
uint64_t value64 = 0;
char value_cores[sizeof(UMAX64_STR)+1];
char value_load[sizeof(UMAX64_STR)+1];
int value_cores_size = uwsgi_long2str2n(uwsgi.numproc*uwsgi.cores, value_cores, sizeof(UMAX64_STR));
int value_load_size = uwsgi_long2str2n(uwsgi.shared->load, value_load, sizeof(UMAX64_STR));
if (!uwsgi.sockets) return;
size_t ssb_size = 4 + (2 + 3) + (2 + keysize) + (2 + 7) + (2 + strlen(uwsgi.sockets->name)) + (2+9 + 2+1) + (2+9 + 2+1) + (2+5 + 2+8) + (2+4 + 2+8);
size_t ssb_size = 4 + (2 + 3) + (2 + keysize) + (2 + 7) + (2 + strlen(uwsgi.sockets->name)) + (2+9 + 2+1) + (2+9 + 2+1) + (2+5 + 2+value_cores_size) + (2+4 + 2+value_load_size);
char *subscrbuf = uwsgi_malloc(ssb_size);
// leave space for uwsgi header
@@ -423,11 +426,10 @@ void uwsgi_send_subscription(char *udp_address, char *key, size_t keysize, uint8
memcpy(ssb, "cores", ustrlen);
ssb+=ustrlen;
value64 = uwsgi.numproc * uwsgi.cores;
ustrlen = 8;
ustrlen = value_cores_size;
*ssb++ = (uint8_t) (ustrlen & 0xff);
*ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
memcpy(ssb, &value64, 8);
memcpy(ssb, value_cores, value_cores_size);
ssb+=ustrlen;
// load
@@ -437,11 +439,10 @@ void uwsgi_send_subscription(char *udp_address, char *key, size_t keysize, uint8
memcpy(ssb, "load", ustrlen);
ssb+=ustrlen;
value64 = uwsgi.shared->load;
ustrlen = 8;
ustrlen = value_load_size;
*ssb++ = (uint8_t) (ustrlen & 0xff);
*ssb++ = (uint8_t) ((ustrlen >>8) & 0xff);
memcpy(ssb, &value64, 8);
memcpy(ssb, value_load, value_load_size);
ssb+=ustrlen;