Changeset 687

Show
Ignore:
Timestamp:
03/23/07 13:24:42 (2 years ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • tests/cache/Makefile

    r669 r687  
     1CHEROKEE_PATH=../../../cherokee 
     2CHEROKEE_DEPS=-lssl 
     3 
    14CC = gcc 
    2 CFLAGS = -O0 -g3 -Wall -I.. -DCHEROKEE_COMPILATION  
    3 LIBS = -lcherokee-base -lssl 
    4 SRCS = caching.c cherokee.h 
     5CFLAGS = -O0 -g3 -Wall -I. -I.. -I$(CHEROKEE_PATH) -I$(CHEROKEE_PATH)/cherokee -DCHEROKEE_COMPILATION  
     6LIBS = -lcherokee-base $(CHEROKEE_DEPS) 
    57 
    6 OBJS = cache.o cache_table.o cache_obj.o cache_obj_http.o caching.o 
    7 PROG = caching 
     8OBJS = cache.o cache_obj.o cache_table.o cache_obj_http.o test.o  
     9PROG = test 
    810 
    9 .c.o: $(SRCS) 
     11.c.o: 
    1012        $(CC) $(CFLAGS) -c -o $@ $< 
     13 
    1114$(PROG): $(OBJS) 
    1215        $(CC) -o $@ $(OBJS) $(LIBS) 
     16 
     17clean: 
     18        rm -f $(OBJS) $(PROG) 

  • tests/cache/cache.c

    r669 r687  
    126126 
    127127ret_t  
    128 cherokee_cache_clean_up (cherokee_cache_t *cache, void *free_func) 
     128cherokee_cache_clean_up (cherokee_cache_t *cache) 
    129129{ 
    130130        ret_t ret;  
    …… 
    132132        /* Sanity check 
    133133         */ 
    134         return_if_fail (cache != NULL, ret_error);  
    135134        if (CACHE(cache)->clean_up == NULL) 
    136135                return ret_error;  
    137136 
    138         ret = CACHE(cache)->clean_up (cache, free_func); 
    139         if (unlikely (ret != ret_ok)) return ret;  
     137        ret = CACHE(cache)->clean_up (cache); 
     138        if (unlikely (ret != ret_ok))  
     139                return ret;  
    140140 
    141141        return ret_ok;  

  • tests/cache/cache.h

    r669 r687  
    4343typedef ret_t (* cherokee_cache_func_del_t)      (struct cherokee_cache *cache, cherokee_buffer_t *key, struct cherokee_cache_obj **item); 
    4444typedef ret_t (* cherokee_cache_func_get_t)      (struct cherokee_cache *cache, cherokee_buffer_t *key, struct cherokee_cache_obj **item); 
    45 typedef ret_t (* cherokee_cache_func_clean_up_t) (struct cherokee_cache *cache, void *free_func);  
     45typedef ret_t (* cherokee_cache_func_clean_up_t) (struct cherokee_cache *cache);  
    4646 
    4747struct cherokee_cache { 
    …… 
    6464ret_t cherokee_cache_add       (cherokee_cache_t *cache, cherokee_buffer_t *key, cherokee_cache_obj_t  *item); 
    6565ret_t cherokee_cache_get       (cherokee_cache_t *cache, cherokee_buffer_t *key, cherokee_cache_obj_t **item); 
    66 ret_t cherokee_cache_clean_up  (cherokee_cache_t *cache, void *free_func); 
     66ret_t cherokee_cache_clean_up  (cherokee_cache_t *cache); 
    6767 
    6868 

  • tests/cache/cache_obj_http.h

    r669 r687  
    2323 */ 
    2424 
     25#if !defined (CHEROKEE_INSIDE_CHEROKEE_H) && !defined (CHEROKEE_COMPILATION) 
     26# error "Only <cherokee/cherokee.h> can be included directly, this file may disappear or change contents." 
     27#endif 
     28 
     29#ifndef CHEROKEE_CACHE_OBJ_HTTP_H 
     30#define CHEROKEE_CACHE_OBJ_HTTP_H 
     31 
    2532#include <cherokee/common.h> 
     33#include <cherokee/buffer.h> 
    2634#include <cherokee/cache_obj.h> 
    27 #include <cherokee/buffer.h> 
     35 
     36CHEROKEE_BEGIN_DECLS 
     37 
    2838 
    2939/* Data types 
    3040 */ 
    31  
    3241typedef struct { 
    3342        cherokee_cache_obj_t parent; 
    …… 
    4352 
    4453 
     54CHEROKEE_END_DECLS 
     55 
     56#endif /* CHEROKEE_CACHE_OBJ_HTTP_H */ 

  • tests/cache/cache_table.c

    r669 r687  
    4848 
    4949static ret_t 
    50 clean_up (cherokee_cache_t *cache, void *free_func) 
     50clean_up (cherokee_cache_t *cache) 
    5151{ 
    5252        return ret_ok; 

  • tests/cache/cache_table.h

    r669 r687  
    3131 
    3232#include <cherokee/cache.h> 
    33 #include "table.h" 
    34 #include "list.h" 
     33#include <cherokee/table.h> 
     34#include <cherokee/list.h> 
    3535 
    3636CHEROKEE_BEGIN_DECLS 
    …… 
    3939        cherokee_cache_t parent;         
    4040 
    41         /* Obj's collection 
     41        /* Objects collection 
    4242         */ 
    43         cherokee_table_t   objs;         /* cherokee_cache_obj_t's */  
     43        cherokee_table_t   objs;         /* cherokee_cache_obj_ts */   
    4444} cherokee_cache_table_t; 
    4545 

  • tests/cache/test.c

    r669 r687  
    4747                cherokee_buffer_add_va (&obj->id, "info-%d", i); 
    4848                 
    49               cherokee_cache_gen_key (CACHE(&cache1), &key, &obj->id);  
     49//            cherokee_cache_gen_key (CACHE(&cache1), &key, &obj->id);  
    5050                 
    5151                cherokee_buffer_add_va (&obj->body, "<html>%d</html>", i);                 
    5252                cherokee_cache_add (CACHE(&cache1), key, CACHE_OBJ(obj)); 
    5353                 
    54                 cherokee_buffer_free(key);  
     54//              cherokee_buffer_free (key); 
    5555        } 
    5656 
    57         cherokee_cache_clean_up (CACHE(&cache1), cherokee_cache_obj_http_free); 
     57        cherokee_cache_clean_up (CACHE(&cache1)); 
    5858        cherokee_cache_table_mrproper (&cache1); 
    5959