Commit 7f8feaab authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

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

this chunk was accidentally removed in e448bbba
causing test faiulres.
parent ce84abcf
......@@ -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.
......
......@@ -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):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment