summaryrefslogtreecommitdiff
path: root/lib/util
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-31 10:41:42 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-05-31 02:57:19 +0200
commit52399f3177515fce777d85288650ff89f9028dc9 (patch)
tree4ac95cf572080603e6d4e4b9cabcfd46571fbdb3 /lib/util
parent38fee2b521e1109e08510b286fccd056689ad33f (diff)
downloadsamba-52399f3177515fce777d85288650ff89f9028dc9.tar.gz
samba-52399f3177515fce777d85288650ff89f9028dc9.tar.bz2
samba-52399f3177515fce777d85288650ff89f9028dc9.zip
lib/util Move sys_memalign into lib/util/system.c
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/system.c39
-rw-r--r--lib/util/util.h2
2 files changed, 41 insertions, 0 deletions
diff --git a/lib/util/system.c b/lib/util/system.c
index 17c0553102..1e80f1a88a 100644
--- a/lib/util/system.c
+++ b/lib/util/system.c
@@ -22,6 +22,8 @@
#include "system/network.h"
#include "system/filesys.h"
+#undef malloc
+
/*
The idea is that this file will eventually have wrappers around all
important system calls in samba. The aims are:
@@ -37,6 +39,42 @@
expansions/etc make sense to the OS should be acceptable to Samba.
*/
+/*******************************************************************
+ A wrapper for memalign
+********************************************************************/
+
+void *sys_memalign( size_t align, size_t size )
+{
+#if defined(HAVE_POSIX_MEMALIGN)
+ void *p = NULL;
+ int ret = posix_memalign( &p, align, size );
+ if ( ret == 0 )
+ return p;
+
+ return NULL;
+#elif defined(HAVE_MEMALIGN)
+ return memalign( align, size );
+#else
+ /* On *BSD systems memaligns doesn't exist, but memory will
+ * be aligned on allocations of > pagesize. */
+#if defined(SYSCONF_SC_PAGESIZE)
+ size_t pagesize = (size_t)sysconf(_SC_PAGESIZE);
+#elif defined(HAVE_GETPAGESIZE)
+ size_t pagesize = (size_t)getpagesize();
+#else
+ size_t pagesize = (size_t)-1;
+#endif
+ if (pagesize == (size_t)-1) {
+ DEBUG(0,("memalign functionalaity not available on this platform!\n"));
+ return NULL;
+ }
+ if (size < pagesize) {
+ size = pagesize;
+ }
+ return malloc(size);
+#endif
+}
+
/**************************************************************************
A wrapper for gethostbyname() that tries avoids looking up hostnames
in the root domain, which can cause dial-on-demand links to come up for no
@@ -189,3 +227,4 @@ _PUBLIC_ int sys_connect(int fd, const struct sockaddr * addr)
return connect(fd, addr, salen);
}
+
diff --git a/lib/util/util.h b/lib/util/util.h
index 93b181b1fc..d1c5e82bdd 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -115,6 +115,8 @@ void CatchChildLeaveStatus(void);
/* The following definitions come from lib/util/system.c */
+void *sys_memalign( size_t align, size_t size );
+
/**************************************************************************
A wrapper for gethostbyname() that tries avoids looking up hostnames
in the root domain, which can cause dial-on-demand links to come up for no