# HG changeset patch # User Adam Chlipala # Date 1229697344 18000 # Node ID 6daa59a55c43f33c7c038e14946d43461fc85e29 # Parent 79aea80904e836a8a5003f0be28212a387ff04ec Add initial C support for reactive diff -r 79aea80904e8 -r 6daa59a55c43 Makefile.in --- a/Makefile.in Tue Dec 09 14:44:52 2008 -0500 +++ b/Makefile.in Fri Dec 19 09:35:44 2008 -0500 @@ -20,10 +20,10 @@ clib/*.o rm -rf .cm src/.cm -clib/urweb.o: src/c/urweb.c +clib/urweb.o: src/c/urweb.c include/*.h gcc -O3 -I include -c src/c/urweb.c -o clib/urweb.o $(CFLAGS) -clib/driver.o: src/c/driver.c +clib/driver.o: src/c/driver.c include/*.h gcc -O3 -I include -c src/c/driver.c -o clib/driver.o $(CFLAGS) src/urweb.cm: src/prefix.cm src/sources diff -r 79aea80904e8 -r 6daa59a55c43 include/urweb.h --- a/include/urweb.h Tue Dec 09 14:44:52 2008 -0500 +++ b/include/urweb.h Fri Dec 19 09:35:44 2008 -0500 @@ -6,7 +6,7 @@ extern uw_unit uw_unit_v; -uw_context uw_init(size_t outHeaders_len, size_t page_len, size_t heap_len); +uw_context uw_init(size_t outHeaders_len, size_t script_len, size_t page_len, size_t heap_len); void uw_set_db(uw_context, void*); void *uw_get_db(uw_context); void uw_free(uw_context); @@ -36,6 +36,8 @@ void uw_write(uw_context, const char*); +int uw_Basis_new_client_reactive(uw_context); + char *uw_Basis_htmlifyInt(uw_context, uw_Basis_int); char *uw_Basis_htmlifyFloat(uw_context, uw_Basis_float); char *uw_Basis_htmlifyString(uw_context, uw_Basis_string); diff -r 79aea80904e8 -r 6daa59a55c43 src/c/driver.c --- a/src/c/driver.c Tue Dec 09 14:44:52 2008 -0500 +++ b/src/c/driver.c Fri Dec 19 09:35:44 2008 -0500 @@ -73,7 +73,7 @@ static void *worker(void *data) { int me = *(int *)data, retries_left = MAX_RETRIES; - uw_context ctx = uw_init(0, 1024, 0); + uw_context ctx = uw_init(0, 0, 1024, 0); while (1) { failure_kind fk = uw_begin_init(ctx); diff -r 79aea80904e8 -r 6daa59a55c43 src/c/urweb.c --- a/src/c/urweb.c Tue Dec 09 14:44:52 2008 -0500 +++ b/src/c/urweb.c Fri Dec 19 09:35:44 2008 -0500 @@ -31,6 +31,9 @@ char *heap, *heap_front, *heap_back; char **inputs; + char *script, *script_front, *script_back; + int reactive_count; + void *db; jmp_buf jmp_buf; @@ -44,7 +47,7 @@ extern int uw_inputs_len; -uw_context uw_init(size_t outHeaders_len, size_t page_len, size_t heap_len) { +uw_context uw_init(size_t outHeaders_len, size_t script_len, size_t page_len, size_t heap_len) { uw_context ctx = malloc(sizeof(struct uw_context)); ctx->headers = ctx->headers_end = NULL; @@ -70,6 +73,10 @@ ctx->error_message[0] = 0; + ctx->script_front = ctx->script = malloc(script_len); + ctx->script_back = ctx->script_front + script_len; + ctx->reactive_count = 0; + return ctx; } @@ -83,6 +90,7 @@ void uw_free(uw_context ctx) { free(ctx->outHeaders); + free(ctx->script); free(ctx->page); free(ctx->heap); free(ctx->inputs); @@ -90,22 +98,19 @@ free(ctx); } -void uw_reset_keep_request(uw_context ctx) { +void uw_reset_keep_error_message(uw_context ctx) { ctx->outHeaders_front = ctx->outHeaders; + ctx->script_front = ctx->script; ctx->page_front = ctx->page; ctx->heap_front = ctx->heap; ctx->regions = NULL; ctx->cleanup_front = ctx->cleanup; - - ctx->error_message[0] = 0; + ctx->reactive_count = 0; } -void uw_reset_keep_error_message(uw_context ctx) { - ctx->outHeaders_front = ctx->outHeaders; - ctx->page_front = ctx->page; - ctx->heap_front = ctx->heap; - ctx->regions = NULL; - ctx->cleanup_front = ctx->cleanup; +void uw_reset_keep_request(uw_context ctx) { + uw_reset_keep_error_message(ctx); + ctx->error_message[0] = 0; } void uw_reset(uw_context ctx) { @@ -286,6 +291,7 @@ void uw_memstats(uw_context ctx) { printf("Headers: %d/%d\n", ctx->outHeaders_front - ctx->outHeaders, ctx->outHeaders_back - ctx->outHeaders); + printf("Script: %d/%d\n", ctx->script_front - ctx->script, ctx->script_back - ctx->script); printf("Page: %d/%d\n", ctx->page_front - ctx->page, ctx->page_back - ctx->page); printf("Heap: %d/%d\n", ctx->heap_front - ctx->heap, ctx->heap_back - ctx->heap); } @@ -341,7 +347,41 @@ uw_check_headers(ctx, len + 1); strcpy(ctx->outHeaders_front, s); ctx->outHeaders_front += len; - *ctx->outHeaders_front = 0; +} + +static void uw_check_script(uw_context ctx, size_t extra) { + size_t desired = ctx->script_front - ctx->script + extra, next; + char *new_script; + + next = ctx->script_back - ctx->script; + if (next < desired) { + if (next == 0) + next = 1; + for (; next < desired; next *= 2); + + new_script = realloc(ctx->script, next); + ctx->script_front = new_script + (ctx->script_front - ctx->script); + ctx->script_back = new_script + next; + ctx->script = new_script; + } +} + +void uw_write_script(uw_context ctx, uw_Basis_string s) { + int len = strlen(s); + + uw_check_script(ctx, len + 1); + strcpy(ctx->script_front, s); + ctx->script_front += len; +} + +int uw_Basis_new_client_reactive(uw_context ctx) { + size_t len; + + uw_check_script(ctx, 8 + INTS_MAX); + sprintf(ctx->script_front, "var e%d=0\n%n", ctx->reactive_count, &len); + ctx->script_front += len; + + return ctx->reactive_count++; } static void uw_check(uw_context ctx, size_t extra) {