]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-zero-copy-bufferlist-last'
authorJosh Durgin <josh.durgin@inktank.com>
Tue, 26 Nov 2013 00:43:51 +0000 (16:43 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Tue, 26 Nov 2013 01:12:03 +0000 (17:12 -0800)
Reviewed-by: Samuel Just <sam.just@inktank.com>
1  2 
configure.ac
src/common/buffer.cc
src/include/buffer.h
src/test/bufferlist.cc

diff --cc configure.ac
index 8523c3fb06e97ba50f07dac8672f39bdaaf56b59,3c3e227bed86bec6c1643d3fdfa3852e8dc3e0fb..d1d291bb5eff06530dbf3700e99ccc1f972f81b4
@@@ -572,23 -535,23 +572,37 @@@ AC_CHECK_FUNC([fallocate]
        [AC_DEFINE([CEPH_HAVE_FALLOCATE], [], [fallocate(2) is supported])],
        [])
  
 +#
 +# Test for time-related `struct stat` members.
 +#
 +
 +AC_CHECK_MEMBER([struct stat.st_mtim.tv_nsec],
 +  [AC_DEFINE(HAVE_STAT_ST_MTIM_TV_NSEC, 1,
 +    [Define if you have struct stat.st_mtim.tv_nsec])])
 +
 +AC_CHECK_MEMBER([struct stat.st_mtimespec.tv_nsec],
 +  [AC_DEFINE(HAVE_STAT_ST_MTIMESPEC_TV_NSEC, 1,
 +    [Define if you have struct stat.st_mtimespec.tv_nsec])])
  
+ # splice/tee
+ AC_CHECK_FUNC([splice],
+       [AC_DEFINE([CEPH_HAVE_SPLICE], [], [splice(2) is supported])],
+       [])
+ AC_CHECK_HEADERS([arpa/nameser_compat.h])
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <fcntl.h>
+ F_SETPIPE_SZ]])],
+       [AC_DEFINE([CEPH_HAVE_SETPIPE_SZ], [], [F_SETPIPE_SZ is supported])],
+       [AC_MSG_NOTICE(["F_SETPIPE_SZ not found, zero-copy may be less efficent"])])
 +AC_CHECK_HEADERS([arpa/nameser_compat.h])
  AC_CHECK_HEADERS([sys/prctl.h])
  AC_CHECK_FUNCS([prctl])
 +AC_CHECK_FUNCS([pipe2])
 +AC_CHECK_FUNCS([posix_fadvise])
  
  # Checks for typedefs, structures, and compiler characteristics.
  #AC_HEADER_STDBOOL
Simple merge
Simple merge
Simple merge