logging_ok:

  Logging to logging@openlogging.org accepted
SCI_Transporter.hpp, SCI_Transporter.cpp:
  Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling
TransporterRegistry.cpp:
  Some fixes for wrap around needed plus DBUG handling
TCP_Transporter.hpp, TCP_Transporter.cpp:
  Added DBUG statements
SHM_Transporter.hpp, SHM_Transporter.cpp:
  Fixed SHM Transporter
SHM_Buffer.hpp:
  Fixed SHM Buffer to handle wrap around properly
IPCConfig.cpp:
  Fixed up config of SCI
SocketServer.cpp:
  Added DBUG support for SocketServer threads
ConfigInfo.cpp:
  Config changes for SCI
TransporterDefinitions.hpp, mgmapi_config_parameters.h:
  SCI fixes
Makefile.am, type_ndbapitools.mk.am, type_ndbapitest.mk.am:
  Added SCI library path to Makefiles
configure.in:
  Fixed small bug with shared mem and sci together in configure
acinclude.m4:
  Added possibility of providing SCI library path in confgure


acinclude.m4:
  Added possibility of providing SCI library path in confgure
configure.in:
  Fixed small bug with shared mem and sci together in configure
ndb/config/type_ndbapitest.mk.am:
  Added SCI library path to Makefiles
ndb/config/type_ndbapitools.mk.am:
  Added SCI library path to Makefiles
ndb/src/cw/cpcd/Makefile.am:
  Added SCI library path to Makefiles
ndb/src/kernel/Makefile.am:
  Added SCI library path to Makefiles
ndb/src/kernel/blocks/backup/restore/Makefile.am:
  Added SCI library path to Makefiles
ndb/src/mgmsrv/Makefile.am:
  Added SCI library path to Makefiles
sql/Makefile.am:
  Added SCI library path to Makefiles
ndb/src/common/transporter/Makefile.am:
  Added SCI library path to Makefiles
ndb/include/mgmapi/mgmapi_config_parameters.h:
  SCI fixes
ndb/include/transporter/TransporterDefinitions.hpp:
  SCI fixes
ndb/src/mgmsrv/ConfigInfo.cpp:
  Config changes for SCI
ndb/src/common/util/SocketServer.cpp:
  Added DBUG support for SocketServer threads
ndb/src/common/mgmcommon/IPCConfig.cpp:
  Fixed up config of SCI
ndb/src/common/transporter/SHM_Buffer.hpp:
  Fixed SHM Buffer to handle wrap around properly
ndb/src/common/transporter/SHM_Transporter.cpp:
  Fixed SHM Transporter
ndb/src/common/transporter/SHM_Transporter.hpp:
  Fixed SHM Transporter
ndb/src/common/transporter/TCP_Transporter.cpp:
  Added DBUG statements
ndb/src/common/transporter/TCP_Transporter.hpp:
  Added DBUG statements
ndb/src/common/transporter/TransporterRegistry.cpp:
  Some fixes for wrap around needed plus DBUG handling
ndb/src/common/transporter/SCI_Transporter.cpp:
  Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling
ndb/src/common/transporter/SCI_Transporter.hpp:
  Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

1 files changed, 75 insertions, 12 deletions

diff --git a/ndb/src/mgmsrv/ConfigInfo.cpp b/ndb/src/mgmsrv/ConfigInfo.cpp
index 948423f0109..b3afd57f6cd 100644
--- a/ndb/src/mgmsrv/ConfigInfo.cpp
+++ b/ndb/src/mgmsrv/ConfigInfo.cpp
@@ -125,11 +125,14 @@ ConfigInfo::m_SectionRules[] = {
   
   { "TCP",  fixHostname, "HostName1" },
   { "TCP",  fixHostname, "HostName2" },
+  { "SCI",  fixHostname, "HostName1" },
+  { "SCI",  fixHostname, "HostName2" },
   { "OSE",  fixHostname, "HostName1" },
   { "OSE",  fixHostname, "HostName2" },
 
   { "TCP",  fixPortNumber, 0 }, // has to come after fixHostName
   { "SHM",  fixPortNumber, 0 }, // has to come after fixHostName
+  { "SCI",  fixPortNumber, 0 }, // has to come after fixHostName
   //{ "SHM",  fixShmKey, 0 },
 
   /**
@@ -159,6 +162,8 @@ ConfigInfo::m_SectionRules[] = {
 
   { "TCP",  checkTCPConstraints, "HostName1" },
   { "TCP",  checkTCPConstraints, "HostName2" },
+  { "SCI",  checkTCPConstraints, "HostName1" },
+  { "SCI",  checkTCPConstraints, "HostName2" },
   
   { "*",    checkMandatory, 0 },
   
@@ -1788,7 +1793,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     "Id of node ("DB_TOKEN", "API_TOKEN" or "MGM_TOKEN") on one side of the connection",
     ConfigInfo::USED,
     false,
-    ConfigInfo::INT,
+    ConfigInfo::STRING,
     MANDATORY,
     "0",
     STR_VALUE(MAX_INT_RNIL) },
@@ -1800,28 +1805,74 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     "Id of node ("DB_TOKEN", "API_TOKEN" or "MGM_TOKEN") on one side of the connection",
     ConfigInfo::USED,
     false,
-    ConfigInfo::INT,
+    ConfigInfo::STRING,
     MANDATORY,
     "0",
     STR_VALUE(MAX_INT_RNIL) },
 
   {
-    CFG_SCI_ID_0,
-    "SciId0",
+    CFG_SCI_HOSTNAME_1,
+    "HostName1",
+    "SCI",
+    "Name/IP of computer on one side of the connection",
+    ConfigInfo::INTERNAL,
+    false,
+    ConfigInfo::STRING,
+    UNDEFINED,
+    0, 0 },
+
+  {
+    CFG_SCI_HOSTNAME_2,
+    "HostName2",
+    "SCI",
+    "Name/IP of computer on one side of the connection",
+    ConfigInfo::INTERNAL,
+    false,
+    ConfigInfo::STRING,
+    UNDEFINED,
+    0, 0 },
+
+  {
+    CFG_CONNECTION_SERVER_PORT,
+    "PortNumber",
     "SCI",
-    "Local SCI-node id for adapter 0 (a computer can have two adapters)",
+    "Port used for this transporter",
     ConfigInfo::USED,
     false,
     ConfigInfo::INT,
     MANDATORY,
+    "0", 
+    STR_VALUE(MAX_INT_RNIL) },
+
+  {
+    CFG_SCI_HOST1_ID_0,
+    "Host1SciId0",
+    "SCI",
+    "SCI-node id for adapter 0 on Host1 (a computer can have two adapters)",
+    ConfigInfo::USED,
+    false,
+    ConfigInfo::INT,
+    MANDATORY,
+    "0",
+    STR_VALUE(MAX_INT_RNIL) },
+
+  {
+    CFG_SCI_HOST1_ID_1,
+    "Host1SciId1",
+    "SCI",
+    "SCI-node id for adapter 1 on Host1 (a computer can have two adapters)",
+    ConfigInfo::USED,
+    false,
+    ConfigInfo::INT,
+    "0",
     "0",
     STR_VALUE(MAX_INT_RNIL) },
 
   {
-    CFG_SCI_ID_1,
-    "SciId1",
+    CFG_SCI_HOST2_ID_0,
+    "Host2SciId0",
     "SCI",
-    "Local SCI-node id for adapter 1 (a computer can have two adapters)",
+    "SCI-node id for adapter 0 on Host2 (a computer can have two adapters)",
     ConfigInfo::USED,
     false,
     ConfigInfo::INT,
@@ -1830,6 +1881,18 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     STR_VALUE(MAX_INT_RNIL) },
 
   {
+    CFG_SCI_HOST2_ID_1,
+    "Host2SciId1",
+    "SCI",
+    "SCI-node id for adapter 1 on Host2 (a computer can have two adapters)",
+    ConfigInfo::USED,
+    false,
+    ConfigInfo::INT,
+    "0",
+    "0",
+    STR_VALUE(MAX_INT_RNIL) },
+
+  {
     CFG_CONNECTION_SEND_SIGNAL_ID,
     "SendSignalId",
     "SCI",
@@ -1862,8 +1925,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     false,
     ConfigInfo::INT,
     "2K",
-    "512",
-    STR_VALUE(MAX_INT_RNIL) },
+    "128",
+    "32K" },
 
   {
     CFG_SCI_BUFFER_MEM,
@@ -1873,8 +1936,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     ConfigInfo::USED,
     false,
     ConfigInfo::INT,
-    "1M",
-    "256K",
+    "192K",
+    "64K",
     STR_VALUE(MAX_INT_RNIL) },
 
   {