Changeset 691

Show
Ignore:
Timestamp:
03/28/07 14:51:39 (2 years ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • tests/cache/cherokee/cache.c

    r688 r691  
    6060        /* Sanity check 
    6161         */ 
    62         return_if_fail (cache != NULL, ret_error);  
    6362        if (CACHE(cache)->gen_key == NULL) 
    6463                return ret_error;  
    …… 
    7877        /* Sanity check 
    7978         */ 
    80         return_if_fail (cache != NULL, ret_error);  
    8179        if (CACHE(cache)->add == NULL) 
    8280                return ret_error;  
    …… 
    9694        /* Sanity check 
    9795         */ 
    98         return_if_fail (cache != NULL, ret_error);  
    9996        if (CACHE(cache)->get == NULL) 
    10097                return ret_error;  
    …… 
    114111        /* Sanity check 
    115112         */ 
    116         return_if_fail (cache != NULL, ret_error);  
    117113        if (CACHE(cache)->del == NULL) 
    118114                return ret_error;  

  • tests/cache/cherokee/cache.h

    r688 r691  
    4141typedef ret_t (* cherokee_cache_func_gen_key_t)  (struct cherokee_cache *cache, cherokee_buffer_t **key, cherokee_buffer_t *buf); 
    4242typedef ret_t (* cherokee_cache_func_add_t)      (struct cherokee_cache *cache, cherokee_buffer_t *key, struct cherokee_cache_obj  *item); 
     43typedef ret_t (* cherokee_cache_func_get_t)      (struct cherokee_cache *cache, cherokee_buffer_t *key, struct cherokee_cache_obj **item); 
    4344typedef ret_t (* cherokee_cache_func_del_t)      (struct cherokee_cache *cache, cherokee_buffer_t *key, struct cherokee_cache_obj **item); 
    44 typedef ret_t (* cherokee_cache_func_get_t)      (struct cherokee_cache *cache, cherokee_buffer_t *key, struct cherokee_cache_obj **item); 
    4545typedef ret_t (* cherokee_cache_func_clean_up_t) (struct cherokee_cache *cache);  
    4646 

  • tests/cache/cherokee/cache_obj.c

    r688 r691  
    3030cherokee_cache_obj_init (cherokee_cache_obj_t *obj) 
    3131{ 
     32        obj->usage       = 0; 
     33        obj->last_access = 0; 
     34 
    3235        return ret_ok; 
    3336} 

  • tests/cache/cherokee/cache_obj.h

    r688 r691  
    3838 
    3939struct cherokee_cache_obj { 
    40          
    41         /* Common data 
     40 
     41        /* Accessing data 
    4242         */      
    4343        cuint_t     usage;  

  • tests/cache/cherokee/cache_obj_http.c

    r688 r691  
    2626#include "cache_obj_http.h" 
    2727 
     28 
     29/* Implements _new and _free methods 
     30 */ 
     31CHEROKEE_ADD_FUNC_NEW  (cache_obj_http); 
     32CHEROKEE_ADD_FUNC_FREE (cache_obj_http); 
     33 
     34 
    2835ret_t  
    29 cherokee_cache_obj_http_new (cherokee_cache_obj_http_t **obj) 
     36cherokee_cache_obj_http_init (cherokee_cache_obj_http_t *obj) 
    3037{ 
    3138        ret_t ret;  
    32         CHEROKEE_NEW_STRUCT(n,cache_obj_http); 
    3339 
    34         cherokee_cache_obj_init (CACHE_OBJ(n)); 
     40        /* Init parent class 
     41         */ 
     42        cherokee_cache_obj_init (CACHE_OBJ(obj)); 
    3543 
    36         ret = cherokee_buffer_init (&n->id);  
     44        /* Init object properties 
     45         */ 
     46        ret = cherokee_buffer_init (&obj->id);  
    3747        if (unlikely (ret != ret_ok)) return ret_error;  
    3848 
    39         ret = cherokee_buffer_init (&n->body);  
     49        ret = cherokee_buffer_init (&obj->body);  
    4050        if (unlikely (ret != ret_ok)) return ret_error;  
    41          
    42         *obj = n; 
     51 
    4352        return ret_ok; 
    4453} 
    …… 
    4756 
    4857ret_t  
    49 cherokee_cache_obj_http_free (cherokee_cache_obj_http_t *obj) 
     58cherokee_cache_obj_http_mrproper (cherokee_cache_obj_http_t *obj) 
    5059{ 
    5160        ret_t ret;  
    52  
    53         /* First, destroy parent 
     61      
     62        /* Destroy the objecj properties 
    5463         */ 
    55         cherokee_cache_obj_mrproper (CACHE_OBJ(obj)); 
    56       
    5764        ret = cherokee_buffer_mrproper (&obj->id);  
    5865        if (unlikely (ret != ret_ok)) return ret_error;  
    …… 
    6067        ret = cherokee_buffer_mrproper (&obj->body);  
    6168        if (unlikely (ret != ret_ok)) return ret_error;  
    62       
    63         free (obj); 
    6469 
     70        /* Call its parent destructor 
     71         */ 
     72        cherokee_cache_obj_mrproper (CACHE_OBJ(obj)); 
    6573        return ret_ok; 
    6674} 

  • tests/cache/cherokee/cache_obj_http.h

    r688 r691  
    4040 */ 
    4141typedef struct { 
    42         cherokee_cache_obj_t parent; 
     42        cherokee_cache_obj_t parent; 
    4343 
    4444        cherokee_buffer_t     id; 
    …… 
    4848#define CACHE_OBJ_HTTP(o) ((cherokee_cache_obj_http_t *)(o)) 
    4949 
    50 ret_t cherokee_cache_obj_http_new  (cherokee_cache_obj_http_t **obj); 
    51 ret_t cherokee_cache_obj_http_free (cherokee_cache_obj_http_t  *obj); 
     50ret_t cherokee_cache_obj_http_init     (cherokee_cache_obj_http_t *obj); 
     51ret_t cherokee_cache_obj_http_mrproper (cherokee_cache_obj_http_t *obj); 
     52 
     53ret_t cherokee_cache_obj_http_new      (cherokee_cache_obj_http_t **obj); 
     54ret_t cherokee_cache_obj_http_free     (cherokee_cache_obj_http_t  *obj); 
    5255 
    5356