projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hmm, added twice.
[pazpar2-moved-to-github.git]
/
src
/
pazpar2_config.c
diff --git
a/src/pazpar2_config.c
b/src/pazpar2_config.c
index
3f3e03b
..
ec87caf
100644
(file)
--- a/
src/pazpar2_config.c
+++ b/
src/pazpar2_config.c
@@
-38,6
+38,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
+#include "ppmutex.h"
#include "incref.h"
#include "pazpar2_config.h"
#include "settings.h"
#include "incref.h"
#include "pazpar2_config.h"
#include "settings.h"
@@
-697,7
+698,7
@@
struct conf_service *service_create(struct conf_server *server,
inherit_server_settings(service);
resolve_databases(service);
assert(service->mutex == 0);
inherit_server_settings(service);
resolve_databases(service);
assert(service->mutex == 0);
- yaz_mutex_create(&service->mutex);
+ pazpar2_mutex_create(&service->mutex, "conf");
}
return service;
}
}
return service;
}
@@
-839,9
+840,8
@@
static struct conf_server *server_create(struct conf_config *config,
return server;
}
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);
WRBUF w = wrbuf_alloc();
conf_dir_path(config, w, fname);
@@
-1060,7
+1060,7
@@
void config_process_events(struct conf_config *conf)
{
resolve_databases(s);
assert(s->mutex == 0);
{
resolve_databases(s);
assert(s->mutex == 0);
- yaz_mutex_create(&s->mutex);
+ pazpar2_mutex_create(&s->mutex, "service");
}
http_mutex_init(ser);
}
}
http_mutex_init(ser);
}