undo-io: add new calls to and speed up the undo io manager

[tools/e2fsprogs.git] / lib / ext2fs / inline.c

diff --git a/lib/ext2fs/inline.c b/lib/ext2fs/inline.c
index fc09668..05da1f7 100644 (file)
--- a/lib/ext2fs/inline.c
+++ b/lib/ext2fs/inline.c
@@ -2,16 +2,20 @@
  * inline.c --- Includes the inlined functions defined in the header
  *     files as standalone functions, in case the application program
  *     is compiled with inlining turned off.
- * 
+ *
  * Copyright (C) 1993, 1994 Theodore Ts'o.
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
  */
 
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 600      /* for posix_memalign() */
+#endif
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #if HAVE_UNISTD_H
@@ -25,10 +29,93 @@
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#if HAVE_MALLOC_H
+#include <malloc.h>
+#endif
 
-#include <linux/ext2_fs.h>
-
+#include "ext2_fs.h"
 #define INCLUDE_INLINE_FUNCS
-
 #include "ext2fs.h"
 
+/*
+ * We used to define this as an inline, but since we are now using
+ * autoconf-defined #ifdef's, we need to export this as a
+ * library-provided function exclusively.
+ */
+errcode_t ext2fs_get_memalign(unsigned long size,
+                             unsigned long align, void *ptr)
+{
+       errcode_t retval;
+       void **p = ptr;
+
+       if (align < 8)
+               align = 8;
+#ifdef HAVE_POSIX_MEMALIGN
+       retval = posix_memalign(p, align, size);
+       if (retval) {
+               if (retval == ENOMEM)
+                       return EXT2_ET_NO_MEMORY;
+               return retval;
+       }
+#else
+#ifdef HAVE_MEMALIGN
+       *p = memalign(align, size);
+       if (*p == NULL) {
+               if (errno)
+                       return errno;
+               else
+                       return EXT2_ET_NO_MEMORY;
+       }
+#else
+#ifdef HAVE_VALLOC
+       if (align > sizeof(long long))
+               *p = valloc(size);
+       else
+#endif
+               *p = malloc(size);
+       if ((unsigned long) *p & (align - 1)) {
+               free(*p);
+               *p = 0;
+       }
+       if (*p == 0)
+               return EXT2_ET_NO_MEMORY;
+#endif
+#endif
+       return 0;
+}
+
+#ifdef DEBUG
+static int isaligned(void *ptr, unsigned long align)
+{
+       return (((unsigned long) ptr & (align - 1)) == 0);
+}
+
+static errcode_t test_memalign(unsigned long align)
+{
+       void *ptr = 0;
+       errcode_t retval;
+
+       retval = ext2fs_get_memalign(32, align, &ptr);
+       if (!retval && !isaligned(ptr, align))
+               retval = EINVAL;
+       free(ptr);
+       printf("tst_memalign(%lu) is %s\n", align,
+              retval ? error_message(retval) : "OK");
+       return retval;
+}
+
+int main(int argc, char **argv)
+{
+       int err = 0;
+
+       if (test_memalign(4))
+               err++;
+       if (test_memalign(32))
+               err++;
+       if (test_memalign(1024))
+               err++;
+       if (test_memalign(4096))
+               err++;
+       return err;
+}
+#endif