mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-01-31 03:27:39 +00:00
Further enhance IPv4 TurfWar server
- We now vary `/claim` responses based on the `Accept` header - Remove xasprintf() call to boost `/claim` perf to 321k qps!
This commit is contained in:
Justine Tunney
parent
556697cbd8
commit
726f04e8aa
1 changed files with 257 additions and 46 deletions
|
|
@ -86,13 +86,18 @@
|
|||
#define MELTALIVE_MS 2000 // panic keepalive under heavy load
|
||||
#define POLL_ASSETS_MS 1000 // how often to stat() asset files
|
||||
#define DATE_UPDATE_MS 500 // how often to do tzdata crunching
|
||||
#define SCORE_UPDATE_MS 15000 // how often to regeenrate /score json
|
||||
#define SCORE_UPDATE_MS 60000 // how often to regeenrate /score json
|
||||
#define SCORE_H_UPDATE_MS 15000 // how often to regeenrate /score json
|
||||
#define SCORE_D_UPDATE_MS 15000 // how often to regeenrate /score json
|
||||
#define SCORE_W_UPDATE_MS 15000 // how often to regeenrate /score json
|
||||
#define SCORE_M_UPDATE_MS 15000 // how often to regeenrate /score json
|
||||
#define CLAIM_DEADLINE_MS 100 // how long /claim may block if queue is full
|
||||
#define PANIC_LOAD .85 // meltdown if this percent of pool connected
|
||||
#define PANIC_MSGS 10 // msgs per conn can't exceed it in meltdown
|
||||
#define QUEUE_MAX 800 // maximum pending claim items in queue
|
||||
#define BATCH_MAX 64 // max claims to insert per transaction
|
||||
#define NICK_MAX 40 // max length of user nickname string
|
||||
#define MSG_BUF 512 // small response lookaside
|
||||
|
||||
#define INBUF_SIZE PAGESIZE
|
||||
#define OUTBUF_SIZE PAGESIZE
|
||||
|
|
@ -138,6 +143,12 @@ Usage: turfwar.com [-dv] ARGS...\n\
|
|||
#define DEBUG(...) (void)0
|
||||
#endif
|
||||
|
||||
#define CHECK_MEM(x) \
|
||||
do { \
|
||||
if (!CheckMem(__FILE__, __LINE__, x)) { \
|
||||
goto OnError; \
|
||||
} \
|
||||
} while (0)
|
||||
#define CHECK_SYS(x) \
|
||||
do { \
|
||||
if (!CheckSys(__FILE__, __LINE__, x)) { \
|
||||
|
|
@ -174,6 +185,11 @@ static const uint8_t kGzipHeader[] = {
|
|||
kZipOsUnix, // OS
|
||||
};
|
||||
|
||||
static const char kPixel[43] =
|
||||
"\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\xff\xff\xff"
|
||||
"\x00\x00\x00\x21\xf9\x04\x01\x00\x00\x00\x00\x2c\x00\x00\x00\x00"
|
||||
"\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3b";
|
||||
|
||||
struct Data {
|
||||
char *p;
|
||||
size_t n;
|
||||
|
|
@ -202,6 +218,7 @@ atomic_int g_connections;
|
|||
struct Worker {
|
||||
pthread_t th;
|
||||
atomic_int msgcount;
|
||||
atomic_bool shutdown;
|
||||
atomic_bool connected;
|
||||
struct timespec startread;
|
||||
} * g_worker;
|
||||
|
|
@ -222,6 +239,10 @@ struct Assets {
|
|||
struct Asset about;
|
||||
struct Asset user;
|
||||
struct Asset score;
|
||||
struct Asset score_hour;
|
||||
struct Asset score_day;
|
||||
struct Asset score_week;
|
||||
struct Asset score_month;
|
||||
struct Asset recent;
|
||||
struct Asset favicon;
|
||||
} g_asset;
|
||||
|
|
@ -239,6 +260,12 @@ struct Claims {
|
|||
} data[QUEUE_MAX];
|
||||
} g_claims;
|
||||
|
||||
bool CheckMem(const char *file, int line, void *ptr) {
|
||||
if (ptr) return true;
|
||||
kprintf("%s:%d: out of memory: %s\n", file, line, strerror(errno));
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CheckSys(const char *file, int line, long rc) {
|
||||
if (rc != -1) return true;
|
||||
kprintf("%s:%d: %s\n", file, line, strerror(errno));
|
||||
|
|
@ -427,6 +454,7 @@ void *HttpWorker(void *arg) {
|
|||
char name[16];
|
||||
sigset_t mask;
|
||||
int id = (intptr_t)arg;
|
||||
char *msgbuf = _gc(malloc(MSG_BUF));
|
||||
char *inbuf = NewSafeBuffer(INBUF_SIZE);
|
||||
char *outbuf = NewSafeBuffer(OUTBUF_SIZE);
|
||||
struct timeval timeo = {g_keepalive / 1000, g_keepalive % 1000};
|
||||
|
|
@ -504,6 +532,14 @@ void *HttpWorker(void *arg) {
|
|||
a = &g_asset.about;
|
||||
} else if (UrlStartsWith("/user.html")) {
|
||||
a = &g_asset.user;
|
||||
} else if (UrlStartsWith("/score/hour")) {
|
||||
a = &g_asset.score_hour;
|
||||
} else if (UrlStartsWith("/score/day")) {
|
||||
a = &g_asset.score_day;
|
||||
} else if (UrlStartsWith("/score/week")) {
|
||||
a = &g_asset.score_week;
|
||||
} else if (UrlStartsWith("/score/month")) {
|
||||
a = &g_asset.score_month;
|
||||
} else if (UrlStartsWith("/score")) {
|
||||
a = &g_asset.score;
|
||||
} else if (UrlStartsWith("/recent")) {
|
||||
|
|
@ -545,6 +581,7 @@ void *HttpWorker(void *arg) {
|
|||
} else if (UrlStartsWith("/ip")) {
|
||||
if (!ipv6) {
|
||||
p = stpcpy(outbuf, "HTTP/1.1 200 OK\r\n" STANDARD_RESPONSE_HEADERS
|
||||
"Vary: Accept\r\n"
|
||||
"Content-Type: text/plain\r\n"
|
||||
"Cache-Control: max-age=3600, private\r\n"
|
||||
"Date: ");
|
||||
|
|
@ -563,6 +600,7 @@ void *HttpWorker(void *arg) {
|
|||
q = "IPv4 Games only supports IPv4 right now";
|
||||
p = stpcpy(outbuf,
|
||||
"HTTP/1.1 400 Need IPv4\r\n" STANDARD_RESPONSE_HEADERS
|
||||
"Vary: Accept\r\n"
|
||||
"Content-Type: text/plain\r\n"
|
||||
"Cache-Control: private\r\n"
|
||||
"Connection: close\r\n"
|
||||
|
|
@ -586,26 +624,71 @@ void *HttpWorker(void *arg) {
|
|||
_timespec_add(_timespec_real(),
|
||||
_timespec_frommillis(CLAIM_DEADLINE_MS)))) {
|
||||
LOG("%s claimed by %s\n", ipbuf, v.name);
|
||||
q = xasprintf("<!doctype html>\n"
|
||||
"<title>The land at %s was claimed for %s.</title>\n"
|
||||
"<meta name=\"viewport\" "
|
||||
"content=\"width=device-width, initial-scale=1\">\n"
|
||||
"The land at %s was claimed for <a "
|
||||
"href=\"/user.html?name=%s\">%s</a>.\n"
|
||||
"<p>\n<a href=/>Back to homepage</a>\n",
|
||||
ipbuf, v.name, ipbuf, v.name, v.name);
|
||||
p = stpcpy(outbuf, "HTTP/1.1 200 OK\r\n" STANDARD_RESPONSE_HEADERS
|
||||
"Content-Type: text/html\r\n"
|
||||
"Cache-Control: private\r\n"
|
||||
"Date: ");
|
||||
p = FormatDate(p);
|
||||
p = stpcpy(p, "\r\nContent-Length: ");
|
||||
p = FormatInt32(p, strlen(q));
|
||||
p = stpcpy(p, "\r\n\r\n");
|
||||
p = stpcpy(p, q);
|
||||
if (HasHeader(kHttpAccept) &&
|
||||
(HeaderHas(msg, inbuf, kHttpAccept, "image/*", 7) ||
|
||||
HeaderHas(msg, inbuf, kHttpAccept, "image/gif", 9))) {
|
||||
p = stpcpy(outbuf, "HTTP/1.1 200 OK\r\n" STANDARD_RESPONSE_HEADERS
|
||||
"Vary: Accept\r\n"
|
||||
"Cache-Control: private\r\n"
|
||||
"Content-Type: image/gif\r\n"
|
||||
"Date: ");
|
||||
p = FormatDate(p);
|
||||
p = stpcpy(p, "\r\nContent-Length: ");
|
||||
p = FormatInt32(p, sizeof(kPixel));
|
||||
p = stpcpy(p, "\r\n\r\n");
|
||||
p = mempcpy(p, kPixel, sizeof(kPixel));
|
||||
} else if (HasHeader(kHttpAccept) &&
|
||||
HeaderHas(msg, inbuf, kHttpAccept, "text/plain", 10) &&
|
||||
!HeaderHas(msg, inbuf, kHttpAccept, "text/html", 9)) {
|
||||
ksnprintf(msgbuf, MSG_BUF, "The land at %s was claimed for %s\n",
|
||||
ipbuf, v.name);
|
||||
q = msgbuf;
|
||||
p = stpcpy(outbuf, "HTTP/1.1 200 OK\r\n" STANDARD_RESPONSE_HEADERS
|
||||
"Vary: Accept\r\n"
|
||||
"Cache-Control: private\r\n"
|
||||
"Content-Type: text/plain\r\n"
|
||||
"Date: ");
|
||||
p = FormatDate(p);
|
||||
p = stpcpy(p, "\r\nContent-Length: ");
|
||||
p = FormatInt32(p, strlen(q));
|
||||
p = stpcpy(p, "\r\n\r\n");
|
||||
p = stpcpy(p, q);
|
||||
} else if (!HasHeader(kHttpAccept) ||
|
||||
(HeaderHas(msg, inbuf, kHttpAccept, "text/html", 9) ||
|
||||
HeaderHas(msg, inbuf, kHttpAccept, "text/*", 6) ||
|
||||
HeaderHas(msg, inbuf, kHttpAccept, "*/*", 3))) {
|
||||
ksnprintf(msgbuf, MSG_BUF,
|
||||
"<!doctype html>\n"
|
||||
"<title>The land at %s was claimed for %s.</title>\n"
|
||||
"<meta name=\"viewport\" "
|
||||
"content=\"width=device-width, initial-scale=1\">\n"
|
||||
"The land at %s was claimed for <a "
|
||||
"href=\"/user.html?name=%s\">%s</a>.\n"
|
||||
"<p>\n<a href=/>Back to homepage</a>\n",
|
||||
ipbuf, v.name, ipbuf, v.name, v.name);
|
||||
q = msgbuf;
|
||||
p = stpcpy(outbuf, "HTTP/1.1 200 OK\r\n" STANDARD_RESPONSE_HEADERS
|
||||
"Vary: Accept\r\n"
|
||||
"Cache-Control: private\r\n"
|
||||
"Content-Type: text/html\r\n"
|
||||
"Date: ");
|
||||
p = FormatDate(p);
|
||||
p = stpcpy(p, "\r\nContent-Length: ");
|
||||
p = FormatInt32(p, strlen(q));
|
||||
p = stpcpy(p, "\r\n\r\n");
|
||||
p = stpcpy(p, q);
|
||||
} else {
|
||||
p = stpcpy(outbuf,
|
||||
"HTTP/1.1 204 No Content\r\n" STANDARD_RESPONSE_HEADERS
|
||||
"Vary: Accept\r\n"
|
||||
"Cache-Control: private\r\n"
|
||||
"Content-Length: 0\r\n"
|
||||
"Date: ");
|
||||
p = FormatDate(p);
|
||||
p = stpcpy(p, "\r\n\r\n");
|
||||
}
|
||||
outmsglen = p - outbuf;
|
||||
sent = write(client, outbuf, p - outbuf);
|
||||
free(q);
|
||||
} else {
|
||||
LOG("%s: 502 Claims Queue Full\n", ipbuf);
|
||||
q = "Claims Queue Full";
|
||||
|
|
@ -680,6 +763,7 @@ void *HttpWorker(void *arg) {
|
|||
}
|
||||
|
||||
LOG("HttpWorker #%d exiting", id);
|
||||
g_worker[id].shutdown = true;
|
||||
FreeSafeBuffer(outbuf);
|
||||
FreeSafeBuffer(inbuf);
|
||||
close(server);
|
||||
|
|
@ -691,21 +775,29 @@ struct Data Gzip(struct Data data) {
|
|||
void *tmp;
|
||||
uint32_t crc;
|
||||
char footer[8];
|
||||
struct Data res;
|
||||
z_stream zs = {0};
|
||||
struct Data res = {0};
|
||||
crc = crc32_z(0, data.p, data.n);
|
||||
WRITE32LE(footer + 0, crc);
|
||||
WRITE32LE(footer + 4, data.n);
|
||||
CHECK_EQ(Z_OK, deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED,
|
||||
-MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY));
|
||||
if (Z_OK != deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, -MAX_WBITS,
|
||||
DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY)) {
|
||||
return (struct Data){0};
|
||||
}
|
||||
zs.next_in = (const Bytef *)data.p;
|
||||
zs.avail_in = data.n;
|
||||
zs.avail_out = compressBound(data.n);
|
||||
zs.next_out = tmp = xmalloc(zs.avail_out);
|
||||
if (!(zs.next_out = tmp = malloc(zs.avail_out))) {
|
||||
deflateEnd(&zs);
|
||||
return (struct Data){0};
|
||||
}
|
||||
CHECK_EQ(Z_STREAM_END, deflate(&zs, Z_FINISH));
|
||||
CHECK_EQ(Z_OK, deflateEnd(&zs));
|
||||
res.n = sizeof(kGzipHeader) + zs.total_out + sizeof(footer);
|
||||
p = res.p = xmalloc(res.n);
|
||||
if (!(p = res.p = malloc(res.n))) {
|
||||
free(tmp);
|
||||
return (struct Data){0};
|
||||
}
|
||||
p = mempcpy(p, kGzipHeader, sizeof(kGzipHeader));
|
||||
p = mempcpy(p, tmp, zs.total_out);
|
||||
p = mempcpy(p, footer, sizeof(footer));
|
||||
|
|
@ -720,9 +812,9 @@ struct Asset LoadAsset(const char *path, const char *type) {
|
|||
CHECK_NOTNULL((a.data.p = xslurp(path, &a.data.n)));
|
||||
a.type = type;
|
||||
a.cache = "max-age=3600, must-revalidate";
|
||||
a.path = xstrdup(path);
|
||||
CHECK_NOTNULL((a.path = strdup(path)));
|
||||
a.mtim = st.st_mtim;
|
||||
a.gzip = Gzip(a.data);
|
||||
CHECK_NOTNULL((a.gzip = Gzip(a.data)).p);
|
||||
FormatUnixHttpDateTime(a.lastmod, a.mtim.tv_sec);
|
||||
return a;
|
||||
}
|
||||
|
|
@ -737,12 +829,13 @@ bool ReloadAsset(struct Asset *a) {
|
|||
struct Data gzip = {0};
|
||||
CHECK_SYS((fd = open(a->path, O_RDONLY)));
|
||||
CHECK_SYS(fstat(fd, &st));
|
||||
if (_timespec_gt(st.st_mtim, a->mtim) && (data.p = malloc(st.st_size))) {
|
||||
if (_timespec_gt(st.st_mtim, a->mtim)) {
|
||||
FormatUnixHttpDateTime(lastmod, st.st_mtim.tv_sec);
|
||||
CHECK_MEM((data.p = malloc(st.st_size)));
|
||||
CHECK_SYS((rc = read(fd, data.p, st.st_size)));
|
||||
data.n = st.st_size;
|
||||
if (rc != st.st_size) goto OnError;
|
||||
gzip = Gzip(data);
|
||||
CHECK_MEM((gzip = Gzip(data)).p);
|
||||
//!//!//!//!//!//!//!//!//!//!//!//!//!/
|
||||
nsync_mu_lock(&a->lock);
|
||||
f[0] = a->data.p;
|
||||
|
|
@ -760,6 +853,7 @@ bool ReloadAsset(struct Asset *a) {
|
|||
return true;
|
||||
OnError:
|
||||
free(data.p);
|
||||
free(gzip.p);
|
||||
close(fd);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -775,8 +869,19 @@ void IgnoreSignal(int sig) {
|
|||
}
|
||||
|
||||
void OnCtrlC(int sig) {
|
||||
LOG("Received %s shutting down...\n", strsignal(sig));
|
||||
nsync_note_notify(g_shutdown);
|
||||
if (!nsync_note_is_notified(g_shutdown)) {
|
||||
LOG("Received %s shutting down...\n", strsignal(sig));
|
||||
nsync_note_notify(g_shutdown);
|
||||
} else {
|
||||
// there's no way to deliver signals to workers atomically, unless
|
||||
// we pay the cost of ppoll() which isn't necessary in this design
|
||||
LOG("Received %s again so sending another volley...\n", strsignal(sig));
|
||||
for (int i = 0; i < g_workers; ++i) {
|
||||
if (!g_worker[i].shutdown) {
|
||||
tkill(pthread_getunique_np(g_worker[i].th), SIGUSR1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void GetOpts(int argc, char *argv[]) {
|
||||
|
|
@ -808,10 +913,10 @@ static void GetOpts(int argc, char *argv[]) {
|
|||
}
|
||||
}
|
||||
|
||||
void Update(struct Asset *a, bool gen(struct Asset *)) {
|
||||
void Update(struct Asset *a, bool gen(struct Asset *, long), long arg) {
|
||||
void *f[2];
|
||||
struct Asset t;
|
||||
if (gen(&t)) {
|
||||
if (gen(&t, arg)) {
|
||||
//!//!//!//!//!//!//!//!//!//!//!//!//!/
|
||||
nsync_mu_lock(&a->lock);
|
||||
f[0] = a->data.p;
|
||||
|
|
@ -827,7 +932,7 @@ void Update(struct Asset *a, bool gen(struct Asset *)) {
|
|||
}
|
||||
}
|
||||
|
||||
bool GenerateScore(struct Asset *out) {
|
||||
bool GenerateScore(struct Asset *out, long seconds) {
|
||||
int rc;
|
||||
char *sb = 0;
|
||||
sqlite3 *db = 0;
|
||||
|
|
@ -837,9 +942,9 @@ bool GenerateScore(struct Asset *out) {
|
|||
bool namestate = false;
|
||||
char name1[NICK_MAX + 1] = {0};
|
||||
char name2[NICK_MAX + 1];
|
||||
DEBUG("GenerateScore\n");
|
||||
DEBUG("GenerateScore %ld\n", seconds);
|
||||
a.type = "application/json";
|
||||
a.cache = "max-age=60, must-revalidate";
|
||||
a.cache = "max-age=15, must-revalidate";
|
||||
CHECK_SYS(clock_gettime(CLOCK_REALTIME, &a.mtim));
|
||||
FormatUnixHttpDateTime(a.lastmod, a.mtim.tv_sec);
|
||||
CHECK_SYS(appends(&a.data.p, "{\n"));
|
||||
|
|
@ -849,11 +954,22 @@ bool GenerateScore(struct Asset *out) {
|
|||
CHECK_SQL(sqlite3_open("db.sqlite3", &db));
|
||||
CHECK_SQL(sqlite3_exec(db, "PRAGMA journal_mode=WAL", 0, 0, 0));
|
||||
CHECK_SQL(sqlite3_exec(db, "PRAGMA synchronous=NORMAL", 0, 0, 0));
|
||||
CHECK_DB(sqlite3_prepare_v2(db,
|
||||
"SELECT nick, (ip >> 24), COUNT(*)\n"
|
||||
"FROM land\n"
|
||||
"GROUP BY nick, (ip >> 24)",
|
||||
-1, &stmt, 0));
|
||||
if (seconds == -1) {
|
||||
CHECK_DB(sqlite3_prepare_v2(db,
|
||||
"SELECT nick, (ip >> 24), COUNT(*)\n"
|
||||
"FROM land\n"
|
||||
"GROUP BY nick, (ip >> 24)",
|
||||
-1, &stmt, 0));
|
||||
} else {
|
||||
CHECK_DB(sqlite3_prepare_v2(db,
|
||||
"SELECT nick, (ip >> 24), COUNT(*)\n"
|
||||
" FROM land\n"
|
||||
"WHERE created NOT NULL\n"
|
||||
" AND created >= ?1\n"
|
||||
"GROUP BY nick, (ip >> 24)",
|
||||
-1, &stmt, 0));
|
||||
CHECK_DB(sqlite3_bind_int64(stmt, 1, a.mtim.tv_sec - seconds));
|
||||
}
|
||||
CHECK_SQL(sqlite3_exec(db, "BEGIN TRANSACTION", 0, 0, 0));
|
||||
while ((rc = sqlite3_step(stmt)) != SQLITE_DONE) {
|
||||
if (rc != SQLITE_ROW) CHECK_SQL(rc);
|
||||
|
|
@ -900,7 +1016,7 @@ void *ScoreWorker(void *arg) {
|
|||
for (deadline = _timespec_real();;) {
|
||||
deadline = _timespec_add(deadline, _timespec_frommillis(SCORE_UPDATE_MS));
|
||||
if (!nsync_note_wait(g_shutdown, deadline)) {
|
||||
Update(&g_asset.score, GenerateScore);
|
||||
Update(&g_asset.score, GenerateScore, -1);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
|
|
@ -909,7 +1025,79 @@ void *ScoreWorker(void *arg) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
bool GenerateRecent(struct Asset *out) {
|
||||
// single thread for regenerating the user scores json
|
||||
void *ScoreHourWorker(void *arg) {
|
||||
nsync_time deadline;
|
||||
LOG("ScoreHourWorker started\n");
|
||||
OnlyRunOnCpu(0);
|
||||
pthread_setname_np(pthread_self(), "ScoreHourWorker");
|
||||
for (deadline = _timespec_real();;) {
|
||||
deadline = _timespec_add(deadline, _timespec_frommillis(SCORE_D_UPDATE_MS));
|
||||
if (!nsync_note_wait(g_shutdown, deadline)) {
|
||||
Update(&g_asset.score_hour, GenerateScore, 60L * 60);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
LOG("ScoreHourWorker exiting\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
// single thread for regenerating the user scores json
|
||||
void *ScoreDayWorker(void *arg) {
|
||||
nsync_time deadline;
|
||||
LOG("ScoreDayWorker started\n");
|
||||
OnlyRunOnCpu(0);
|
||||
pthread_setname_np(pthread_self(), "ScoreDayWorker");
|
||||
for (deadline = _timespec_real();;) {
|
||||
deadline = _timespec_add(deadline, _timespec_frommillis(SCORE_D_UPDATE_MS));
|
||||
if (!nsync_note_wait(g_shutdown, deadline)) {
|
||||
Update(&g_asset.score_day, GenerateScore, 60L * 60 * 24);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
LOG("ScoreDayWorker exiting\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
// single thread for regenerating the user scores json
|
||||
void *ScoreWeekWorker(void *arg) {
|
||||
nsync_time deadline;
|
||||
LOG("ScoreWeekWorker started\n");
|
||||
OnlyRunOnCpu(0);
|
||||
pthread_setname_np(pthread_self(), "ScoreWeekWorker");
|
||||
for (deadline = _timespec_real();;) {
|
||||
deadline = _timespec_add(deadline, _timespec_frommillis(SCORE_D_UPDATE_MS));
|
||||
if (!nsync_note_wait(g_shutdown, deadline)) {
|
||||
Update(&g_asset.score_week, GenerateScore, 60L * 60 * 24 * 7);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
LOG("ScoreWeekWorker exiting\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
// single thread for regenerating the user scores json
|
||||
void *ScoreMonthWorker(void *arg) {
|
||||
nsync_time deadline;
|
||||
LOG("ScoreMonthWorker started\n");
|
||||
OnlyRunOnCpu(0);
|
||||
pthread_setname_np(pthread_self(), "ScoreMonthWorker");
|
||||
for (deadline = _timespec_real();;) {
|
||||
deadline = _timespec_add(deadline, _timespec_frommillis(SCORE_D_UPDATE_MS));
|
||||
if (!nsync_note_wait(g_shutdown, deadline)) {
|
||||
Update(&g_asset.score_month, GenerateScore, 60L * 60 * 24 * 30);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
LOG("ScoreMonthWorker exiting\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool GenerateRecent(struct Asset *out, long arg) {
|
||||
int rc;
|
||||
char *sb = 0;
|
||||
sqlite3 *db = 0;
|
||||
|
|
@ -981,7 +1169,7 @@ void *RecentWorker(void *arg) {
|
|||
nsync_time_no_deadline, g_shutdown);
|
||||
nsync_mu_unlock(&g_recent.mu);
|
||||
if (rc == ECANCELED) break;
|
||||
Update(&g_asset.recent, GenerateRecent);
|
||||
Update(&g_asset.recent, GenerateRecent, -1);
|
||||
}
|
||||
LOG("RecentWorker exiting\n");
|
||||
return 0;
|
||||
|
|
@ -1005,7 +1193,9 @@ StartOver:
|
|||
"VALUES (?1, ?2, ?3)\n"
|
||||
"ON CONFLICT (ip) DO\n"
|
||||
"UPDATE SET (nick, created) = (?2, ?3)\n"
|
||||
"WHERE nick != ?2",
|
||||
"WHERE nick != ?2\n"
|
||||
" AND (created IS NULL\n"
|
||||
" OR (?3 - created) > 3600)",
|
||||
-1, &stmt, 0));
|
||||
LOG("ClaimWorker started\n");
|
||||
while ((n = GetClaims(&g_claims, v, BATCH_MAX, nsync_time_no_deadline))) {
|
||||
|
|
@ -1014,6 +1204,7 @@ StartOver:
|
|||
CHECK_DB(sqlite3_bind_int64(stmt, 1, v[i].ip));
|
||||
CHECK_DB(sqlite3_bind_text(stmt, 2, v[i].name, -1, SQLITE_TRANSIENT));
|
||||
CHECK_DB(sqlite3_bind_int64(stmt, 3, v[i].created));
|
||||
CHECK_DB(sqlite3_bind_int64(stmt, 3, v[i].created));
|
||||
CHECK_DB((rc = sqlite3_step(stmt)) == SQLITE_DONE ? SQLITE_OK : rc);
|
||||
CHECK_DB(sqlite3_reset(stmt));
|
||||
}
|
||||
|
|
@ -1130,10 +1321,22 @@ int main(int argc, char *argv[]) {
|
|||
|
||||
// create threads
|
||||
pthread_t scorer;
|
||||
CHECK_EQ(1, GenerateScore(&g_asset.score));
|
||||
CHECK_EQ(1, GenerateScore(&g_asset.score, -1));
|
||||
CHECK_EQ(0, pthread_create(&scorer, 0, ScoreWorker, 0));
|
||||
pthread_t scorer_hour;
|
||||
CHECK_EQ(1, GenerateScore(&g_asset.score_hour, 60L * 60));
|
||||
CHECK_EQ(0, pthread_create(&scorer_hour, 0, ScoreHourWorker, 0));
|
||||
pthread_t scorer_day;
|
||||
CHECK_EQ(1, GenerateScore(&g_asset.score_day, 60L * 60 * 24));
|
||||
CHECK_EQ(0, pthread_create(&scorer_day, 0, ScoreDayWorker, 0));
|
||||
pthread_t scorer_week;
|
||||
CHECK_EQ(1, GenerateScore(&g_asset.score_week, 60L * 60 * 24 * 7));
|
||||
CHECK_EQ(0, pthread_create(&scorer_week, 0, ScoreWeekWorker, 0));
|
||||
pthread_t scorer_month;
|
||||
CHECK_EQ(1, GenerateScore(&g_asset.score_month, 60L * 60 * 24 * 30));
|
||||
CHECK_EQ(0, pthread_create(&scorer_month, 0, ScoreMonthWorker, 0));
|
||||
pthread_t recentr;
|
||||
CHECK_EQ(1, GenerateRecent(&g_asset.recent));
|
||||
CHECK_EQ(1, GenerateRecent(&g_asset.recent, -1));
|
||||
CHECK_EQ(0, pthread_create(&recentr, 0, RecentWorker, 0));
|
||||
pthread_t claimer;
|
||||
CHECK_EQ(0, pthread_create(&claimer, 0, ClaimWorker, 0));
|
||||
|
|
@ -1164,6 +1367,10 @@ int main(int argc, char *argv[]) {
|
|||
LOG("Waiting for helpers to finish...\n");
|
||||
CHECK_EQ(0, pthread_join(recentr, 0));
|
||||
CHECK_EQ(0, pthread_join(scorer, 0));
|
||||
CHECK_EQ(0, pthread_join(scorer_hour, 0));
|
||||
CHECK_EQ(0, pthread_join(scorer_day, 0));
|
||||
CHECK_EQ(0, pthread_join(scorer_week, 0));
|
||||
CHECK_EQ(0, pthread_join(scorer_month, 0));
|
||||
CHECK_EQ(0, pthread_join(nower, 0));
|
||||
|
||||
// wait for consumers to finish
|
||||
|
|
@ -1178,6 +1385,10 @@ int main(int argc, char *argv[]) {
|
|||
FreeAsset(&g_asset.about);
|
||||
FreeAsset(&g_asset.index);
|
||||
FreeAsset(&g_asset.score);
|
||||
FreeAsset(&g_asset.score_hour);
|
||||
FreeAsset(&g_asset.score_day);
|
||||
FreeAsset(&g_asset.score_week);
|
||||
FreeAsset(&g_asset.score_month);
|
||||
FreeAsset(&g_asset.recent);
|
||||
FreeAsset(&g_asset.favicon);
|
||||
nsync_note_free(g_terminate);
|
||||
|
|
|
|||
Loading…
Reference in a new issue