mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-08-02 16:00:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix polarity of unasserts

Browse source
This commit is contained in:
Steven Dee (Jōshin) 2024-12-01 22:38:41 -05:00
parent 0d65b692e1
commit 3fb56ecf07
No known key found for this signature in database
1 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

58
tool/net/redbean.c
View file

@ -2130,10 +2130,10 @@ static void UpdateCurrentDate(struct timespec now) {
struct tm tm; struct tm tm;
t = now.tv_sec; t = now.tv_sec;
gmtime_r(&t, &tm); gmtime_r(&t, &tm);
unassert(pthread_mutex_lock(&shared->datetime_mu)); unassert(!pthread_mutex_lock(&shared->datetime_mu));
shared->nowish = now; shared->nowish = now;
FormatHttpDateTime(shared->currentdate, &tm); FormatHttpDateTime(shared->currentdate, &tm);
unassert(pthread_mutex_unlock(&shared->datetime_mu)); unassert(!pthread_mutex_unlock(&shared->datetime_mu));
} }
static int64_t GetGmtOffset(int64_t t) { static int64_t GetGmtOffset(int64_t t) {
@ -2366,9 +2366,9 @@ static char *AppendCache(char *p, int64_t seconds, char *directive) {
p = stpcpy(p, directive); p = stpcpy(p, directive);
} }
p = AppendCrlf(p); p = AppendCrlf(p);
unassert(pthread_mutex_lock(&shared->datetime_mu)); unassert(!pthread_mutex_lock(&shared->datetime_mu));
long nowish_sec = shared->nowish.tv_sec; long nowish_sec = shared->nowish.tv_sec;
unassert(pthread_mutex_unlock(&shared->datetime_mu)); unassert(!pthread_mutex_unlock(&shared->datetime_mu));
return AppendExpires(p, nowish_sec + seconds); return AppendExpires(p, nowish_sec + seconds);
} }
@ -3111,9 +3111,9 @@ td { padding-right: 3em; }\r\n\
if (atomic_load_explicit(&shared->c.connectionshandled, if (atomic_load_explicit(&shared->c.connectionshandled,
memory_order_acquire)) { memory_order_acquire)) {
appends(&cpm.outbuf, "says your redbean<br>\r\n"); appends(&cpm.outbuf, "says your redbean<br>\r\n");
unassert(pthread_mutex_lock(&shared->children_mu)); unassert(!pthread_mutex_lock(&shared->children_mu));
AppendResourceReport(&cpm.outbuf, &shared->children, "<br>\r\n"); AppendResourceReport(&cpm.outbuf, &shared->children, "<br>\r\n");
unassert(pthread_mutex_unlock(&shared->children_mu)); unassert(!pthread_mutex_unlock(&shared->children_mu));
} }
appends(&cpm.outbuf, "<td valign=\"top\">\r\n"); appends(&cpm.outbuf, "<td valign=\"top\">\r\n");
and = ""; and = "";
@ -3209,15 +3209,15 @@ static char *ServeStatusz(void) {
AppendLong1("pid", getpid()); AppendLong1("pid", getpid());
AppendLong1("ppid", getppid()); AppendLong1("ppid", getppid());
AppendLong1("now", timespec_real().tv_sec); AppendLong1("now", timespec_real().tv_sec);
unassert(pthread_mutex_lock(&shared->datetime_mu)); unassert(!pthread_mutex_lock(&shared->datetime_mu));
AppendLong1("nowish", shared->nowish.tv_sec); AppendLong1("nowish", shared->nowish.tv_sec);
unassert(pthread_mutex_unlock(&shared->datetime_mu)); unassert(!pthread_mutex_unlock(&shared->datetime_mu));
AppendLong1("gmtoff", gmtoff); AppendLong1("gmtoff", gmtoff);
AppendLong1("CLK_TCK", CLK_TCK); AppendLong1("CLK_TCK", CLK_TCK);
AppendLong1("startserver", startserver.tv_sec); AppendLong1("startserver", startserver.tv_sec);
unassert(pthread_mutex_lock(&shared->lastmeltdown_mu)); unassert(!pthread_mutex_lock(&shared->lastmeltdown_mu));
AppendLong1("lastmeltdown", shared->lastmeltdown.tv_sec); AppendLong1("lastmeltdown", shared->lastmeltdown.tv_sec);
unassert(pthread_mutex_unlock(&shared->lastmeltdown_mu)); unassert(!pthread_mutex_unlock(&shared->lastmeltdown_mu));
AppendLong1("workers", AppendLong1("workers",
atomic_load_explicit(&shared->workers, memory_order_relaxed)); atomic_load_explicit(&shared->workers, memory_order_relaxed));
AppendLong1("assets.n", assets.n); AppendLong1("assets.n", assets.n);
@ -3227,12 +3227,12 @@ static char *ServeStatusz(void) {
lua_gc(L, LUA_GCCOUNT) * 1024 + lua_gc(L, LUA_GCCOUNTB)); lua_gc(L, LUA_GCCOUNT) * 1024 + lua_gc(L, LUA_GCCOUNTB));
#endif #endif
ServeCounters(); ServeCounters();
unassert(pthread_mutex_lock(&shared->server_mu)); unassert(!pthread_mutex_lock(&shared->server_mu));
AppendRusage("server", &shared->server); AppendRusage("server", &shared->server);
unassert(pthread_mutex_unlock(&shared->server_mu)); unassert(!pthread_mutex_unlock(&shared->server_mu));
unassert(pthread_mutex_lock(&shared->children_mu)); unassert(!pthread_mutex_lock(&shared->children_mu));
AppendRusage("children", &shared->children); AppendRusage("children", &shared->children);
unassert(pthread_mutex_unlock(&shared->children_mu)); unassert(!pthread_mutex_unlock(&shared->children_mu));
p = SetStatus(200, "OK"); p = SetStatus(200, "OK");
p = AppendContentType(p, "text/plain"); p = AppendContentType(p, "text/plain");
if (cpm.msg.version >= 11) { if (cpm.msg.version >= 11) {
@ -3997,9 +3997,9 @@ static int LuaNilTlsError(lua_State *L, const char *s, int r) {
#include "tool/net/fetch.inc" #include "tool/net/fetch.inc"
static int LuaGetDate(lua_State *L) { static int LuaGetDate(lua_State *L) {
unassert(pthread_mutex_lock(&shared->datetime_mu)); unassert(!pthread_mutex_lock(&shared->datetime_mu));
lua_pushinteger(L, shared->nowish.tv_sec); lua_pushinteger(L, shared->nowish.tv_sec);
unassert(pthread_mutex_unlock(&shared->datetime_mu)); unassert(!pthread_mutex_unlock(&shared->datetime_mu));
return 1; return 1;
} }
@ -5757,10 +5757,10 @@ Content-Length: 22\r\n\
} }
static void EnterMeltdownMode(void) { static void EnterMeltdownMode(void) {
unassert(pthread_mutex_lock(&shared->lastmeltdown_mu)); unassert(!pthread_mutex_lock(&shared->lastmeltdown_mu));
if (timespec_cmp(timespec_sub(timespec_real(), shared->lastmeltdown), if (timespec_cmp(timespec_sub(timespec_real(), shared->lastmeltdown),
(struct timespec){1}) < 0) { (struct timespec){1}) < 0) {
unassert(pthread_mutex_unlock(&shared->lastmeltdown_mu)); unassert(!pthread_mutex_unlock(&shared->lastmeltdown_mu));
return; return;
} }
shared->lastmeltdown = timespec_real(); shared->lastmeltdown = timespec_real();
@ -5885,9 +5885,9 @@ static void HandleHeartbeat(void) {
size_t i; size_t i;
UpdateCurrentDate(timespec_real()); UpdateCurrentDate(timespec_real());
Reindex(); Reindex();
unassert(pthread_mutex_lock(&shared->server_mu)); unassert(!pthread_mutex_lock(&shared->server_mu));
getrusage(RUSAGE_SELF, &shared->server); getrusage(RUSAGE_SELF, &shared->server);
unassert(pthread_mutex_unlock(&shared->server_mu)); unassert(!pthread_mutex_unlock(&shared->server_mu));
#ifndef STATIC #ifndef STATIC
CallSimpleHookIfDefined("OnServerHeartbeat"); CallSimpleHookIfDefined("OnServerHeartbeat");
CollectGarbage(); CollectGarbage();
@ -6507,9 +6507,9 @@ static bool HandleMessageActual(void) {
DEBUGF("(clnt) could not synchronize message stream"); DEBUGF("(clnt) could not synchronize message stream");
} }
if (cpm.msg.version >= 10) { if (cpm.msg.version >= 10) {
unassert(pthread_mutex_lock(&shared->datetime_mu)); unassert(!pthread_mutex_lock(&shared->datetime_mu));
p = AppendCrlf(stpcpy(stpcpy(p, "Date: "), shared->currentdate)); p = AppendCrlf(stpcpy(stpcpy(p, "Date: "), shared->currentdate));
unassert(pthread_mutex_unlock(&shared->datetime_mu)); unassert(!pthread_mutex_unlock(&shared->datetime_mu));
if (!cpm.branded) if (!cpm.branded)
p = stpcpy(p, serverheader); p = stpcpy(p, serverheader);
if (extrahdrs) if (extrahdrs)
@ -7377,13 +7377,13 @@ void RedBean(int argc, char *argv[]) {
PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS,
-1, 0))); -1, 0)));
pthread_mutexattr_t attr; pthread_mutexattr_t attr;
unassert(pthread_mutexattr_init(&attr)); unassert(!pthread_mutexattr_init(&attr));
unassert(pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED)); unassert(!pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED));
unassert(pthread_mutex_init(&shared->datetime_mu, &attr)); unassert(!pthread_mutex_init(&shared->datetime_mu, &attr));
unassert(pthread_mutex_init(&shared->server_mu, &attr)); unassert(!pthread_mutex_init(&shared->server_mu, &attr));
unassert(pthread_mutex_init(&shared->children_mu, &attr)); unassert(!pthread_mutex_init(&shared->children_mu, &attr));
unassert(pthread_mutex_init(&shared->lastmeltdown_mu, &attr)); unassert(!pthread_mutex_init(&shared->lastmeltdown_mu, &attr));
unassert(pthread_mutexattr_destroy(&attr)); unassert(!pthread_mutexattr_destroy(&attr));
if (daemonize) { if (daemonize) {
for (int i = 0; i < 256; ++i) { for (int i = 0; i < 256; ++i) {
close(i); close(i);