[libknet] drop knet_handle_new_ex in favour of knet_handle_new

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

libknet/handle.c

@@ -533,10 +533,10 @@ static void _stop_threads(knet_handle_t knet_h)
 	}
 }
 
-knet_handle_t knet_handle_new_ex(knet_node_id_t host_id,
-				 int            log_fd,
-				 uint8_t        default_log_level,
-				 uint64_t       flags)
+knet_handle_t knet_handle_new(knet_node_id_t host_id,
+			      int            log_fd,
+			      uint8_t        default_log_level,
+			      uint64_t       flags)
 {
 	knet_handle_t knet_h;
 	int savederrno = 0;
@@ -708,13 +708,6 @@ knet_handle_t knet_handle_new_ex(knet_node_id_t host_id,
 	return NULL;
 }
 
-knet_handle_t knet_handle_new(knet_node_id_t host_id,
-			      int            log_fd,
-			      uint8_t        default_log_level)
-{
-	return knet_handle_new_ex(host_id, log_fd, default_log_level, KNET_HANDLE_FLAG_PRIVILEGED);
-}
-
 int knet_handle_free(knet_handle_t knet_h)
 {
 	int savederrno = 0;

libknet/libknet.h

@@ -93,7 +93,7 @@ typedef struct knet_handle *knet_handle_t;
  */
 
 /**
- * knet_handle_new_ex
+ * knet_handle_new
  *
  * @brief create a new instance of a knet handle
  *
@@ -119,7 +119,7 @@ typedef struct knet_handle *knet_handle_t;
  *            at default_log_level value. (see logging API)
  *
  * flags    - bitwise OR of some of the following flags:
- *   KNET_HANDLE_FLAG_PRIVILEGED: use privileged operations setting up the
+ *            KNET_HANDLE_FLAG_PRIVILEGED: use privileged operations setting up the
  *            communication sockets.  If disabled, failure to acquire large
  *            enough socket buffers is ignored but logged.  Inadequate buffers
  *            lead to poor performance.
@@ -132,20 +132,10 @@ typedef struct knet_handle *knet_handle_t;
  *   ERANGE       - buffer size readback returned unexpected type
  */
 
-knet_handle_t knet_handle_new_ex(knet_node_id_t host_id,
-				 int            log_fd,
-				 uint8_t        default_log_level,
-				 uint64_t	flags);
-
-/**
- * knet_handle_new
- *
- * @brief knet_handle_new_ex with flags = KNET_HANDLE_FLAG_PRIVILEGED.
- */
-
 knet_handle_t knet_handle_new(knet_node_id_t host_id,
-			      int      log_fd,
-			      uint8_t  default_log_level);
+			      int log_fd,
+			      uint8_t default_log_level,
+			      uint64_t flags);
 
 /**
  * knet_handle_free

libknet/tests/api-test-coverage

@@ -68,7 +68,6 @@ found=0
 missing=0
 
 for i in $headerapicalls; do
-	[ "$i" = knet_handle_new_ex ] && i=knet_handle_new # tested together
 	numapicalls=$((numapicalls + 1))
 	if [ -f $srcdir/api_${i}.c ]; then
 		found=$((found + 1))

libknet/tests/api_knet_handle_new.c

@@ -29,7 +29,7 @@ static void test(void)
 
 	printf("Test knet_handle_new hostid 1, no logging\n");
 
-	knet_h = knet_handle_new_ex(1, 0, 0, 0);
+	knet_h = knet_handle_new(1, 0, 0, 0);
 	if (!knet_h) {
 		printf("Unable to init knet_handle! err: %s\n", strerror(errno));
 		exit(FAIL);
@@ -42,7 +42,7 @@ static void test(void)
 
 	printf("Test knet_handle_new hostid -1, no logging\n");
 
-	knet_h = knet_handle_new_ex(-1, 0, 0, 0);
+	knet_h = knet_handle_new(-1, 0, 0, 0);
 	if (!knet_h) {
 		printf("Unable to init knet_handle! err: %s\n", strerror(errno));
 		exit(FAIL);
@@ -73,7 +73,7 @@ static void test(void)
 	 */
 	printf("Test knet_handle_new hostid 1, incorrect log_fd (-1)\n");
 
-	knet_h = knet_handle_new(1, -1, 0);
+	knet_h = knet_handle_new(1, -1, 0, 0);
 
 	if ((!knet_h) && (errno != EINVAL)) {
 		printf("knet_handle_new returned incorrect errno on incorrect log_fd\n");
@@ -91,7 +91,7 @@ static void test(void)
 	 */
 	printf("Test knet_handle_new hostid 1, incorrect log_fd (max_fd + 1)\n");
 
-	knet_h = knet_handle_new(1, (int) cur.rlim_max, 0);
+	knet_h = knet_handle_new(1, (int) cur.rlim_max, 0, 0);
 
 	if ((knet_h) || (errno != EINVAL)) {
 		printf("knet_handle_new accepted an incorrect (max_fd + 1) log_fd or returned incorrect errno on incorrect log_fd: %s\n", strerror(errno));
@@ -103,7 +103,7 @@ static void test(void)
 
 	printf("Test knet_handle_new hostid 1, proper log_fd, invalid log level (DEBUG + 1)\n");
 
-	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG + 1);
+	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG + 1 ,0);
 
 	if ((knet_h) || (errno != EINVAL)) {
 		printf("knet_handle_new accepted an incorrect log level or returned incorrect errno on incorrect log level: %s\n", strerror(errno));

libknet/tests/api_knet_handle_new_limit.c

@@ -31,7 +31,7 @@ static void test(void)
 
 	for (idx = 0; idx < UINT8_MAX; idx++) {
 		printf("Allocating %d\n", idx);
-		knet_h[idx] = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);
+		knet_h[idx] = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG, 0);
 		if (!knet_h[idx]) {
 			printf("knet_handle_new[%d] failed: %s\n", idx, strerror(errno));
 			flush_logs(logfds[0], stdout);
@@ -42,7 +42,7 @@ static void test(void)
 	}
 
 	printf("forcing UINT8_T MAX\n");
-	knet_h[UINT8_MAX] = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);
+	knet_h[UINT8_MAX] = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG, 0);
 	if (knet_h[UINT8_MAX]) {
 		printf("off by one somewhere\n");
 		knet_handle_free(knet_h[UINT8_MAX]);

libknet/tests/knet_bench.c

@@ -450,7 +450,7 @@ static void setup_knet(int argc, char *argv[])
 
 	logfd = start_logging(stdout);
 
-	knet_h = knet_handle_new(thisnodeid, logfd, debug);
+	knet_h = knet_handle_new(thisnodeid, logfd, debug, 0);
 	if (!knet_h) {
 		printf("Unable to knet_handle_new: %s\n", strerror(errno));
 		exit(FAIL);

libknet/tests/test-common.c

@@ -353,7 +353,7 @@ int start_logging(FILE *std)
 
 knet_handle_t knet_handle_start(int logfds[2], uint8_t log_level)
 {
-	knet_handle_t knet_h = knet_handle_new_ex(1, logfds[1], log_level, 0);
+	knet_handle_t knet_h = knet_handle_new(1, logfds[1], log_level, 0);
 
 	if (knet_h) {
 		return knet_h;

man/Makefile.am

@@ -54,7 +54,6 @@ knet_man3_MANS = \
 		knet_get_transport_name_by_id.3 \
 		knet_handle_get_transport_reconnect_interval.3 \
 		knet_handle_new.3 \
-		knet_handle_new_ex.3 \
 		knet_handle_pmtud_get.3 \
 		knet_handle_pmtud_getfreq.3 \
 		knet_handle_pmtud_setfreq.3 \