Make the default config file consistent with the initialization code.

diff --git a/dapl/svc/mpxyd.c b/dapl/svc/mpxyd.c
index 642d1dda1f4e3481f4b98ee4452fa3314527e0a3..0db364fa1d0f041bf062fd0e2ac9bb29f3040d0b 100644 (file)
--- a/dapl/svc/mpxyd.c
+++ b/dapl/svc/mpxyd.c
@@ -69,7 +69,7 @@ static char *opts_file = MPXYD_CONF;
 //static char log_file[128] = "/var/log/mpxyd.log";
 static char log_file[128] = "stdout";
 static int log_level = 0;
-static char lock_file[128] = "/var/run/mpxyd.pid";
+static char lock_file[128] = "/var/lock/mpxyd.pid";
 static short scif_sport = SCIF_OFED_PORT_8;
 static scif_epd_t scif_listen_ep;
 static struct scif_portID scif_id;

diff --git a/doc/mpxyd.conf b/doc/mpxyd.conf
index 36fc738e8f503f3072d28ac5098e17cdaa5a3f3b..0e06a1d7d43c075ba1cb42463c6844bafab9a499 100644 (file)
--- a/doc/mpxyd.conf
+++ b/doc/mpxyd.conf
@@ -29,38 +29,32 @@ log_level 0
 \r
 lock_file /var/lock/mpxyd.pid\r
 \r
-# service_id:\r
+# scif_port_id:\r
 # SCIF port number that the server listens on.\r
 # If this value is changed, then a corresponding change is required for\r
-# client MIC DAPL provider.\r
+# client MIC DAPL provider. Default is SCIF_OFED_PORT_8 (i.e. 68)\r
 \r
-service_id 67\r
+scif_port_id 68\r
 \r
-# tx_depth:\r
+# mcm_depth:\r
 # Specifies the number of request queue entries available for RDMA.\r
 # per client/server connection.  A larger depth consumes more system \r
 # resources\r
 \r
-tx_depth 100\r
+mcm_depth 500\r
 \r
-# tx_signal:\r
+# mcm_signal_rate:\r
 # Specifies the number of request posted before signaling for completions.\r
 # Larger the value reduces interrupts but could increse reserve times on \r
 # buffer resources. \r
 \r
-tx_signal 1\r
+mcm_signal_rate 100\r
 \r
-# rdma_buffer_KB:\r
+# buffer_pool_mb:\r
 # Specifies the amount of memory pre-allocated and pinned for SCIF to uDAPL\r
 # RDMA proxy services. Per connection.  \r
 \r
-rdma_buffer_KB 1024\r
-\r
-# cm_msg_depth:\r
-# Specifies amount of CM messages pre-allocated and pinned for SCIF to uDAPL\r
-# CM proxy services. Per service.  \r
-\r
-cm_msg_depth 100\r
+buffer_pool_mb 64\r
 \r
 # buffer_segment_size:\r
 # Specifies the segment size of large DMA transfers. Default is 128KB.\r
@@ -68,3 +62,8 @@ cm_msg_depth 100
  \r
 buffer_segment_size 131072\r
  \r
+# buffer_alignment:\r
+# Specifies the alignment of the RDMA buffer. Default is 64 bytes.\r
+\r
+buffer_alignment 64\r
+\r