Roxen.git/ server/ base_server/ configuration.pike

2005-12-05

2005-12-05 13:35:49 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 145592d432cd6765b27b18f75208d03bef98a8fe (154 lines) (+114/-40) ^{[ Show | Annotate ]}
  Branch: 5.2

The protocol DataCache is now hierarchial, and utilizes the callbacks installed by id->register_vary_callback().

Rev: server/base_server/configuration.pike:1.598
Rev: server/protocols/http.pike:1.485

5:   // @appears Configuration   //! A site's main configuration    - constant cvs_version = "$Id: configuration.pike,v 1.597 2005/11/28 14:43:32 grubba Exp $"; + constant cvs_version = "$Id: configuration.pike,v 1.598 2005/12/05 13:35:49 grubba Exp $";   #include <module.h>   #include <module_constants.h>   #include <roxen.h>
242:   #endif    }    -  static void clear_some_cache() +  static void low_expire_entry(string key_prefix, array(string) keys)    { -  array q = indices( cache ); -  if(!sizeof(q)) +  if (!key_prefix) return; +  int found; +  do { +  found = 0; +  foreach(keys; int ind; string key) { +  if (!key) continue; +  if (has_prefix(key, key_prefix)) { +  found = 1; +  if (arrayp(cache[key])) { +  current_size -= sizeof(cache[key][0]); +  } +  m_delete(cache, key); +  keys[ind] = 0; +  } +  } +  key_prefix = "\0" + key_prefix; +  } while (found); +  } +  +  void expire_entry(string key_prefix, RequestID|void id)    { -  current_size=0; +  if (!id) { +  low_expire_entry(key_prefix, indices(cache));    return;    } -  for( int i = 0; i<sizeof( q )/10; i++ ) -  expire_entry( q[random(sizeof(q))] ); +  string url = key_prefix; +  if ((url != "") && !url[0]) { +  sscanf(url, "%*[\0]%[^\0]", url);    } -  +  while(1) { +  array(string|mapping(string:mixed))|string| +  function(string, RequestID:string) val; +  if (arrayp(val = cache[key_prefix])) { +  current_size -= sizeof(val[0]); +  m_delete(cache, key_prefix); +  return; +  } +  if (!val) { +  return; +  }    -  void expire_entry(string url, string|void host) -  { -  if (host_in_key) { -  url = (host|"") + "\0" + url; +  string key_frag; +  if (stringp(val)) { +  key_frag = id->result_headers[val];    } else { -  // Forward compat in case host_in_key is enabled later... -  url = "\0" + url; +  key_frag = val(url, id);    } -  if( cache[ url ] ) +  // NOTE: The prepended NUL is for spoof protection. +  key_prefix = "\0" + key_prefix + "\0" + (key_frag || ""); +  } +  } +  +  static void clear_some_cache()    { -  current_size -= strlen(cache[url][0]); -  m_delete( cache, url ); +  array(string) q = indices(cache); +  if(!sizeof(q)) +  { +  current_size=0; +  return;    } -  +  for(int i = 0; i < sizeof(q)/10; i++) +  low_expire_entry(q[random(sizeof(q))], q);    }    -  void set(string url, string data, mapping meta, int expire, -  string|void host) +  void set(string url, string data, mapping meta, int expire, RequestID id)    {    if( strlen( data ) > max_file_size ) return; -  call_out(expire_entry, expire, url, host); +     -  if (host_in_key) { -  url = (host|"") + "\0" + url; +  string key = url; +  +  foreach(id->misc->vary_cb_order || ({}), +  string|function(string, RequestID: string) vary_cb) { +  array(string|mapping(string:mixed))|string| +  function(string, RequestID:string) old = cache[key]; +  if (old && (old != vary_cb)) { +  // FIXME: Warn? +  expire_entry(key); +  } +  cache[key] = vary_cb; +  +  string key_frag; +  if (stringp(vary_cb)) { +  key_frag = id->request_headers[vary_cb];    } else { -  // Forward compat in case host_in_key is enabled later... -  url = "\0" + url; +  key_frag = vary_cb(url, id);    } -  +  // NOTE: The prepended NUL is for spoof protection. +  key = "\0" + key + "\0" + (key_frag || ""); +  } +  +  array(string|mapping(string:mixed))|string| +  function(string, RequestID:string) old = cache[key]; +  if (old) { +  // FIXME: Warn? +  expire_entry(key); +  } +     current_size += strlen( data ); -  cache[url] = ({ data, meta }); +  cache[key] = ({ data, meta }); +  +  // Only the actual cache entry is expired. +  call_out(low_expire_entry, expire, key, ({ key }));    int n;    while( (current_size > max_size) && (n++<10))    clear_some_cache();    }    -  array(string|mapping(string:mixed)) get(string url, string|void host) +  array(string|mapping(string:mixed)) get(string url, RequestID id)    { -  mixed res; -  if (host_in_key) { -  url = (host|"") + "\0" + url; -  } else { -  // Forward compat in case host_in_key is enabled later... -  url = "\0" + url; -  } -  if( res = cache[ url ] ) +  array(string|mapping(string:mixed))|string| +  function(string, RequestID:string) res; +  string key = url; +  while(1) { +  if (arrayp(res = cache[key])) {    hits++; -  else +  return [array(string|mapping(string:mixed))]res; +  } +  if (!res) {    misses++; -  return res; +  return UNDEFINED;    }    -  +  string key_frag; +  if (stringp(res)) { +  key_frag = id->result_headers[res]; +  } else { +  key_frag = res(url, id); +  } +  // NOTE: The prepended NUL is for spoof protection. +  key = "\0" + key + "\0" + (key_frag || ""); +  }; +  } +     void init_from_variables( )    {    max_size = query( "data_cache_size" ) * 1024;