Browse Source

[master] (re)make sure to {un,}define USE_SHARED_MEMORY in config.h

this chunk was accidentally removed in e448bbba3ecae68b261612954aa9777edc384be4
causing test faiulres.
JINMEI Tatuya 12 years ago
parent
commit
7f8feaab9f
2 changed files with 11 additions and 0 deletions
  1. 3 0
      configure.ac
  2. 8 0
      src/bin/xfrout/xfrout.py.in

+ 3 - 0
configure.ac

@@ -891,6 +891,9 @@ if test X$use_shared_memory = Xyes -a "$BOOST_MAPPED_FILE_WOULDFAIL" = "yes"; th
     AC_MSG_ERROR([Boost shared memory does not compile on this system.  If you don't need it (most normal users won't) build without it by rerunning this script with --without-shared-memory; using a different compiler or a different version of Boost may also help.])
 fi
 AM_CONDITIONAL([USE_SHARED_MEMORY], [test x$use_shared_memory = xyes])
+if test "x$use_shared_memory" = "xyes"; then
+    AC_DEFINE(USE_SHARED_MEMORY, 1, [Define to 1 if shared memory support is enabled])
+fi
 AC_SUBST(BOOST_MAPPED_FILE_CXXFLAG)
 
 # Add some default CPP flags needed for Boost, identified by the AX macro.

+ 8 - 0
src/bin/xfrout/xfrout.py.in

@@ -152,6 +152,14 @@ def get_soa_serial(soa_rdata):
     '''
     return Serial(int(soa_rdata.to_text().split()[2]))
 
+def make_blocking(fd, on=True):
+    flags = fcntl.fcntl(fd, fcntl.F_GETFL)
+    if on:                      # make it blocking
+        flags &= ~os.O_NONBLOCK
+    else:                       # make it non blocking
+        flags |= os.O_NONBLOCK
+    fcntl.fcntl(fd, fcntl.F_SETFL, flags)
+
 class XfroutSession():
     def __init__(self, sock_fd, request_data, server, tsig_key_ring, remote,
                  default_acl, zone_config, client_class=DataSourceClient):