X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=utils.c;h=765dd8bcb921b133aa320fddcada0bd3422b63e5;hp=078a8a191af27a7ccd862578b1306658d059cb76;hb=729f47fd5279f902986457682f8f166c324eafb5;hpb=aa4f3bde06ea1410f1835590ae025e044f2364fb

diff --git a/utils.c b/utils.c
index 078a8a1..765dd8b 100644
--- 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,56 +43,112 @@ 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__
-#include <mach/mach_time.h>
+#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() */
+#include <mach/clock.h>			/* clock_get_time() */
 
-static void clock_gettime_realtime(struct timespec *tv)
+static clock_serv_t clock_realtime;
+static clock_serv_t clock_monotonic;
+
+static void __constructor clock_name_init(void)
 {
-	struct timeval _tv;
+	mach_port_t host_self = mach_host_self();
 
-	gettimeofday(&_tv, NULL);
-	tv->tv_sec = _tv.tv_sec;
-	tv->tv_nsec = _tv.tv_usec * 1000;
+	host_get_clock_service(host_self, CLOCK_REALTIME, &clock_realtime);
+	host_get_clock_service(host_self, CLOCK_MONOTONIC, &clock_monotonic);
 }
 
-static void clock_gettime_monotonic(struct timespec *tv)
+static void __destructor clock_name_dealloc(void)
 {
-	mach_timebase_info_data_t info;
-	float sec;
-	uint64_t val;
+	mach_port_t self = mach_task_self();
 
-	mach_timebase_info(&info);
+	mach_port_deallocate(self, clock_realtime);
+	mach_port_deallocate(self, clock_monotonic);
+}
 
-	val = mach_absolute_time();
-	tv->tv_nsec = (val * info.numer / info.denom) % 1000000000;
+int clock_gettime(int type, struct timespec *tv)
+{
+	int retval = -1;
+	mach_timespec_t mts;
+
+	switch (type) {
+		case CLOCK_REALTIME:
+			retval = clock_get_time(clock_realtime, &mts);
+			break;
+		case CLOCK_MONOTONIC:
+			retval = clock_get_time(clock_monotonic, &mts);
+			break;
+		default:
+			goto out;
+	}
 
-	sec = val;
-	sec *= info.numer;
-	sec /= info.denom;
-	sec /= 1000000000;
-	tv->tv_sec = sec;
+	tv->tv_sec = mts.tv_sec;
+	tv->tv_nsec = mts.tv_nsec;
+out:
+	return retval;
 }
 
-void clock_gettime(int type, struct timespec *tv)
+#endif
+
+void *cbuf_alloc(unsigned int order)
 {
-	if (type == CLOCK_REALTIME)
-		return clock_gettime_realtime(tv);
-	else
-		return clock_gettime_monotonic(tv);
-}
+	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);
+}