Commit 8f145e4c authored by unknown's avatar unknown
Browse files

wl1744 - ndb on windows 


ndb/config/win-lib.am:
  removed TLS stuff (which I don't know what it is)
ndb/include/kernel/signaldata/UtilLock.hpp:
  Made stuff public
ndb/include/ndb_global.h.in:
  better defines for strcasecmp
ndb/src/common/transporter/Transporter.cpp:
  Use NDB_INVALID_SOCKET
ndb/src/common/util/SocketClient.cpp:
  Use NDB_INVALID_SOCKET
ndb/src/kernel/vm/Callback.hpp:
  Move callback into SimulatedBlock as it for some mysterious reason
    otherwise got sizeof()=0 on windows
ndb/src/kernel/vm/Configuration.cpp:
  Removed extra (bug) semi-colon
ndb/src/kernel/vm/Mutex.cpp:
  Move callback into SimulatedBlock as it for some mysterious reason
    otherwise got sizeof()=0 on windows
ndb/src/kernel/vm/Mutex.hpp:
  Move callback into SimulatedBlock as it for some mysterious reason
    otherwise got sizeof()=0 on windows
ndb/src/kernel/vm/SectionReader.cpp:
  Use correct struct-type
ndb/src/kernel/vm/SectionReader.hpp:
  Use correct struct-type
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Move callback into SimulatedBlock as it for some mysterious reason
    otherwise got sizeof()=0 on windows
ndb/src/kernel/vm/SimulatedBlock.hpp:
  Move callback into SimulatedBlock as it for some mysterious reason
    otherwise got sizeof()=0 on windows
ndb/src/mgmclient/Makefile.am:
  Add mgm client to windoze
ndb/test/src/Makefile.am:
  Fix lib
parent c63ae27e

ndb/config/win-lib.am

+2 −61
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ CFG=@name@ - Win32 Debug 
!MESSAGE

!MESSAGE "@name@ - Win32 Release" (based on "Win32 (x86) Static Library")

!MESSAGE "@name@ - Win32 Debug" (based on "Win32 (x86) Static Library")

!MESSAGE "@name@ - Win32 TLS_DEBUG" (based on "Win32 (x86) Static Library")

!MESSAGE "@name@ - Win32 TLS" (based on "Win32 (x86) Static Library")

!MESSAGE



# Begin Project
@@ -54,7 +52,7 @@ BSC32=bscmake.exe 
# ADD BSC32 /nologo

LIB32=xilink6.exe -lib

# ADD BASE LIB32 /nologo

# ADD LIB32 /nologo /out:"..\lib_release\@name@.lib"

# ADD LIB32 /nologo /out:".\lib_release\@name@.lib"

@release_libs@



!ELSEIF  "$(CFG)" == "@name@ - Win32 Debug"
@@ -81,72 +79,15 @@ BSC32=bscmake.exe 
# ADD BSC32 /nologo

LIB32=xilink6.exe -lib

# ADD BASE LIB32 /nologo

# ADD LIB32 /nologo /out:"..\lib_debug\@name@.lib"

# ADD LIB32 /nologo /out:".\lib_debug\@name@.lib"

@debug_libs@



!ELSEIF  "$(CFG)" == "@name@ - Win32 TLS_DEBUG"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 1

# PROP BASE Output_Dir "@name@___Win32_TLS_DEBUG"

# PROP BASE Intermediate_Dir "@name@___Win32_TLS_DEBUG"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 1

# PROP Output_Dir "@name@___Win32_TLS_DEBUG"

# PROP Intermediate_Dir "@name@___Win32_TLS_DEBUG"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /D "WIN32" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /D "WIN32" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /FD /c

# ADD BASE CPP @includes@

# ADD CPP @includes@

# ADD BASE RSC /l 0x409

# ADD RSC /l 0x409

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LIB32=link.exe -lib

# ADD BASE LIB32 /nologo /out:"..\lib_debug\@name@_tls.lib"

# ADD LIB32 /nologo /out:"..\lib_debug\@name@_tls.lib"

@tls_debug_libs@



!ELSEIF  "$(CFG)" == "@name@ - Win32 TLS"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 0

# PROP BASE Output_Dir "@name@___Win32_TLS"

# PROP BASE Intermediate_Dir "@name@___Win32_TLS"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 0

# PROP Output_Dir "@name@___Win32_TLS"

# PROP Intermediate_Dir "@name@___Win32_TLS"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /D "WIN32" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /D "WIN32" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /FD /c

# ADD BASE CPP @includes@

# ADD CPP @includes@

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409

# ADD RSC /l 0x409

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LIB32=link.exe -lib

# ADD BASE LIB32 /nologo /out:"..\lib_release\@name@_tls.lib"

# ADD LIB32 /nologo /out:"..\lib_release\@name@_tls.lib"

@tls_release_libs@



!ENDIF



# Begin Target



# Name "@name@ - Win32 Release"

# Name "@name@ - Win32 Debug"

# Name "@name@ - Win32 TLS_DEBUG"

# Name "@name@ - Win32 TLS"



# Begin Group "Source Files"

# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

ndb/include/kernel/signaldata/UtilLock.hpp

+12 −12
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public: 
  enum RequestInfo {

    TryLock = 1

  };

private:

public:

  Uint32 senderData;  

  Uint32 senderRef;

  Uint32 lockId;
@@ -63,7 +63,7 @@ class UtilLockConf { 
public:

  STATIC_CONST( SignalLength = 4 );

  

private:

public:

  Uint32 senderData;

  Uint32 senderRef;

  Uint32 lockId;
@@ -95,7 +95,7 @@ public: 
    LockAlreadyHeld = 4

    

  };

private:

public:

  Uint32 senderData;

  Uint32 senderRef;

  Uint32 lockId;
@@ -119,7 +119,7 @@ class UtilUnlockReq { 
public:

  STATIC_CONST( SignalLength = 4 );

  

private:

public:

  Uint32 senderData;  

  Uint32 senderRef;

  Uint32 lockId;
@@ -143,7 +143,7 @@ class UtilUnlockConf { 
public:

  STATIC_CONST( SignalLength = 3 );

  

private:

public:

  Uint32 senderData;

  Uint32 senderRef;

  Uint32 lockId;
@@ -171,7 +171,7 @@ public: 
    NoSuchLock = 1,

    NotLockOwner = 2

  };

private:

public:

  Uint32 senderData;

  Uint32 senderRef;

  Uint32 lockId;
@@ -200,7 +200,7 @@ public: 


  STATIC_CONST( SignalLength = 4 );



private:

public:

  Uint32 senderData;

  Uint32 senderRef;

  Uint32 lockId;
@@ -229,7 +229,7 @@ public: 


  STATIC_CONST( SignalLength = 4 );



private:

public:

  Uint32 senderData;

  Uint32 senderRef;

  Uint32 lockId;
@@ -251,7 +251,7 @@ class UtilCreateLockConf { 
public:

  STATIC_CONST( SignalLength = 3 );



private:

public:

  Uint32 senderData;

  Uint32 senderRef;

  Uint32 lockId;
@@ -275,7 +275,7 @@ class UtilDestroyLockReq { 
public:

  STATIC_CONST( SignalLength = 4 );



private:

public:

  Uint32 senderData;

  Uint32 senderRef;

  Uint32 lockId;
@@ -303,7 +303,7 @@ public: 


  STATIC_CONST( SignalLength = 4 );



private:

public:

  Uint32 senderData;

  Uint32 senderRef;

  Uint32 lockId;
@@ -325,7 +325,7 @@ class UtilDestroyLockConf { 
public:

  STATIC_CONST( SignalLength = 3 );



private:

public:

  Uint32 senderData;

  Uint32 senderRef;

  Uint32 lockId;

ndb/include/ndb_global.h.in

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
#define snprintf _snprintf

#define vsnprintf _vsnprintf

#define HAVE_STRCASECMP

#define strcasecmp(a,b) _strcmpi(a,b)

#define strncasecmp(a,b) _strncmpi(a,b)

#define strcasecmp _strcmpi

#define strncasecmp _strncmpi

#pragma warning(disable: 4503 4786)

#else

#undef NDB_WIN32

ndb/src/common/transporter/Transporter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ Transporter::connect_client() { 
    return true;

  NDB_SOCKET_TYPE sockfd = m_socket_client->connect();

  

  if (sockfd < 0)

  if (sockfd == NDB_INVALID_SOCKET)

    return false;



  // send info about own id

ndb/src/common/util/SocketClient.cpp

+10 −10
Original line number Diff line number Diff line
@@ -26,14 +26,14 @@ SocketClient::SocketClient(const char *server_name, unsigned short port, SocketA 
  m_auth= sa;

  m_port= port;

  m_server_name= strdup(server_name);

  m_sockfd= -1;

  m_sockfd= NDB_INVALID_SOCKET;

}



SocketClient::~SocketClient()

{

  if (m_server_name)

    free(m_server_name);

  if (m_sockfd >= 0)

  if (m_sockfd != NDB_INVALID_SOCKET)

    NDB_CLOSE_SOCKET(m_sockfd);

  if (m_auth)

    delete m_auth;
@@ -42,7 +42,7 @@ SocketClient::~SocketClient() 
bool

SocketClient::init()

{

  if (m_sockfd >= 0)

  if (m_sockfd != NDB_INVALID_SOCKET)

    NDB_CLOSE_SOCKET(m_sockfd);



  memset(&m_servaddr, 0, sizeof(m_servaddr));
@@ -63,32 +63,32 @@ SocketClient::init() 
NDB_SOCKET_TYPE

SocketClient::connect()

{

  if (m_sockfd < 0)

  if (m_sockfd == NDB_INVALID_SOCKET)

  {

    if (!init()) {

#ifdef VM_TRACE

      ndbout << "SocketClient::connect() failed " << m_server_name << " " << m_port << endl;

#endif

      return -1;

      return NDB_INVALID_SOCKET;

    }

  }

  const int r = ::connect(m_sockfd, (struct sockaddr*) &m_servaddr, sizeof(m_servaddr));

  if (r == -1) {

    NDB_CLOSE_SOCKET(m_sockfd);

    m_sockfd= -1;

    return -1;

    m_sockfd= NDB_INVALID_SOCKET;

    return NDB_INVALID_SOCKET;

  }



  if (m_auth) {

    if (!m_auth->client_authenticate(m_sockfd))

    {

      NDB_CLOSE_SOCKET(m_sockfd);

      m_sockfd= -1;

      return -1;

      m_sockfd= NDB_INVALID_SOCKET;

      return NDB_INVALID_SOCKET;

    }

  }

  NDB_SOCKET_TYPE sockfd= m_sockfd;

  m_sockfd= -1;

  m_sockfd= NDB_INVALID_SOCKET;



  return sockfd;

}