Changeset 1470 in svn for trunk

Timestamp:

2013-11-12T10:08:17Z (3 years ago)

Author:

Xuefer

Message:

processor: abstract store target (storage)

Location:

trunk

Files:

• mod_cacher/xc_cacher.c (modified) (4 diffs)
• processor/foot.m4 (modified) (3 diffs)

trunk/mod_cacher/xc_cacher.c

@@ -160 +160 @@
 static void xc_holds_destroy(TSRMLS_D);
 
+static void *xc_cache_storage(void *data, size_t size) /* {{{ */
+{
+    xc_allocator_t *allocator = (xc_allocator_t *) data;
+    return allocator->vtable->malloc(allocator, size);
+}
+/* }}} */
+
 /* any function in *_unlocked is only safe be called within locked (single thread access) area */
 
@@ -173 +180 @@
 {
     xc_entry_data_php_t *stored_php;
+    xc_processor_storage_t storage;
+    storage.allocator      = &xc_cache_storage;
+    storage.allocator_data = (void *) cache->allocator;
+    storage.relocatediff   = cache->shm->readonlydiff;
 
     php->hits     = 0;
     php->refcount = 0;
-    stored_php = xc_processor_store_xc_entry_data_php_t(cache->shm->readonlydiff, cache->allocator, php TSRMLS_CC);
+    stored_php = xc_processor_store_xc_entry_data_php_t(&storage, php TSRMLS_CC);
 #if 0
     {
@@ -308 +319 @@
 {
     xc_entry_t *stored_entry;
+    xc_processor_storage_t storage;
+    storage.allocator      = &xc_cache_storage;
+    storage.allocator_data = (void *) cache->allocator;
+    storage.relocatediff   = cache->shm->readonlydiff;
 
     entry->hits  = 0;
@@ -313 +328 @@
     entry->atime = XG(request_time);
     stored_entry = type == XC_TYPE_PHP
-        ? (xc_entry_t *) xc_processor_store_xc_entry_php_t(cache->shm->readonlydiff, cache->allocator, (xc_entry_php_t *) entry TSRMLS_CC)
-        : (xc_entry_t *) xc_processor_store_xc_entry_var_t(cache->shm->readonlydiff, cache->allocator, (xc_entry_var_t *) entry TSRMLS_CC);
+        ? (xc_entry_t *) xc_processor_store_xc_entry_php_t(&storage, (xc_entry_php_t *) entry TSRMLS_CC)
+        : (xc_entry_t *) xc_processor_store_xc_entry_var_t(&storage, (xc_entry_var_t *) entry TSRMLS_CC);
     if (stored_entry) {
         xc_entry_add_unlocked(cache->cached, entryslotid, stored_entry);

trunk/processor/foot.m4

@@ +1 @@
+dnl {{{ xc_store_target
+EXPORT(`typedef void *(*xc_processor_storage_allocator_t)(void *data, size_t size);')
+EXPORT(`typedef struct { xc_processor_storage_allocator_t allocator; void *allocator_data; ptrdiff_t relocatediff; } xc_processor_storage_t;')
+dnl }}}
 define(`DEFINE_STORE_API', `
-EXPORTED_FUNCTION(`$1 *xc_processor_store_$1(ptrdiff_t relocatediff, xc_allocator_t *allocator, $1 *src TSRMLS_DC)') dnl {{{
+EXPORTED_FUNCTION(`$1 *xc_processor_store_$1(const xc_processor_storage_t *storage, $1 *src TSRMLS_DC)') dnl {{{
 {
     $1 *dst;
@@ -7 +11 @@
     memset(&processor, 0, sizeof(processor));
     processor.handle_reference = 1;
-    processor.relocatediff = relocatediff;
+    processor.relocatediff = storage->relocatediff;
 
     IFAUTOCHECK(`xc_stack_init(&processor.allocsizes);')
@@ -45 +49 @@
 
         /* allocator :) */
-        processor.p = (char *) allocator->vtable->malloc(allocator, processor.size);
+        processor.p = (char *) storage->allocator(storage->allocator_data, processor.size);
         if (processor.p == NULL) {
             dst = NULL;