[cosmetic] rename net_fd to datafd

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

diff --git a/libknet/handle.c b/libknet/handle.c
index dd1fe377d9164279b8cec01f846c0c9cf066a845..0ee9cd2133dd0f26df5022eba480e48ac6d8b3b2 100644 (file)
--- a/libknet/handle.c
+++ b/libknet/handle.c
@@ -211,7 +211,7 @@ static int _init_buffers(knet_handle_t knet_h)
        knet_h->send_to_links_buf = malloc(KNET_DATABUFSIZE);
        if (!knet_h->send_to_links_buf) {
                savederrno = errno;
-               log_err(knet_h, KNET_SUB_HANDLE, "Unable to allocate memory net_fd to link buffer: %s",
+               log_err(knet_h, KNET_SUB_HANDLE, "Unable to allocate memory datafd to link buffer: %s",
                        strerror(savederrno));
                goto exit_fail;
        }
@@ -220,7 +220,7 @@ static int _init_buffers(knet_handle_t knet_h)
        knet_h->recv_from_links_buf = malloc(KNET_DATABUFSIZE);
        if (!knet_h->recv_from_links_buf) {
                savederrno = errno;
-               log_err(knet_h, KNET_SUB_HANDLE, "Unable to allocate memory for link to net_fd buffer: %s",
+               log_err(knet_h, KNET_SUB_HANDLE, "Unable to allocate memory for link to datafd buffer: %s",
                        strerror(savederrno));
                goto exit_fail;
        }
@@ -247,7 +247,7 @@ static int _init_buffers(knet_handle_t knet_h)
        knet_h->send_to_links_buf_crypt = malloc(KNET_DATABUFSIZE_CRYPT);
        if (!knet_h->send_to_links_buf_crypt) {
                savederrno = errno;
-               log_err(knet_h, KNET_SUB_HANDLE, "Unable to allocate memory for crypto net_fd to link buffer: %s",
+               log_err(knet_h, KNET_SUB_HANDLE, "Unable to allocate memory for crypto datafd to link buffer: %s",
                        strerror(savederrno));
                goto exit_fail;
        }
@@ -256,7 +256,7 @@ static int _init_buffers(knet_handle_t knet_h)
        knet_h->recv_from_links_buf_crypt = malloc(KNET_DATABUFSIZE_CRYPT);
        if (!knet_h->recv_from_links_buf_crypt) {
                savederrno = errno;
-               log_err(knet_h, KNET_SUB_CRYPTO, "Unable to allocate memory for crypto link to net_fd buffer: %s",
+               log_err(knet_h, KNET_SUB_CRYPTO, "Unable to allocate memory for crypto link to datafd buffer: %s",
                        strerror(savederrno));
                goto exit_fail;
        }
@@ -307,7 +307,7 @@ static int _init_epolls(knet_handle_t knet_h)
        knet_h->send_to_links_epollfd = epoll_create(KNET_EPOLL_MAX_EVENTS);
        if (knet_h->send_to_links_epollfd < 0) {
                savederrno = errno;
-               log_err(knet_h, KNET_SUB_HANDLE, "Unable to create epoll net_fd to link fd: %s",
+               log_err(knet_h, KNET_SUB_HANDLE, "Unable to create epoll datafd to link fd: %s",
                        strerror(savederrno));
                goto exit_fail;
        }
@@ -315,7 +315,7 @@ static int _init_epolls(knet_handle_t knet_h)
        knet_h->recv_from_links_epollfd = epoll_create(KNET_EPOLL_MAX_EVENTS);
        if (knet_h->recv_from_links_epollfd < 0) {
                savederrno = errno;
-               log_err(knet_h, KNET_SUB_HANDLE, "Unable to create epoll link to net_fd fd: %s",
+               log_err(knet_h, KNET_SUB_HANDLE, "Unable to create epoll link to datafd fd: %s",
                        strerror(savederrno));
                goto exit_fail;
        }
@@ -330,14 +330,14 @@ static int _init_epolls(knet_handle_t knet_h)
 
        if (_fdset_cloexec(knet_h->send_to_links_epollfd)) {
                savederrno = errno;
-               log_err(knet_h, KNET_SUB_HANDLE, "Unable to set CLOEXEC on net_fd to link epoll fd: %s",
+               log_err(knet_h, KNET_SUB_HANDLE, "Unable to set CLOEXEC on datafd to link epoll fd: %s",
                        strerror(savederrno)); 
                goto exit_fail;
        }
 
        if (_fdset_cloexec(knet_h->recv_from_links_epollfd)) {
                savederrno = errno;
-               log_err(knet_h, KNET_SUB_HANDLE, "Unable to set CLOEXEC on link to net_fd epoll fd: %s",
+               log_err(knet_h, KNET_SUB_HANDLE, "Unable to set CLOEXEC on link to datafd epoll fd: %s",
                        strerror(savederrno)); 
                goto exit_fail;
        }
@@ -356,7 +356,7 @@ static int _init_epolls(knet_handle_t knet_h)
        if (epoll_ctl(knet_h->send_to_links_epollfd,
                      EPOLL_CTL_ADD, knet_h->sockfd, &ev)) {
                savederrno = errno;
-               log_err(knet_h, KNET_SUB_HANDLE, "Unable to add net_fd to link fd to epoll pool: %s",
+               log_err(knet_h, KNET_SUB_HANDLE, "Unable to add datafd to link fd to epoll pool: %s",
                        strerror(savederrno));
                goto exit_fail;
        }
@@ -426,7 +426,7 @@ static int _start_threads(knet_handle_t knet_h)
        savederrno = pthread_create(&knet_h->send_to_links_thread, 0,
                                    _handle_send_to_links_thread, (void *) knet_h);
        if (savederrno) {
-               log_err(knet_h, KNET_SUB_HANDLE, "Unable to start net_fd to link thread: %s",
+               log_err(knet_h, KNET_SUB_HANDLE, "Unable to start datafd to link thread: %s",
                        strerror(savederrno));
                goto exit_fail;
        }
@@ -434,7 +434,7 @@ static int _start_threads(knet_handle_t knet_h)
        savederrno = pthread_create(&knet_h->recv_from_links_thread, 0,
                                    _handle_recv_from_links_thread, (void *) knet_h);
        if (savederrno) {
-               log_err(knet_h, KNET_SUB_HANDLE, "Unable to start link to net_fd thread: %s",
+               log_err(knet_h, KNET_SUB_HANDLE, "Unable to start link to datafd thread: %s",
                        strerror(savederrno));
                goto exit_fail;
        }
@@ -486,7 +486,7 @@ static void _stop_threads(knet_handle_t knet_h)
 }
 
 knet_handle_t knet_handle_new(uint16_t host_id,
-                             int      net_fd,
+                             int      datafd,
                              int      log_fd,
                              uint8_t  default_log_level)
 {
@@ -497,7 +497,7 @@ knet_handle_t knet_handle_new(uint16_t host_id,
         * validate incoming request
         */
 
-       if (net_fd <= 0) {
+       if (datafd <= 0) {
                errno = EINVAL;
                return NULL;
        }
@@ -523,7 +523,7 @@ knet_handle_t knet_handle_new(uint16_t host_id,
         */
 
        knet_h->host_id = host_id;
-       knet_h->sockfd = net_fd;
+       knet_h->sockfd = datafd;
        knet_h->logfd = log_fd;
        if (knet_h->logfd > 0) {
                memset(&knet_h->log_levels, default_log_level, KNET_MAX_SUBSYSTEMS);

diff --git a/libknet/libknet.h b/libknet/libknet.h
index 402068696f260c732ded740d28c5e3a6519ef430..890fccda5202c38889b013869569f1a084d519a3 100644 (file)
--- a/libknet/libknet.h
+++ b/libknet/libknet.h
@@ -30,7 +30,7 @@
 #define KNET_MAX_LINK 8
 
 /*
- * maximum packet size that should be written to net_fd
+ * maximum packet size that should be written to datafd
  *  see knet_handle_new for details
  */
 
@@ -59,7 +59,7 @@ typedef struct knet_handle *knet_handle_t;
  *            It is user responsibility to check that the value
  *            is unique, or bad might happen.
  *
- * net_fd   - read/write file descriptor (must be > 0).
+ * datafd   - read/write file descriptor (must be > 0).
  *            knet will read data here to send to the other hosts
  *            and will write data received from the network.
  *            Each data packet can be of max size KNET_MAX_PACKET_SIZE!
@@ -84,7 +84,7 @@ typedef struct knet_handle *knet_handle_t;
  */
 
 knet_handle_t knet_handle_new(uint16_t host_id,
-                             int      net_fd,
+                             int      datafd,
                              int      log_fd,
                              uint8_t  default_log_level);
 
@@ -110,7 +110,7 @@ int knet_handle_free(knet_handle_t knet_h);
  *
  * dst_host_filter_fn -
  *            is a callback function that is invoked every time
- *            a packet hits net_fd (see knet_handle_new).
+ *            a packet hits datafd (see knet_handle_new).
  *            the function allows users to tell libknet where the
  *            packet has to be delivered.
  *