#if HAVE_UNISTD_H
#include <unistd.h>
#endif
+#include "ppmutex.h"
#include "incref.h"
#include "pazpar2_config.h"
#include "settings.h"
{
NMEM nmem; /* for conf_config and servers memory */
struct conf_server *servers;
+
int no_threads;
WRBUF confdir;
+ iochan_man_t iochan_man;
+ database_hosts_t database_hosts;
};
{
if (service)
{
- yaz_log(YLOG_LOG, "service_destroy. p=%p cnt=%d", service,
- service->ref_count);
if (!pazpar2_decref(&service->ref_count, service->mutex))
{
pp2_charset_destroy(service->relevance_pct);
inherit_server_settings(service);
resolve_databases(service);
assert(service->mutex == 0);
- yaz_mutex_create(&service->mutex);
+ pazpar2_mutex_create(&service->mutex, "conf");
}
return service;
}
server->proxy_host = 0;
server->proxy_port = 0;
server->myurl = 0;
- server->proxy_addr = 0;
server->service = 0;
server->config = config;
server->next = 0;
server->sort_pct = 0;
server->mergekey_pct = 0;
server->server_settings = 0;
+ server->http_server = 0;
+ server->iochan_man = 0;
+ server->database_hosts = 0;
if (server_id)
{
return server;
}
-WRBUF conf_get_fname(struct conf_service *service, const char *fname)
+WRBUF conf_get_fname(struct conf_config *config, const char *fname)
{
- struct conf_config *config = service->server->config;
WRBUF w = wrbuf_alloc();
conf_dir_path(config, w, fname);
config->nmem = nmem;
config->servers = 0;
config->no_threads = 0;
+ config->iochan_man = 0;
config->confdir = wrbuf_alloc();
if ((p = strrchr(fname,
pp2_charset_destroy(server->relevance_pct);
pp2_charset_destroy(server->sort_pct);
pp2_charset_destroy(server->mergekey_pct);
+ yaz_log(YLOG_LOG, "server_destroy server=%p", server);
+ http_server_destroy(server->http_server);
}
void config_destroy(struct conf_config *config)
if (config)
{
struct conf_server *server = config->servers;
+ iochan_man_destroy(&config->iochan_man);
while (server)
{
struct conf_server *s_next = server->next;
server_destroy(server);
server = s_next;
}
+ database_hosts_destroy(&config->database_hosts);
+
wrbuf_destroy(config->confdir);
nmem_destroy(config->nmem);
}
http_close_server(ser);
}
-void config_start_databases(struct conf_config *conf)
+void config_process_events(struct conf_config *conf)
{
struct conf_server *ser;
+
+ conf->database_hosts = database_hosts_create();
for (ser = conf->servers; ser; ser = ser->next)
{
struct conf_service *s = ser->service;
+
+ ser->database_hosts = conf->database_hosts;
+
for (;s ; s = s->next)
{
resolve_databases(s);
assert(s->mutex == 0);
- yaz_mutex_create(&s->mutex);
+ pazpar2_mutex_create(&s->mutex, "service");
}
+ http_mutex_init(ser);
}
+ iochan_man_events(conf->iochan_man);
}
int config_start_listeners(struct conf_config *conf,
const char *listener_override)
{
struct conf_server *ser;
- pazpar2_chan_man_start(conf->no_threads);
+
+ conf->iochan_man = iochan_man_create(conf->no_threads);
for (ser = conf->servers; ser; ser = ser->next)
{
WRBUF w = wrbuf_alloc();
int r;
+
+ ser->iochan_man = conf->iochan_man;
if (listener_override)
{
wrbuf_puts(w, listener_override);