Squashed 'src/deps/miniasync/' changes from 93283586e..dd06ea790

dd06ea790 Merge pull request pmem#54 from lplewa/vdm 9c6390dcb masync: make vdm and future header only e23ab21b1 Merge pull request pmem#52 from wlemkows/KW-fixes ad4651146 common: fix KW issues bab51d2fc Merge pull request pmem#51 from DamianDuy/fixNonStandardExtensionWinWarnings 0c232c340 common: remove unnecessary wrappers for allocators d2ca2230f Merge pull request pmem#49 from DamianDuy/fixTypeMismatchWinWarnings a53362da8 common: fix type mismatch warnings on Windows git-subtree-dir: src/deps/miniasync git-subtree-split: dd06ea7907b27b8cdafaf957488e74dd1cb921a2
lplewa · Feb 24, 2022 · 555662f · 555662f
1 parent 52ffd91
commit 555662f
Show file tree

Hide file tree

Showing 27 changed files with 248 additions and 320 deletions.
diff --git a/examples/basic-async/basic-async.c b/examples/basic-async/basic-async.c
@@ -19,6 +19,11 @@ main(void)
 	struct runtime *r = runtime_new();
 
 	struct data_mover_threads *dmt = data_mover_threads_default();
+	if (dmt == NULL) {
+			fprintf(stderr, "Failed to allocate data mover.\n");
+			runtime_delete(r);
+			return 1;
+	}
 	struct vdm *vdm = data_mover_threads_get_vdm(dmt);
 
 	/*
@@ -31,6 +36,13 @@ main(void)
 		char *dst1 = malloc(TEST_SIZE * sizeof(char));
 		char *src2 = malloc(TEST_SIZE * 2 * sizeof(char));
 		char *dst2 = malloc(TEST_SIZE * 2 * sizeof(char));
+		if (src1 == NULL || dst1 == NULL ||
+			src2 == NULL || dst2 == NULL) {
+			fprintf(stderr, "Failed to allocate memory.\n");
+			runtime_delete(r);
+			data_mover_threads_delete(dmt);
+			return 1;
+		}
 
 		memset(src1, 7, TEST_SIZE);
 		memset(src2, 6, TEST_SIZE * 2);

diff --git a/examples/basic/basic.c b/examples/basic/basic.c
@@ -113,14 +113,27 @@ main(void)
 	size_t otherbuf_size = strlen("otherbuf");
 
 	char *buf_a = malloc(testbuf_size + 1);
+	if (buf_a == NULL) {
+		fprintf(stderr, "Failed to create buf_a\n");
+		return 1;
+	}
 	char *buf_b = malloc(otherbuf_size + 1);
+	if (buf_b == NULL) {
+		fprintf(stderr, "Failed to create buf_b\n");
+		return 1;
+	}
 
 	memcpy(buf_a, "testbuf", testbuf_size + 1);
 	memcpy(buf_b, "otherbuf", otherbuf_size + 1);
 
 	struct runtime *r = runtime_new();
 
 	struct data_mover_threads *dmt = data_mover_threads_default();
+	if (dmt == NULL) {
+		fprintf(stderr, "Failed to allocate data mover.\n");
+		runtime_delete(r);
+		return 1;
+	}
 	struct vdm *thread_mover = data_mover_threads_get_vdm(dmt);
 
 	/*

diff --git a/extras/dml/CMakeLists.txt b/extras/dml/CMakeLists.txt
@@ -24,7 +24,6 @@ set(DML_SOURCES
 )
 
 set(DML_CORE_DEPS
-	${CORE_SOURCE_DIR}/alloc.c
 	${CORE_SOURCE_DIR}/cpu.c
 	${CORE_SOURCE_DIR}/os_posix.c
 	${CORE_SOURCE_DIR}/os_thread_posix.c

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -19,9 +19,7 @@ add_check_whitespace(src
 	${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt)
 
 set(SOURCES
-    future.c
     runtime.c
-    vdm.c
     data_mover_threads.c
     data_mover_sync.c
 )
@@ -39,7 +37,6 @@ else()
 endif()
 
 set(CORE_DEPS ${CORE_DEPS}
-	${CORE_SOURCE_DIR}/alloc.c
 	${CORE_SOURCE_DIR}/cpu.c
 	${CORE_SOURCE_DIR}/membuf.c
 	${CORE_SOURCE_DIR}/out.c

diff --git a/src/core/alloc.c b/src/core/alloc.c
diff --git a/src/core/alloc.h b/src/core/alloc.h
diff --git a/src/core/cpu.c b/src/core/cpu.c
@@ -40,7 +40,7 @@ cpuid(unsigned func, unsigned subfunc, unsigned cpuinfo[4])
 static inline void
 cpuid(unsigned func, unsigned subfunc, unsigned cpuinfo[4])
 {
-	__cpuidex(cpuinfo, func, subfunc);
+	__cpuidex((int *)cpuinfo, (int)func, (int)subfunc);
 }
 
 #else

diff --git a/src/core/membuf.c b/src/core/membuf.c
@@ -121,8 +121,10 @@ membuf_get_threadbuf(struct membuf *membuf)
 		 * from contained pointers to access metadata (like user_data).
 		 */
 		tbuf = util_aligned_malloc(MEMBUF_ALIGNMENT, MEMBUF_LEN);
-		if (tbuf == NULL)
+		if (tbuf == NULL) {
+			os_mutex_unlock(&membuf->lists_lock);
 			return NULL;
+		}
 
 		tbuf->next = membuf->tbuf_first;
 		membuf->tbuf_first = tbuf;

diff --git a/src/core/os_thread_windows.c b/src/core/os_thread_windows.c
@@ -565,9 +565,9 @@ void
 os_cpu_set(size_t cpu, os_cpu_set_t *set)
 {
 	internal_os_cpu_set_t *internal_set = (internal_os_cpu_set_t *)set;
-	int sum = 0;
-	int group_max = GetActiveProcessorGroupCount();
-	int group = 0;
+	size_t sum = 0;
+	WORD group_max = GetActiveProcessorGroupCount();
+	WORD group = 0;
 	while (group < group_max) {
 		sum += GetActiveProcessorCount(group);
 		if (sum > cpu) {

diff --git a/src/core/os_windows.c b/src/core/os_windows.c
@@ -43,7 +43,6 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "alloc.h"
 #include "util.h"
 #include "os.h"
 #include "out.h"
@@ -268,7 +267,7 @@ os_mkstemp(char *temp)
 		return -1;
 	}
 
-	wchar_t *npath = Malloc(sizeof(*npath) * wcslen(path) + _MAX_FNAME);
+	wchar_t *npath = malloc(sizeof(*npath) * wcslen(path) + _MAX_FNAME);
 	if (npath == NULL) {
 		util_free_UTF16(utemp);
 		return -1;
@@ -299,7 +298,7 @@ os_mkstemp(char *temp)
 		S_IWRITE | S_IREAD);
 
 out:
-	Free(npath);
+	free(npath);
 	return ret;
 }
 
@@ -620,7 +619,7 @@ os_execv(const char *path, char *const argv[])
 		argc++;
 
 	int ret;
-	wchar_t **wargv = Zalloc((argc + 1) * sizeof(wargv[0]));
+	wchar_t **wargv = calloc(argc + 1, sizeof(wargv[0]));
 	if (!wargv) {
 		ret = -1;
 		goto wargv_alloc_failed;
@@ -643,7 +642,7 @@ os_execv(const char *path, char *const argv[])
 end:
 	for (int i = 0; i < argc; ++i)
 		util_free_UTF16(wargv[i]);
-	Free(wargv);
+	free(wargv);
 
 wargv_alloc_failed:
 	util_free_UTF16(wpath);

diff --git a/src/core/out.c b/src/core/out.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2014-2021, Intel Corporation */
+/* Copyright 2014-2022, Intel Corporation */
 
 /*
  * out.c -- support for logging, tracing, and assertion output
@@ -238,16 +238,6 @@ out_init(const char *log_prefix, const char *log_level_var,
 		"compiled with support for Valgrind drd";
 	LOG(1, "%s", drd_msg);
 #endif /* VG_DRD_ENABLED */
-#if SDS_ENABLED
-	static __attribute__((used)) const char *shutdown_state_msg =
-		"compiled with support for shutdown state";
-	LOG(1, "%s", shutdown_state_msg);
-#endif
-#if NDCTL_ENABLED
-	static __attribute__((used)) const char *ndctl_ge_63_msg =
-		"compiled with libndctl 63+";
-	LOG(1, "%s", ndctl_ge_63_msg);
-#endif
 
 	Last_errormsg_key_alloc();
 }

diff --git a/src/core/ringbuf.c b/src/core/ringbuf.c
@@ -15,7 +15,6 @@
 #include "os.h"
 #include "os_thread.h"
 #include "sys_util.h"
-#include "alloc.h"
 
 #ifdef _WIN32
 #define __sync_synchronize() MemoryBarrier()
@@ -61,18 +60,18 @@ ringbuf_new(unsigned length)
 		return NULL;
 
 	struct ringbuf *rbuf =
-		Zalloc(sizeof(*rbuf) + (length * sizeof(void *)));
+		calloc(length * sizeof(void *), sizeof(*rbuf));
 	if (rbuf == NULL)
 		return NULL;
 
 	if (os_semaphore_init(&rbuf->nfree, length)) {
-		Free(rbuf);
+		free(rbuf);
 		return NULL;
 	}
 
 	if (os_semaphore_init(&rbuf->nused, 0)) {
 		util_semaphore_destroy(&rbuf->nfree);
-		Free(rbuf);
+		free(rbuf);
 		return NULL;
 	}
 
@@ -131,7 +130,7 @@ ringbuf_delete(struct ringbuf *rbuf)
 	ASSERTeq(rbuf->read_pos, rbuf->write_pos);
 	util_semaphore_destroy(&rbuf->nfree);
 	util_semaphore_destroy(&rbuf->nused);
-	Free(rbuf);
+	free(rbuf);
 }
 
 /*

diff --git a/src/core/util.c b/src/core/util.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2014-2021, Intel Corporation */
+/* Copyright 2014-2022, Intel Corporation */
 
 /*
  * util.c -- very basic utilities
@@ -17,7 +17,6 @@
 #include "util.h"
 #include "os.h"
 #include "valgrind_internal.h"
-#include "alloc.h"
 
 /* library-wide page size */
 unsigned long long Pagesize;
@@ -485,16 +484,16 @@ util_readline(FILE *fh)
 
 	do {
 		char *tmp = buffer;
-		buffer = Realloc(buffer, bufsize);
+		buffer = realloc(buffer, bufsize);
 		if (buffer == NULL) {
-			Free(tmp);
+			free(tmp);
 			return NULL;
 		}
 
 		/* ensure if we can cast bufsize to int */
 		char *s = util_fgets(buffer + position, (int)bufsize / 2, fh);
 		if (s == NULL) {
-			Free(buffer);
+			free(buffer);
 			return NULL;
 		}