summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/c/cgi.c21
-rw-r--r--src/c/fastcgi.c21
-rw-r--r--src/c/http.c21
-rw-r--r--src/c/urweb.c48
4 files changed, 96 insertions, 15 deletions
diff --git a/src/c/cgi.c b/src/c/cgi.c
index 1d7d9810..91b22f06 100644
--- a/src/c/cgi.c
+++ b/src/c/cgi.c
@@ -114,3 +114,24 @@ int main(int argc, char *argv[]) {
else
return 1;
}
+
+void *uw_init_client_data() {
+ return NULL;
+}
+
+void uw_free_client_data(void *data) {
+}
+
+void uw_copy_client_data(void *dst, void *src) {
+}
+
+void uw_do_expunge(uw_context ctx, uw_Basis_client cli, void *data) {
+ if (uw_get_app(ctx)->db_begin(ctx))
+ uw_error(ctx, FATAL, "Error running SQL BEGIN");
+ uw_get_app(ctx)->expunger(ctx, cli);
+ if (uw_get_app(ctx)->db_commit(ctx))
+ uw_error(ctx, FATAL, "Error running SQL COMMIT");
+}
+
+void uw_post_expunge(uw_context ctx, void *data) {
+}
diff --git a/src/c/fastcgi.c b/src/c/fastcgi.c
index b6b6e9a8..21f59c09 100644
--- a/src/c/fastcgi.c
+++ b/src/c/fastcgi.c
@@ -599,3 +599,24 @@ int main(int argc, char *argv[]) {
uw_enqueue(new_fd);
}
}
+
+void *uw_init_client_data() {
+ return NULL;
+}
+
+void uw_free_client_data(void *data) {
+}
+
+void uw_copy_client_data(void *dst, void *src) {
+}
+
+void uw_do_expunge(uw_context ctx, uw_Basis_client cli, void *data) {
+ if (uw_get_app(ctx)->db_begin(ctx))
+ uw_error(ctx, FATAL, "Error running SQL BEGIN");
+ uw_get_app(ctx)->expunger(ctx, cli);
+ if (uw_get_app(ctx)->db_commit(ctx))
+ uw_error(ctx, FATAL, "Error running SQL COMMIT");
+}
+
+void uw_post_expunge(uw_context ctx, void *data) {
+}
diff --git a/src/c/http.c b/src/c/http.c
index b070ef0f..3ba00a6d 100644
--- a/src/c/http.c
+++ b/src/c/http.c
@@ -336,3 +336,24 @@ int main(int argc, char *argv[]) {
uw_enqueue(new_fd);
}
}
+
+void *uw_init_client_data() {
+ return NULL;
+}
+
+void uw_free_client_data(void *data) {
+}
+
+void uw_copy_client_data(void *dst, void *src) {
+}
+
+void uw_do_expunge(uw_context ctx, uw_Basis_client cli, void *data) {
+ if (uw_get_app(ctx)->db_begin(ctx))
+ uw_error(ctx, FATAL, "Error running SQL BEGIN");
+ uw_get_app(ctx)->expunger(ctx, cli);
+ if (uw_get_app(ctx)->db_commit(ctx))
+ uw_error(ctx, FATAL, "Error running SQL COMMIT");
+}
+
+void uw_post_expunge(uw_context ctx, void *data) {
+}
diff --git a/src/c/urweb.c b/src/c/urweb.c
index 6e8c64de..006e2e28 100644
--- a/src/c/urweb.c
+++ b/src/c/urweb.c
@@ -150,6 +150,7 @@ typedef struct client {
time_t last_contact;
unsigned n_channels;
unsigned refcount;
+ void *data;
} client;
@@ -163,6 +164,10 @@ static pthread_mutex_t clients_mutex = PTHREAD_MUTEX_INITIALIZER;
size_t uw_messages_max = SIZE_MAX;
size_t uw_clients_max = SIZE_MAX;
+void *uw_init_client_data();
+void uw_free_client_data(void *);
+void uw_copy_client_data(void *dst, void *src);
+
static client *new_client() {
client *c;
@@ -193,6 +198,7 @@ static client *new_client() {
buf_reset(&c->msgs);
c->n_channels = 0;
c->refcount = 0;
+ c->data = uw_init_client_data();
pthread_mutex_unlock(&c->lock);
c->next = clients_used;
@@ -432,6 +438,8 @@ struct uw_context {
int deadline;
+ void *client_data;
+
char error_message[ERROR_BUF_LEN];
};
@@ -489,11 +497,17 @@ uw_context uw_init() {
ctx->deadline = INT_MAX;
+ ctx->client_data = uw_init_client_data();
+
return ctx;
}
size_t uw_inputs_max = SIZE_MAX;
+uw_app *uw_get_app(uw_context ctx) {
+ return ctx->app;
+}
+
int uw_set_app(uw_context ctx, uw_app *app) {
ctx->app = app;
@@ -507,6 +521,10 @@ int uw_set_app(uw_context ctx, uw_app *app) {
}
}
+void uw_set_client_data(uw_context ctx, void *data) {
+ uw_copy_client_data(ctx->client_data, data);
+}
+
void uw_set_db(uw_context ctx, void *db) {
ctx->db = db;
}
@@ -526,6 +544,7 @@ void uw_free(uw_context ctx) {
free(ctx->subinputs);
free(ctx->cleanup);
free(ctx->transactionals);
+ uw_free_client_data(ctx->client_data);
for (i = 0; i < ctx->n_deltas; ++i)
buf_free(&ctx->deltas[i].msgs);
@@ -668,6 +687,7 @@ void uw_login(uw_context ctx) {
uw_error(ctx, FATAL, "Limit exceeded on number of message-passing clients");
use_client(c);
+ uw_copy_client_data(c->data, ctx->client_data);
ctx->client = c;
}
}
@@ -2977,16 +2997,18 @@ void uw_register_transactional(uw_context ctx, void *data, uw_callback commit, u
// "Garbage collection"
-static failure_kind uw_expunge(uw_context ctx, uw_Basis_client cli) {
+void uw_do_expunge(uw_context ctx, uw_Basis_client cli, void *data);
+void uw_post_expunge(uw_context ctx, void *data);
+
+static failure_kind uw_expunge(uw_context ctx, uw_Basis_client cli, void *data) {
int r = setjmp(ctx->jmp_buf);
- if (r == 0) {
- if (ctx->app->db_begin(ctx))
- uw_error(ctx, FATAL, "Error running SQL BEGIN");
- ctx->app->expunger(ctx, cli);
- if (ctx->app->db_commit(ctx))
- uw_error(ctx, FATAL, "Error running SQL COMMIT");
- }
+ if (r == 0)
+ uw_do_expunge(ctx, cli, data);
+ else
+ ctx->app->db_rollback(ctx);
+
+ uw_post_expunge(ctx, data);
return r;
}
@@ -3010,18 +3032,14 @@ void uw_prune_clients(uw_context ctx) {
clients_used = next;
uw_reset(ctx);
while (fk == UNLIMITED_RETRY) {
- fk = uw_expunge(ctx, c->id);
- if (fk == UNLIMITED_RETRY) {
- ctx->app->db_rollback(ctx);
+ fk = uw_expunge(ctx, c->id, c->data);
+ if (fk == UNLIMITED_RETRY)
printf("Unlimited retry during expunge: %s\n", uw_error_message(ctx));
- }
}
if (fk == SUCCESS)
free_client(c);
- else {
- ctx->app->db_rollback(ctx);
+ else
fprintf(stderr, "Expunge blocked by error: %s\n", uw_error_message(ctx));
- }
}
else
prev = c;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-02 18:34:05 +0000