Module Name: src
Committed By: christos
Date: Fri Dec 20 16:58:34 UTC 2013
Modified Files:
src/external/bsd/bind/dist/lib/isc: mem.c
src/external/bsd/bind/dist/lib/isc/unix: app.c
Log Message:
make the non-threaded case work again.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/isc/mem.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/isc/unix/app.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/lib/isc/mem.c
diff -u src/external/bsd/bind/dist/lib/isc/mem.c:1.6 src/external/bsd/bind/dist/lib/isc/mem.c:1.7
--- src/external/bsd/bind/dist/lib/isc/mem.c:1.6 Sat Jul 27 15:23:13 2013
+++ src/external/bsd/bind/dist/lib/isc/mem.c Fri Dec 20 11:58:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mem.c,v 1.6 2013/07/27 19:23:13 christos Exp $ */
+/* $NetBSD: mem.c,v 1.7 2013/12/20 16:58:34 christos Exp $ */
/*
* Copyright (C) 2004-2010, 2012 Internet Systems Consortium, Inc. ("ISC")
@@ -310,8 +310,6 @@ ISC_MEMFUNC_SCOPE unsigned int
isc__mempool_getfillcount(isc_mempool_t *mpctx);
ISC_MEMFUNC_SCOPE void
isc__mem_printactive(isc_mem_t *ctx0, FILE *file);
-ISC_MEMFUNC_SCOPE void
-isc__mem_printallactive(FILE *file);
unsigned int
isc__mem_references(isc_mem_t *ctx0);
@@ -351,7 +349,7 @@ static struct isc__memmethods {
(void *)isc__mem_getquota, (void *)isc__mem_setname,
(void *)isc__mem_getname, (void *)isc__mem_gettag,
(void *)isc__mem_printactive,
- (void *)isc__mem_printallactive,
+ (void *)isc_mem_printallactive,
};
@@ -2265,8 +2263,8 @@ isc__mem_printactive(isc_mem_t *ctx0, FI
#endif
}
-ISC_MEMFUNC_SCOPE void
-isc__mem_printallactive(FILE *file) {
+void
+isc_mem_printallactive(FILE *file) {
#if !ISC_MEM_TRACKLINES
UNUSED(file);
#else
Index: src/external/bsd/bind/dist/lib/isc/unix/app.c
diff -u src/external/bsd/bind/dist/lib/isc/unix/app.c:1.6 src/external/bsd/bind/dist/lib/isc/unix/app.c:1.7
--- src/external/bsd/bind/dist/lib/isc/unix/app.c:1.6 Sun Mar 24 14:42:01 2013
+++ src/external/bsd/bind/dist/lib/isc/unix/app.c Fri Dec 20 11:58:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: app.c,v 1.6 2013/03/24 18:42:01 christos Exp $ */
+/* $NetBSD: app.c,v 1.7 2013/12/20 16:58:34 christos Exp $ */
/*
* Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC")
@@ -534,11 +534,6 @@ isc__app_ctxrun(isc_appctx_t *ctx0) {
int result;
isc_event_t *event, *next_event;
isc_task_t *task;
- sigset_t sset;
- char strbuf[ISC_STRERRORSIZE];
-#ifdef HAVE_SIGWAIT
- int sig;
-#endif
REQUIRE(VALID_APPCTX(ctx));
@@ -582,10 +577,16 @@ isc__app_ctxrun(isc_appctx_t *ctx0) {
}
#endif
+#ifdef ISC_PLATFORM_USETHREADS
/*
* When we are using multiple contexts, we don't rely on signals.
*/
if (ctx == &isc_g_appctx) {
+ sigset_t sset;
+ char strbuf[ISC_STRERRORSIZE];
+#ifdef HAVE_SIGWAIT
+ int sig;
+#endif
/*
* There is no danger if isc_app_shutdown() is called before we wait
@@ -649,7 +650,9 @@ isc__app_ctxrun(isc_appctx_t *ctx0) {
if (ctx->want_shutdown && ctx->blocked)
exit(1);
}
- } else {
+ } else
+#endif
+ {
(void)isc__taskmgr_dispatch(ctx->taskmgr);
#ifndef ISC_PLATFORM_USETHREADS
