Merge pull request axboe#188 from grom72/librpma-common-prefix

rpma: librpma_common_ prefix before all public names
janekmi · Jan 25, 2021 · 24c251e · 24c251e
2 parents 5afa7fb + 0ad0311
commit 24c251e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/engines/librpma.c b/engines/librpma.c
@@ -15,8 +15,6 @@
 
 #include "librpma_common.h"
 
-#include <librpma.h>
-
 /* client side implementation */
 
 static inline int client_io_flush(struct thread_data *td,
@@ -70,7 +68,7 @@ static int client_init(struct thread_data *td)
 			 * - B == ceil(iodepth / iodepth_batch)
 			 *   which is the number of batches for N writes
 			 */
-			sq_size = td->o.iodepth + LIBRPMA_CEIL(td->o.iodepth,
+			sq_size = td->o.iodepth + LIBRPMA_COMMON_CEIL(td->o.iodepth,
 					td->o.iodepth_batch);
 		}
 	} else {

diff --git a/engines/librpma_common.c b/engines/librpma_common.c
@@ -889,10 +889,10 @@ int librpma_common_server_open_file(struct thread_data *td, struct fio_file *f,
 	}
 
 	/* verify size of the memory region's descriptor */
-	if (mr_desc_size > DESCRIPTOR_MAX_SIZE) {
+	if (mr_desc_size > LIBRPMA_COMMON_DESCRIPTOR_MAX_SIZE) {
 		log_err(
 			"size of the memory region's descriptor is too big (max=%i)\n",
-			DESCRIPTOR_MAX_SIZE);
+			LIBRPMA_COMMON_DESCRIPTOR_MAX_SIZE);
 		goto err_mr_dereg;
 	}
 

diff --git a/engines/librpma_common.h b/engines/librpma_common.h
@@ -27,7 +27,7 @@
 	td_vmsg((td), (err), rpma_err_2str(err), (func))
 
 /* ceil(a / b) = (a + b - 1) / b */
-#define LIBRPMA_CEIL(a, b) (((a) + (b) - 1) / (b))
+#define LIBRPMA_COMMON_CEIL(a, b) (((a) + (b) - 1) / (b))
 
 /* common option structure for server and client */
 struct librpma_common_options {
@@ -50,14 +50,14 @@ extern struct fio_option librpma_common_fio_options[];
  * Limited by the maximum length of the private data
  * for rdma_connect() in case of RDMA_PS_TCP (28 bytes).
  */
-#define DESCRIPTOR_MAX_SIZE 24
+#define LIBRPMA_COMMON_DESCRIPTOR_MAX_SIZE 24
 
 struct librpma_common_workspace {
 	uint16_t max_msg_num;	/* # of RQ slots */
 	uint8_t direct_write_to_pmem; /* Direct Write to PMem is possible */
 	uint8_t mr_desc_size;	/* size of mr_desc in descriptor[] */
 	/* buffer containing mr_desc */
-	char descriptor[DESCRIPTOR_MAX_SIZE];
+	char descriptor[LIBRPMA_COMMON_DESCRIPTOR_MAX_SIZE];
 };
 
 #define LIBRPMA_COMMON_PORT_STR_LEN_MAX 12

diff --git a/engines/librpma_gpspm.c b/engines/librpma_gpspm.c
@@ -17,7 +17,6 @@
 #include "librpma_common.h"
 
 #include <libpmem.h>
-#include <librpma.h>
 
 /* Generated by the protocol buffer compiler from: librpma_gpspm_flush.proto */
 #include "librpma_gpspm_flush.pb-c.h"
@@ -108,7 +107,7 @@ static int client_init(struct thread_data *td)
 			 * - B == ceil(iodepth / iodepth_batch)
 			 *   which is the number of batches for N writes
 			 */
-			cd->msg_num = LIBRPMA_CEIL(td->o.iodepth,
+			cd->msg_num = LIBRPMA_COMMON_CEIL(td->o.iodepth,
 					td->o.iodepth_batch);
 		}
 	}