uloop: allow specifying a timeout for uloop_run()

[project/libubox.git] / utils.c

diff --git a/utils.c b/utils.c
index 8fd19f4..765dd8b 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -16,16 +16,20 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "utils.h"
+#include <sys/mman.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include "utils.h"
 
 #define foreach_arg(_arg, _addr, _len, _first_addr, _first_len) \
        for (_addr = (_first_addr), _len = (_first_len); \
                _addr; \
                _addr = va_arg(_arg, void **), _len = _addr ? va_arg(_arg, size_t) : 0)
 
+#define C_PTR_ALIGN    (sizeof(size_t))
+#define C_PTR_MASK     (-C_PTR_ALIGN)
+
 void *__calloc_a(size_t len, ...)
 {
        va_list ap, ap1;
@@ -39,21 +43,23 @@ void *__calloc_a(size_t len, ...)
 
        va_copy(ap1, ap);
        foreach_arg(ap1, cur_addr, cur_len, &ret, len)
-               alloc_len += cur_len;
+               alloc_len += (cur_len + C_PTR_ALIGN - 1 ) & C_PTR_MASK;
        va_end(ap1);
 
        ptr = calloc(1, alloc_len);
+       if (!ptr)
+               return NULL;
        alloc_len = 0;
        foreach_arg(ap, cur_addr, cur_len, &ret, len) {
                *cur_addr = &ptr[alloc_len];
-               alloc_len += cur_len;
+               alloc_len += (cur_len + C_PTR_ALIGN - 1) & C_PTR_MASK;
        }
        va_end(ap);
 
        return ret;
 }
 
-#ifdef __APPLE__
+#ifdef LIBUBOX_COMPAT_CLOCK_GETTIME
 #include <mach/mach_host.h>            /* host_get_clock_service() */
 #include <mach/mach_port.h>            /* mach_port_deallocate() */
 #include <mach/mach_init.h>            /* mach_host_self(), mach_task_self() */
@@ -101,3 +107,48 @@ out:
 }
 
 #endif
+
+void *cbuf_alloc(unsigned int order)
+{
+       char path[] = "/tmp/cbuf-XXXXXX";
+       unsigned long size = cbuf_size(order);
+       void *ret = NULL;
+       int fd;
+
+       fd = mkstemp(path);
+       if (fd < 0)
+               return NULL;
+
+       if (unlink(path))
+               goto close;
+
+       if (ftruncate(fd, cbuf_size(order)))
+               goto close;
+
+#ifndef MAP_ANONYMOUS
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+
+       ret = mmap(NULL, size * 2, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0);
+       if (ret == MAP_FAILED) {
+               ret = NULL;
+               goto close;
+       }
+
+       if (mmap(ret, size, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED,
+                fd, 0) != ret ||
+           mmap(ret + size, size, PROT_READ | PROT_WRITE,
+                MAP_FIXED | MAP_SHARED, fd, 0) != ret + size) {
+               munmap(ret, size * 2);
+               ret = NULL;
+       }
+
+close:
+       close(fd);
+       return ret;
+}
+
+void cbuf_free(void *ptr, unsigned int order)
+{
+       munmap(ptr, cbuf_size(order) * 2);
+}