X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Findex-allocator.cpp;h=32778cd205eae16652af36770d768769db62724f;hp=c48d708d0ea2759e8806aa5558d949ae2ec12e8d;hb=HEAD;hpb=a6bc4ca9d659caf016ef932fcd944029737ac57c

diff --git a/src/common/index-allocator.cpp b/src/common/index-allocator.cpp
index c48d708d0..c0bb8a1c4 100644
--- a/src/common/index-allocator.cpp
+++ b/src/common/index-allocator.cpp
@@ -5,16 +5,14 @@
  *
  */
 
-#include <inttypes.h>
+#include "error.hpp"
+#include "index-allocator.hpp"
+#include "macros.hpp"
 
+#include <inttypes.h>
 #include <urcu.h>
 #include <urcu/list.h>
 
-#include "macros.h"
-#include "error.h"
-
-#include "index-allocator.h"
-
 struct lttng_index_allocator {
 	struct cds_list_head unused_list;
 	uint64_t size;
@@ -22,17 +20,18 @@ struct lttng_index_allocator {
 	uint64_t nb_allocated_indexes;
 };
 
+namespace {
 struct lttng_index {
 	uint64_t index;
 	struct cds_list_head head;
 };
+} /* namespace */
 
-struct lttng_index_allocator *lttng_index_allocator_create(
-		uint64_t index_count)
+struct lttng_index_allocator *lttng_index_allocator_create(uint64_t index_count)
 {
-	struct lttng_index_allocator *allocator = NULL;
+	struct lttng_index_allocator *allocator = nullptr;
 
-	allocator = (lttng_index_allocator *) zmalloc(sizeof(*allocator));
+	allocator = zmalloc<lttng_index_allocator>();
 	if (!allocator) {
 		PERROR("Failed to allocate index allocator");
 		goto end;
@@ -53,12 +52,10 @@ uint64_t lttng_index_allocator_get_index_count(struct lttng_index_allocator *all
 	return allocator->nb_allocated_indexes;
 }
 
-enum lttng_index_allocator_status lttng_index_allocator_alloc(
-		struct lttng_index_allocator *allocator,
-		uint64_t *allocated_index)
+enum lttng_index_allocator_status
+lttng_index_allocator_alloc(struct lttng_index_allocator *allocator, uint64_t *allocated_index)
 {
-	enum lttng_index_allocator_status status =
-			LTTNG_INDEX_ALLOCATOR_STATUS_OK;
+	enum lttng_index_allocator_status status = LTTNG_INDEX_ALLOCATOR_STATUS_OK;
 
 	if (cds_list_empty(&allocator->unused_list)) {
 		if (allocator->position >= allocator->size) {
@@ -71,8 +68,7 @@ enum lttng_index_allocator_status lttng_index_allocator_alloc(
 	} else {
 		struct lttng_index *index;
 
-		index = cds_list_first_entry(&allocator->unused_list,
-				typeof(*index), head);
+		index = cds_list_first_entry(&allocator->unused_list, typeof(*index), head);
 		cds_list_del(&index->head);
 		*allocated_index = index->index;
 		free(index);
@@ -83,16 +79,15 @@ end:
 	return status;
 }
 
-enum lttng_index_allocator_status lttng_index_allocator_release(
-		struct lttng_index_allocator *allocator, uint64_t idx)
+enum lttng_index_allocator_status
+lttng_index_allocator_release(struct lttng_index_allocator *allocator, uint64_t idx)
 {
-	struct lttng_index *index = NULL;
-	enum lttng_index_allocator_status status =
-			LTTNG_INDEX_ALLOCATOR_STATUS_OK;
+	struct lttng_index *index = nullptr;
+	enum lttng_index_allocator_status status = LTTNG_INDEX_ALLOCATOR_STATUS_OK;
 
 	LTTNG_ASSERT(idx < allocator->size);
 
-	index = (lttng_index *) zmalloc(sizeof(*index));
+	index = zmalloc<lttng_index>();
 	if (!index) {
 		PERROR("Failed to allocate free index queue");
 		status = LTTNG_INDEX_ALLOCATOR_STATUS_ERROR;
@@ -109,20 +104,18 @@ end:
 
 void lttng_index_allocator_destroy(struct lttng_index_allocator *allocator)
 {
-	struct lttng_index *index = NULL, *tmp_index = NULL;
+	struct lttng_index *index = nullptr, *tmp_index = nullptr;
 
 	if (!allocator) {
 		return;
 	}
 
 	if (lttng_index_allocator_get_index_count(allocator) > 0) {
-		WARN("Destroying index allocator with %" PRIu64
-				" slot indexes still in use",
-				lttng_index_allocator_get_index_count(allocator));
+		WARN("Destroying index allocator with %" PRIu64 " slot indexes still in use",
+		     lttng_index_allocator_get_index_count(allocator));
 	}
 
-	cds_list_for_each_entry_safe(index, tmp_index,
-			&allocator->unused_list, head) {
+	cds_list_for_each_entry_safe (index, tmp_index, &allocator->unused_list, head) {
 		cds_list_del(&index->head);
 		free(index);
 	}