Changeset 841

Show
Ignore:
Timestamp:
07/17/07 20:12:01 (1 year ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r840 r841  
    112007-07-17  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * cherokee/virtual_server.c, cherokee/virtual_server.h, 
     4        cherokee/module.h, cherokee/validator.c, cherokee/encoder_table.c, 
     5        cherokee/validator.h, cherokee/regex.c, cherokee/thread.h, 
     6        cherokee/handler.h, cherokee/header.h, cherokee/handler_fastcgi.c, 
     7        cherokee/handler_proxy.h, cherokee/mime.h, cherokee/logger.h, 
     8        cherokee/cherokee.h, cherokee/dirs_table.c, cherokee/mime_entry.h, 
     9        cherokee/socket.c: Removed all the cherokee_table_t references. 
     10 
     11        * cherokee/table.h, cherokee/table.c, cherokee/Makefile.am: 
     12        cherokee_table_t does no longer exist. 
     13 
     14        * cherokee/validator.c:  
    215 
    316        * cherokee/plugin_loader.h, cherokee/plugin_loader.c, 

  • cherokee/trunk/cherokee/Makefile.am

    r791 r841  
    727727buffer.h \ 
    728728buffer.c \ 
    729 table.h \ 
    730 table.c \ 
    731729buffer_escape.h \ 
    732730buffer_escape.c \ 
    …… 
    907905buffer.h\ 
    908906fdpoll.h \ 
    909 table.h \ 
    910907http.h \ 
    911908mime.h \ 

  • cherokee/trunk/cherokee/cherokee.h

    r771 r841  
    3636#include <cherokee/buffer.h> 
    3737#include <cherokee/fdpoll.h> 
    38 #include <cherokee/table.h> 
    3938#include <cherokee/http.h> 
    4039#include <cherokee/list.h> 

  • cherokee/trunk/cherokee/dirs_table.c

    r835 r841  
    124124        /* Add to "dir <-> plugin_entry" table 
    125125         */ 
    126         return cherokee_table_add (TABLE(pt), dir, (void*)plugin_entry); 
     126        return cherokee_avl_add_ptr (AVL(pt), dir, (void*)plugin_entry); 
    127127} 
    128128 
    129129 
    130130int 
    131 relink_func (const char *key_, void *value, void *param) 
     131relink_func (cherokee_buffer_t *key_, void *value, void *param) 
    132132{ 
    133133        ret_t                        ret; 
    …… 
    139139        /* It has to look the the parent of this directory 
    140140         */ 
    141         cherokee_buffer_add (&key, key_, strlen(key_)); 
     141        cherokee_buffer_add_buffer (&key, key_); 
    142142 
    143143        do { 
    …… 
    171171cherokee_dirs_table_relink (cherokee_dirs_table_t *pt) 
    172172{ 
    173         return cherokee_table_while (TABLE(pt), relink_func, pt, NULL, NULL); 
     173        return cherokee_avl_while (AVL(pt), relink_func, pt, NULL, NULL); 
    174174} 

  • cherokee/trunk/cherokee/encoder_table.c

    r835 r841  
    3939cherokee_encoder_table_mrproper (cherokee_encoder_table_t *et) 
    4040{ 
    41         return cherokee_avl_mrproper (et, (cherokee_table_free_item_t) cherokee_encoder_table_entry_free); 
     41        return cherokee_avl_mrproper (et, (cherokee_avl_value_free_func_t)cherokee_encoder_table_entry_free); 
    4242} 
    4343 

  • cherokee/trunk/cherokee/handler.h

    r597 r841  
    3131 
    3232#include <cherokee/common.h> 
    33 #include <cherokee/table.h> 
    3433#include <cherokee/module.h> 
    3534#include <cherokee/buffer.h> 

  • cherokee/trunk/cherokee/handler_fastcgi.c

    r840 r841  
    277277         */ 
    278278        if (CONN_THREAD(cnt)->fastcgi_servers == NULL) { 
    279                 CONN_THREAD(cnt)->fastcgi_free_func = (cherokee_table_free_item_t) cherokee_fcgi_dispatcher_free; 
     279                CONN_THREAD(cnt)->fastcgi_free_func = (cherokee_avl_value_free_func_t) cherokee_fcgi_dispatcher_free; 
    280280                cherokee_avl_new (&CONN_THREAD(cnt)->fastcgi_servers); 
    281281        } 

  • cherokee/trunk/cherokee/handler_proxy.h

    r606 r841  
    3636#include "plugin_loader.h" 
    3737#include "buffer.h" 
    38 #include "table.h" 
    3938#include "connection.h" 
    4039#include "balancer.h" 

  • cherokee/trunk/cherokee/header.h

    r799 r841  
    3232 
    3333#include "buffer.h" 
    34 #include "table.h" 
    3534#include "http.h" 
    3635 

  • cherokee/trunk/cherokee/logger.h

    r638 r841  
    3535#include <cherokee/common.h> 
    3636#include <cherokee/module.h> 
    37 #include <cherokee/table.h> 
    3837 
    3938CHEROKEE_BEGIN_DECLS 

  • cherokee/trunk/cherokee/mime.h

    r597 r841  
    3131 
    3232#include <cherokee/common.h> 
    33 #include <cherokee/table.h> 
    3433#include <cherokee/buffer.h> 
    3534#include <cherokee/list.h> 

  • cherokee/trunk/cherokee/mime_entry.h

    r597 r841  
    3131 
    3232#include <cherokee/common.h> 
    33 #include <cherokee/table.h> 
    3433#include <cherokee/buffer.h> 
    3534#include <cherokee/list.h> 

  • cherokee/trunk/cherokee/module.h

    r597 r841  
    3333#include <cherokee/plugin.h> 
    3434#include <cherokee/config_node.h> 
    35 #include <cherokee/table.h> 
    3635#include <cherokee/server.h> 
    3736 

  • cherokee/trunk/cherokee/regex.c

    r835 r841  
    2525#include "common-internal.h" 
    2626#include "regex.h" 
    27 #include "table.h" 
     27#include "avl.h" 
    2828#include "pcre/pcre.h" 
    2929 

  • cherokee/trunk/cherokee/socket.c

    r784 r841  
    203203{ 
    204204        ret_t              ret; 
    205         cherokee_table_t  *cache; 
     205        cherokee_avl_t    *cache; 
    206206        gnutls_datum       new    = { NULL, 0 }; 
    207207        cherokee_socket_t *socket = SOCKET(ptr); 
    …… 
    218218        /* Get (and remove) the object from the session cache 
    219219         */ 
    220         ret = cherokee_table_del (cache, (char *)key.data, (void **)&new); 
     220        ret = cherokee_avl_del_ptr (cache, (char *)key.data, (void **)&new); 
    221221        if (ret != ret_ok) return new; 
    222222 
    …… 
    228228{ 
    229229        ret_t              ret; 
    230         cherokee_table_t  *cache; 
     230        cherokee_avl_t    *cache; 
    231231        gnutls_datum      *n      = NULL; 
    232232        cherokee_socket_t *socket = SOCKET(ptr); 
    …… 
    242242/*      ret = cherokee_session_cache_del (cache, key.data, key.size); */ 
    243243 
    244         ret = cherokee_table_del (cache, (char *)key.data, NULL);      
     244        ret = cherokee_avl_del_ptr (cache, (char *)key.data, NULL);    
    245245        if (n != NULL) 
    246246                free (n); 
    …… 
    254254        ret_t              ret; 
    255255        gnutls_datum      *n; 
    256         cherokee_table_t  *cache; 
     256        cherokee_avl_t    *cache; 
    257257        cherokee_socket_t *socket = SOCKET(ptr); 
    258258 
    …… 
    274274        cherokee_session_cache_add (cache, key */ 
    275275 
    276         ret = cherokee_table_add (cache, (char *)key.data, n); 
     276        ret = cherokee_avl_add_ptr (cache, (char *)key.data, n); 
    277277 
    278278        return (ret == ret_ok) ? 0 : 1; 

  • cherokee/trunk/cherokee/thread.h

    r840 r841  
    9595        } accept; 
    9696 
    97         cherokee_avl_t             *fastcgi_servers; 
    98         cherokee_table_free_item_t  fastcgi_free_func; 
     97        cherokee_avl_t                 *fastcgi_servers; 
     98        cherokee_avl_value_free_func_t  fastcgi_free_func; 
    9999 
    100100} cherokee_thread_t; 

  • cherokee/trunk/cherokee/validator.c

    r835 r841  
    396396add_user  (char *val, void *data) 
    397397{ 
    398         return cherokee_table_add (TABLE(data), val, NULL); 
     398        return cherokee_avl_add_ptr (AVL(data), val, NULL); 
    399399} 
    400400 

  • cherokee/trunk/cherokee/validator.h

    r597 r841  
    2929#include "buffer.h" 
    3030#include "module.h" 
    31 #include "table.h" 
    3231#include "http.h" 
    3332#include "connection.h" 

  • cherokee/trunk/cherokee/virtual_server.c

    r781 r841  
    7878 
    7979#ifdef HAVE_TLS 
    80         ret = cherokee_table_init (&n->session_cache); 
     80        ret = cherokee_avl_init (&n->session_cache); 
    8181        if (unlikely(ret < ret_ok)) 
    8282                return ret; 
    …… 
    130130 
    131131#ifdef HAVE_TLS 
    132         cherokee_table_mrproper (&vserver->session_cache); 
     132        cherokee_avl_mrproper (&vserver->session_cache, NULL); //FIXIT 
    133133 
    134134# ifdef HAVE_GNUTLS 
    …… 
    156156        } 
    157157        if (vserver->logger_props != NULL) { 
    158                 cherokee_table_free (vserver->logger_props); 
     158                cherokee_avl_free (vserver->logger_props, NULL); // FIXIT 
    159159                vserver->logger_props = NULL; 
    160160        } 

  • cherokee/trunk/cherokee/virtual_server.h

    r772 r841  
    3838#endif 
    3939 
     40#include "avl.h" 
    4041#include "list.h" 
    4142#include "handler.h" 
    …… 
    6061 
    6162        cherokee_logger_t           *logger;          /* Logger obj              */ 
    62         cherokee_table_t            *logger_props;    /* Logger properties table */ 
     63        cherokee_avl_t              *logger_props;    /* Logger properties table */ 
    6364 
    6465        cherokee_buffer_t            root;            /* Document root. Eg: /var/www */ 
    …… 
    8081 
    8182#ifdef HAVE_TLS 
    82         cherokee_table_t             session_cache; 
     83        cherokee_avl_t               session_cache; 
    8384 
    8485# ifdef HAVE_GNUTLS