X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Fshm.c;h=0153578c93a2cfddf3bdd69ae57324b516086651;hb=bfcda6cea270952898ea122c375f2ed19105adef;hp=86e84b3f34a76bf28772602d50b99cb2c3d99f56;hpb=3fbec7dc3645facd9e809cf161ba3435a377ce56;p=lttng-ust.git

diff --git a/libringbuffer/shm.c b/libringbuffer/shm.c
index 86e84b3f..0153578c 100644
--- a/libringbuffer/shm.c
+++ b/libringbuffer/shm.c
@@ -19,6 +19,7 @@
  */
 
 #define _LGPL_SOURCE
+#include <config.h>
 #include "shm.h"
 #include <unistd.h>
 #include <fcntl.h>
@@ -32,7 +33,11 @@
 #include <dirent.h>
 #include <lttng/align.h>
 #include <limits.h>
+#ifdef HAVE_LIBNUMA
+#include <numa.h>
+#endif
 #include <helper.h>
+#include <ust-fd.h>
 
 /*
  * Ensure we have the required amount of space available by writing 0
@@ -133,6 +138,15 @@ struct shm_object *_shm_object_table_alloc_shm(struct shm_object_table *table,
 		PERROR("ftruncate");
 		goto error_ftruncate;
 	}
+	/*
+	 * Also ensure the file metadata is synced with the storage by using
+	 * fsync(2).
+	 */
+	ret = fsync(shmfd);
+	if (ret) {
+		PERROR("fsync");
+		goto error_fsync;
+	}
 	obj->shm_fd_ownership = 0;
 	obj->shm_fd = shmfd;
 
@@ -152,6 +166,7 @@ struct shm_object *_shm_object_table_alloc_shm(struct shm_object_table *table,
 	return obj;
 
 error_mmap:
+error_fsync:
 error_ftruncate:
 error_zero_file:
 error_fcntl:
@@ -232,18 +247,37 @@ alloc_error:
 struct shm_object *shm_object_table_alloc(struct shm_object_table *table,
 			size_t memory_map_size,
 			enum shm_object_type type,
-			int stream_fd)
+			int stream_fd,
+			int cpu)
 {
+	struct shm_object *shm_object;
+#ifdef HAVE_LIBNUMA
+	int oldnode, node;
+
+	oldnode = numa_preferred();
+	if (cpu >= 0) {
+		node = numa_node_of_cpu(cpu);
+		if (node >= 0)
+			numa_set_preferred(node);
+	}
+	if (cpu < 0 || node < 0)
+		numa_set_localalloc();
+#endif /* HAVE_LIBNUMA */
 	switch (type) {
 	case SHM_OBJECT_SHM:
-		return _shm_object_table_alloc_shm(table, memory_map_size,
+		shm_object = _shm_object_table_alloc_shm(table, memory_map_size,
 				stream_fd);
+		break;
 	case SHM_OBJECT_MEM:
-		return _shm_object_table_alloc_mem(table, memory_map_size);
+		shm_object = _shm_object_table_alloc_mem(table, memory_map_size);
+		break;
 	default:
 		assert(0);
 	}
-	return NULL;
+#ifdef HAVE_LIBNUMA
+	numa_set_preferred(oldnode);
+#endif /* HAVE_LIBNUMA */
+	return shm_object;
 }
 
 struct shm_object *shm_object_table_append_shm(struct shm_object_table *table,
@@ -343,7 +377,7 @@ error_fcntl:
 }
 
 static
-void shmp_object_destroy(struct shm_object *obj)
+void shmp_object_destroy(struct shm_object *obj, int consumer)
 {
 	switch (obj->type) {
 	case SHM_OBJECT_SHM:
@@ -355,20 +389,46 @@ void shmp_object_destroy(struct shm_object *obj)
 			PERROR("umnmap");
 			assert(0);
 		}
+
 		if (obj->shm_fd_ownership) {
-			ret = close(obj->shm_fd);
-			if (ret) {
-				PERROR("close");
-				assert(0);
+			/* Delete FDs only if called from app (not consumer). */
+			if (!consumer) {
+				lttng_ust_lock_fd_tracker();
+				ret = close(obj->shm_fd);
+				if (!ret) {
+					lttng_ust_delete_fd_from_tracker(obj->shm_fd);
+				} else {
+					PERROR("close");
+					assert(0);
+				}
+				lttng_ust_unlock_fd_tracker();
+			} else {
+				ret = close(obj->shm_fd);
+				if (ret) {
+					PERROR("close");
+					assert(0);
+				}
 			}
 		}
 		for (i = 0; i < 2; i++) {
 			if (obj->wait_fd[i] < 0)
 				continue;
-			ret = close(obj->wait_fd[i]);
-			if (ret) {
-				PERROR("close");
-				assert(0);
+			if (!consumer) {
+				lttng_ust_lock_fd_tracker();
+				ret = close(obj->wait_fd[i]);
+				if (!ret) {
+					lttng_ust_delete_fd_from_tracker(obj->wait_fd[i]);
+				} else {
+					PERROR("close");
+					assert(0);
+				}
+				lttng_ust_unlock_fd_tracker();
+			} else {
+				ret = close(obj->wait_fd[i]);
+				if (ret) {
+					PERROR("close");
+					assert(0);
+				}
 			}
 		}
 		break;
@@ -380,10 +440,22 @@ void shmp_object_destroy(struct shm_object *obj)
 		for (i = 0; i < 2; i++) {
 			if (obj->wait_fd[i] < 0)
 				continue;
-			ret = close(obj->wait_fd[i]);
-			if (ret) {
-				PERROR("close");
-				assert(0);
+			if (!consumer) {
+				lttng_ust_lock_fd_tracker();
+				ret = close(obj->wait_fd[i]);
+				if (!ret) {
+					lttng_ust_delete_fd_from_tracker(obj->wait_fd[i]);
+				} else {
+					PERROR("close");
+					assert(0);
+				}
+				lttng_ust_unlock_fd_tracker();
+			} else {
+				ret = close(obj->wait_fd[i]);
+				if (ret) {
+					PERROR("close");
+					assert(0);
+				}
 			}
 		}
 		free(obj->memory_map);
@@ -394,12 +466,12 @@ void shmp_object_destroy(struct shm_object *obj)
 	}
 }
 
-void shm_object_table_destroy(struct shm_object_table *table)
+void shm_object_table_destroy(struct shm_object_table *table, int consumer)
 {
 	int i;
 
 	for (i = 0; i < table->allocated_len; i++)
-		shmp_object_destroy(&table->objects[i]);
+		shmp_object_destroy(&table->objects[i], consumer);
 	free(table);
 }