summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/urweb/types_cpp.h10
-rw-r--r--include/urweb/urweb_cpp.h2
-rw-r--r--src/c/urweb.c28
-rw-r--r--src/lru_cache.sml4
4 files changed, 31 insertions, 13 deletions
diff --git a/include/urweb/types_cpp.h b/include/urweb/types_cpp.h
index 3955dcc8..c4af2866 100644
--- a/include/urweb/types_cpp.h
+++ b/include/urweb/types_cpp.h
@@ -129,15 +129,11 @@ typedef struct uw_Sqlcache_Value {
unsigned long timeValid;
} uw_Sqlcache_Value;
-typedef struct uw_Sqlcache_Entry {
- char *key;
- uw_Sqlcache_Value *value;
- unsigned long timeInvalid;
- UT_hash_handle hh;
-} uw_Sqlcache_Entry;
+typedef struct uw_Sqlcache_Entry uw_Sqlcache_Entry;
typedef struct uw_Sqlcache_Cache {
- struct uw_Sqlcache_Entry *table;
+ //pthread_rwlock_t *lock;
+ uw_Sqlcache_Entry *table;
unsigned long timeInvalid;
unsigned long timeNow;
size_t numKeys;
diff --git a/include/urweb/urweb_cpp.h b/include/urweb/urweb_cpp.h
index 15bfffac..3e70b4ac 100644
--- a/include/urweb/urweb_cpp.h
+++ b/include/urweb/urweb_cpp.h
@@ -408,6 +408,6 @@ void uw_Basis_writec(struct uw_context *, char);
uw_Sqlcache_Value *uw_Sqlcache_check(uw_Sqlcache_Cache *, char **);
void *uw_Sqlcache_store(uw_Sqlcache_Cache *, char **, uw_Sqlcache_Value *);
-void *uw_Sqlcache_flush(uw_Sqlcache_Cache *, char **);
+void *uw_Sqlcache_flush(struct uw_context *, uw_Sqlcache_Cache *, char **);
#endif
diff --git a/src/c/urweb.c b/src/c/urweb.c
index 55d89fd5..4db019fe 100644
--- a/src/c/urweb.c
+++ b/src/c/urweb.c
@@ -4545,6 +4545,13 @@ void uw_set_remoteSock(uw_context ctx, int sock) {
// Sqlcache
+typedef struct uw_Sqlcache_Entry {
+ char *key;
+ uw_Sqlcache_Value *value;
+ unsigned long timeInvalid;
+ UT_hash_handle hh;
+} uw_Sqlcache_Entry;
+
void uw_Sqlcache_freeValue(uw_Sqlcache_Value *value) {
if (value) {
free(value->result);
@@ -4599,7 +4606,7 @@ unsigned long uw_Sqlcache_timeMax(unsigned long x, unsigned long y) {
char uw_Sqlcache_keySep = '_';
-char *uw_Sqlcache_allocKeyBuffer(char **keys, int numKeys) {
+char *uw_Sqlcache_allocKeyBuffer(char **keys, size_t numKeys) {
size_t len = 0;
while (numKeys-- > 0) {
char* k = keys[numKeys];
@@ -4625,6 +4632,7 @@ char *uw_Sqlcache_keyCopy(char *buf, char *key) {
// TODO: strlen(key) = buf - key?
uw_Sqlcache_Value *uw_Sqlcache_check(uw_Sqlcache_Cache *cache, char **keys) {
+ //pthread_rwlock_rdlock(cache->lock);
size_t numKeys = cache->numKeys;
char *key = uw_Sqlcache_allocKeyBuffer(keys, numKeys);
char *buf = key;
@@ -4642,10 +4650,12 @@ uw_Sqlcache_Value *uw_Sqlcache_check(uw_Sqlcache_Cache *cache, char **keys) {
}
free(key);
uw_Sqlcache_Value *value = entry->value;
+ //pthread_rwlock_unlock(cache->lock);
return value && value->timeValid > timeInvalid ? value : NULL;
}
void uw_Sqlcache_store(uw_Sqlcache_Cache *cache, char **keys, uw_Sqlcache_Value *value) {
+ //pthread_rwlock_wrlock(cache->lock);
size_t numKeys = cache->numKeys;
char *key = uw_Sqlcache_allocKeyBuffer(keys, numKeys);
char *buf = key;
@@ -4667,6 +4677,7 @@ void uw_Sqlcache_store(uw_Sqlcache_Cache *cache, char **keys, uw_Sqlcache_Value
uw_Sqlcache_freeValue(entry->value);
entry->value = value;
entry->value->timeValid = timeNow;
+ //pthread_rwlock_unlock(cache->lock);
}
void uw_Sqlcache_flushCommitOne(uw_Sqlcache_Cache *cache, char **keys) {
@@ -4717,20 +4728,28 @@ void uw_Sqlcache_flushFree(void *data, int dontCare) {
void uw_Sqlcache_flushCommit(void *data) {
uw_Sqlcache_Inval *inval = (uw_Sqlcache_Inval *)data;
- uw_Sqlcache_Inval *invalFirst = inval;
while (inval) {
uw_Sqlcache_Cache *cache = inval->cache;
char **keys = inval->keys;
uw_Sqlcache_flushCommitOne(cache, keys);
inval = inval->next;
}
- uw_Sqlcache_flushFree(invalFirst, 0);
+}
+
+char **uw_Sqlcache_copyKeys(char **keys, size_t numKeys) {
+ char **copy = malloc(sizeof(char *) * numKeys);
+ while (numKeys-- > 0) {
+ char * k = keys[numKeys];
+ copy[numKeys] = k ? strdup(k) : NULL;
+ }
+ return copy;
}
void uw_Sqlcache_flush(uw_context ctx, uw_Sqlcache_Cache *cache, char **keys) {
+ //pthread_rwlock_wrlock(cache->lock);
uw_Sqlcache_Inval *inval = malloc(sizeof(uw_Sqlcache_Inval));
inval->cache = cache;
- inval->keys = keys;
+ inval->keys = uw_Sqlcache_copyKeys(keys, cache->numKeys);
inval->next = NULL;
if (ctx->inval) {
// An invalidation is already registered, so just extend it.
@@ -4740,4 +4759,5 @@ void uw_Sqlcache_flush(uw_context ctx, uw_Sqlcache_Cache *cache, char **keys) {
}
// [ctx->inval] should always point to the last invalidation.
ctx->inval = inval;
+ //pthread_rwlock_unlock(cache->lock);
}
diff --git a/src/lru_cache.sml b/src/lru_cache.sml
index d4da2849..9d65420b 100644
--- a/src/lru_cache.sml
+++ b/src/lru_cache.sml
@@ -65,6 +65,8 @@ fun setupQuery {index, params} =
in
Print.box
[string ("static uw_Sqlcache_Cache cacheStruct" ^ i ^ " = {"),
+ (* newline, *)
+ (* string " .lock = PTHREAD_RWLOCK_INITIALIZER,", *)
newline,
string " .table = NULL,",
newline,
@@ -134,7 +136,7 @@ fun setupQuery {index, params} =
newline,
string (" char *ks[] = {" ^ revArgs ^ "};"),
newline,
- string (" uw_Sqlcache_flush(cache" ^ i ^ ", ks);"),
+ string (" uw_Sqlcache_flush(ctx, cache" ^ i ^ ", ks);"),
newline,
string " return uw_unit_v;",
newline,