Roxen.git/ server/ base_server/ configuration.pike

1999-10-18

1999-10-18 21:13:20 by Per Hedbor <ph@opera.com>

• f5a2742c56b53489df75c877b536aae29e26fef1 (33 lines) (+15/-18) ^{[ Show | Annotate ]}
  Branch: 5.2

Now add_modules() take an optional 'now' argument to force addition of modules right at that moment

Rev: server/base_server/configuration.pike:1.214
Rev: server/base_server/module.pike:1.49

3:    * (C) 1996, 1999 Idonex AB.    */    - constant cvs_version = "$Id: configuration.pike,v 1.213 1999/10/12 13:19:17 per Exp $"; + constant cvs_version = "$Id: configuration.pike,v 1.214 1999/10/18 21:13:20 per Exp $";   #include <module.h>   #include <roxen.h>   #include <request_trace.h>
2117:    return !!stat_file(what, id);   }    - string MKPORTKEY(array(string) p) - { -  if (sizeof(p[3])) { -  return sprintf("%s://%s:%s/(%s)", -  p[1], p[2], (string)p[0], -  replace(p[3], ({"\n", "\r"}), ({ " ", " " }))); -  } else { -  return sprintf("%s://%s:%s/", -  p[1], p[2], (string)p[0]); -  } - } +    array registered_urls = ({});   void start(int num)   {
2205:       sscanf(modname, "%s#%d", modname, id );    -  +    #if constant(gethrtime)    int start_time = gethrtime();   #endif
2764:    return 0;   }    - int add_modules (array(string) mods) + multiset forcibly_added = (<>); + int add_modules( array(string) mods, int|void now )   {    int wr;    foreach (mods, string mod) -  if( !enabled_modules[ mod+"#0" ] ) +  if( (now && !modules[ mod ]) +  || !enabled_modules[ mod+"#0" ] )   #ifdef MODULE_DEBUG    {    if( !wr++ )    report_debug("[ adding required modules\n");   #endif -  +  forcibly_added[ mod+"#0" ] = 1;    enable_module( mod+"#0" );   #ifdef MODULE_DEBUG    }
2847:    modules_to_process = (({"userdb#0"})+(modules_to_process-({"userdb#0"})));       array err; +  forcibly_added = (<>);    foreach( modules_to_process, tmp_string ) -  +  { +  if( !forcibly_added[ tmp_string ] )    if(err = catch( enable_module( tmp_string )))    report_error(LOCALE->enable_module_failed(tmp_string,    describe_backtrace(err))); -  +  } +     report_debug("All modules for %s enabled in %4.3f seconds\n\n", query_name(),    (gethrtime()-start_time)/1000000.0);   }