transactd 1.2.0 → 2.0.0

data/build/tdclrb/bldgem/extconf.rb

@@ -33,7 +33,7 @@ ruby_exe_path = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_ins
 # use prebuilt binary
 #
 if has_binary(transactd_gem_root)
-  make_makefile_prebuilt_win32(ruby_bin_path, transactd_gem_root) if RUBY_PLATFORM =~ /mswin/
+  make_makefile_prebuilt_win32(ruby_bin_path, transactd_gem_root) if RUBY_PLATFORM =~ /mswin/ || RUBY_PLATFORM =~ /mingw/
   exit
 end
 
@@ -54,6 +54,8 @@ generator         = arg_config('--generator', '').gsub(/"\n/, '')
 ruby_include_dirs = arg_config('--ruby_include_dirs', '').gsub(/"\n/, '')
 ruby_library_path = arg_config('--ruby_library_path', '').gsub(/"\n/, '')
 install_prefix    = arg_config('--install_prefix', '').gsub(/"\n/, '')
+build_type        = arg_config('--build_type', '').gsub(/"\n/, '')
+no_rb_tbr         = arg_config('--without_rb_thread_blocking_region', '').gsub(/"\n/, '').downcase
 
 # boost
 if boost != '' && boost !=~ /^\-DBOOST_ROOT/
@@ -81,7 +83,9 @@ end
 
 # ruby_library_path
 if ruby_library_path != '' && ruby_library_path !=~ /^\-DRUBY_SWIG_LIBRARY_PATH/
-  ruby_library_path = '-DTRANSACTD_RUBY_LIBRARY_PATH="' + to_slash_path(ruby_library_path) + '"'
+  lib_path = to_slash_path(ruby_library_path)
+  $LDFLAGS = $LDFLAGS + ' -libpath:' + File.dirname(lib_path)
+  ruby_library_path = '-DTRANSACTD_RUBY_LIBRARY_PATH="' + lib_path + '"'
 end
 
 # install_prefix
@@ -89,6 +93,15 @@ if install_prefix != '' && install_prefix !=~ /^\-DCMAKE_INSTALL_PREFIX/
   install_prefix = '-DTRANSACTD_CLIENTS_PREFIX="' + to_slash_path(install_prefix) + '"'
 end
 
+# build_type
+if build_type !=~ /^\-DCMAKE_BUILD_TYPE/
+  if build_type != ''
+    build_type = '-DCMAKE_BUILD_TYPE=' + build_type
+  else
+    build_type = '-DCMAKE_BUILD_TYPE=Release'
+  end
+end
+
 # ruby executable path
 ruby_executable = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
 ruby_executable = '-DTRANSACTD_RUBY_EXECUTABLE_PATH="' + to_slash_path(ruby_executable) + '"'
@@ -96,10 +109,22 @@ ruby_executable = '-DTRANSACTD_RUBY_EXECUTABLE_PATH="' + to_slash_path(ruby_exec
 # output dir
 gem_root = '-DTRANSACTD_RUBY_GEM_ROOT_PATH="' + to_slash_path(transactd_gem_root) + '"'
 
+# rb_thread_blocking_region or rb_thread_call_without_gvl
+use_TCWOG = have_func('rb_thread_call_without_gvl', 'ruby/thread.h')
+use_TBR = (! use_TCWOG) && have_func('rb_thread_blocking_region')
+if no_rb_tbr != '' && no_rb_tbr != 'off'
+  use_TCWOG = false
+  use_TBR = false
+end
+rb_tbr = ' -DTRANSACTD_HAVE_RB_THREAD_CALL_WITHOUT_GVL=' +
+  (use_TCWOG ? 'ON' : 'OFF') +
+  ' -DTRANSACTD_HAVE_RB_THREAD_BLOCKING_REGION=' +
+  (use_TBR ? 'ON' : 'OFF')
+
 # cmake
 cmake_cmd = ['cmake', to_native_path(transactd_gem_root_relative), '-DTRANSACTD_RUBY_GEM=ON',
               generator, boost, ruby_executable, ruby_library_path, ruby_include_dirs,
-              install_prefix, gem_root, '>> cmake_generate.log'].join(' ')
+              install_prefix, gem_root, build_type, rb_tbr, '>> cmake_generate.log'].join(' ')
 begin
   f = open('cmake_generate.log', 'w')
   f.puts cmake_cmd

data/build/tdclrb/gem/helper.rb

@@ -53,7 +53,7 @@ def get_common_binary_files(transactd_gem_root)
   windows_bitness = get_windows_bitness()
   ruby_bitness = 32 if windows_bitness == 32
   bin_files = Dir.glob(File.join(transactd_gem_root, 'bin/common/tdclc_' + ruby_bitness.to_s + '_*.dll'))
-  bin_files += Dir.glob(File.join(transactd_gem_root, 'bin/common/tdclcpp_*_' + ruby_bitness.to_s + 'm_*.dll'))
+  bin_files += Dir.glob(File.join(transactd_gem_root, 'bin/common/tdclcpp_*_' + ruby_bitness.to_s + 'mr_*.dll'))
   sysdir = get_windows_sysdir()
   bin_files = bin_files.map{ |i| '"' + to_native_path(i) + '" "' + sysdir + '"' }
   return bin_files
@@ -110,4 +110,14 @@ EOS
     mkfile.close
     mkfile_dummy.close
   end
+  if RUBY_PLATFORM =~ /mingw/
+    begin
+      mkfile = open('nmake.cmd', 'r')
+      mkfile2 = open('make.cmd', 'w')
+      mkfile2.puts mkfile.read
+    ensure
+      mkfile.close
+      mkfile2.close
+    end
+  end
 end

data/build/tdclrb/gem_output.cmake

@@ -16,28 +16,32 @@
 #   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
 #   02111-1307, USA.
 ##=================================================================
+include(../common/system.cmake)
+include(../common/smart_install.cmake)
 # ==========================================================
 #   set install drectory
 # ==========================================================
 if(NOT COMMAND tdcl_set_output)
 macro(tdcl_set_output TRANSACTD_BINARY_ROOT prefix)
-  ## install to gem/common
-  install(TARGETS ${this_target}
-    LIBRARY DESTINATION "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common"
-    RUNTIME DESTINATION "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common"
-    ARCHIVE DESTINATION "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common"
-  )
-  ## install to system dir (copy file if greater)
-  if(WIN32)
-    get_target_property(tmp_var "${this_target}" LOCATION)
-    get_filename_component(tmp_var "${tmp_var}" NAME)
-    file(TO_CMAKE_PATH "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common/${tmp_var}" tmp_var)
-    bz_smart_install(SOURCES "${tmp_var}" TO_WIN_SYSTEMDIR)
-  else()
-    if("${prefix}" STREQUAL "")
-      install(TARGETS ${this_target} LIBRARY DESTINATION /usr/lib)
+  ## install tdclcppmr
+  if((NOT WIN32) OR MSVC)
+    install(TARGETS tdclcppmr
+      LIBRARY DESTINATION "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common"
+      RUNTIME DESTINATION "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common"
+      ARCHIVE DESTINATION "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common"
+    )
+    ## install to system dir (copy file if greater)
+    if(WIN32)
+      get_target_property(tmp_var "tdclcppmr" LOCATION)
+      get_filename_component(tmp_var "${tmp_var}" NAME)
+      file(TO_CMAKE_PATH "${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common/${tmp_var}" tmp_var)
+      bz_smart_install(SOURCES "${tmp_var}" TO_WIN_SYSTEMDIR)
     else()
-      install(TARGETS ${this_target} LIBRARY DESTINATION "${prefix}")
+      if("${prefix}" STREQUAL "")
+        install(TARGETS tdclcppmr LIBRARY DESTINATION /usr/lib)
+      else()
+        install(TARGETS tdclcppmr LIBRARY DESTINATION "${prefix}")
+      endif()
     endif()
   endif()
 endmacro()

data/index_ja.html

@@ -0,0 +1,15 @@
+<html>
+<head>
+    <title>Redirect to Transactd SDK Document (JA)</title>
+    <meta http-equiv="REFRESH" content="0;url=http://www.bizstation.jp/ja/transactd/client/sdk/doc/index.html">
+</head>
+<body>
+
+<p class="h1">
+Redirect to Transactd SDK Document ...
+</p>
+<p>
+    Redirecting to <a href="http://www.bizstation.jp/ja/transactd/client/sdk/doc/index.html">Transactd SDK Document (JA)</a>
+</p>
+</body>
+</html>

data/source/bzs/db/IBlobBuffer.h

@@ -14,17 +14,14 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 #include <boost/asio/buffer.hpp>
 #include <vector>
 #include "blobStructs.h"
 
-
-
-
 namespace bzs
 {
 namespace db
@@ -34,18 +31,19 @@ class IblobBuffer
 {
 
 public:
-	virtual ~IblobBuffer(){};
-	virtual void clear()=0;
-	virtual void addBlob(unsigned int bloblen, unsigned short fieldNum, const unsigned char* dataPtr)=0;
-	virtual void setFieldCount(unsigned int v)=0;
-	virtual unsigned int fieldCount()=0;
-	virtual unsigned int makeMultiBuffer(std::vector<boost::asio::const_buffer>& mbuffer)=0;
-	virtual unsigned int writeBuffer(unsigned char* buffer, unsigned int maxsize, int& stat)=0;
-	
-
+    virtual ~IblobBuffer(){};
+    virtual void clear() = 0;
+    virtual void addBlob(unsigned int bloblen, unsigned short fieldNum,
+                         const unsigned char* dataPtr) = 0;
+    virtual void setFieldCount(unsigned int v) = 0;
+    virtual unsigned int fieldCount() = 0;
+    virtual unsigned int
+    makeMultiBuffer(std::vector<boost::asio::const_buffer>& mbuffer) = 0;
+    virtual unsigned int writeBuffer(unsigned char* buffer,
+                                     unsigned int maxsize, short& stat) = 0;
 };
 
-}//namespace db
-}//namespace bzs
+} // namespace db
+} // namespace bzs
 
-#endif //BZS_DB_IBLOBBUFFER_H
+#endif // BZS_DB_IBLOBBUFFER_H

data/source/bzs/db/blobBuffer.h

@@ -14,8 +14,8 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 #include <boost/noncopyable.hpp>
@@ -23,155 +23,201 @@
 #include <assert.h>
 #include <boost/shared_array.hpp>
 
-#define FILE_MAP_SIZE 3145728-1024//3M
+extern unsigned int g_pipeCommSharememSize;
+#define FILE_MAP_SIZE (g_pipeCommSharememSize - 1024)
 
 namespace bzs
 {
 namespace db
 {
 
-
-static const char nullbyte[2] = {0x00};
+static const char nullbyte[2] = { 0x00 };
 
 /** holds blob ptr and make boost multiplebuffer
  */
 class blobBuffer : public IblobBuffer, private boost::noncopyable
 {
-	std::vector<blob> m_blobs;
-	blobHeader m_bh;
-	std::vector<boost::shared_array<unsigned char> > m_strings;
+    std::vector<blob> m_blobs;
+    blobHeader m_bh;
+    std::vector<unsigned char> m_data;
+    unsigned int m_datasize;
+    unsigned int m_blobCount;
+
 public:
-	blobBuffer(){m_bh.fieldCount = 0;}
-	const blobHeader* getHeader()const {return &m_bh;};
-
-	void clear()
-	{
-		m_blobs.clear();
-		m_bh.fieldCount = 0;
-		m_bh.rows=0;
-		m_strings.clear();
-	}
-
-	size_t blobs(){return m_blobs.size();};
-	/**
-	 *   @param dataPtr blob data body pointer in result record image.
-	 */
-	void addBlob(unsigned int bloblen, unsigned short fieldNum, const unsigned char* dataPtr)
-	{
-		unsigned char* p = new unsigned char[bloblen];
-		m_strings.push_back(boost::shared_array<unsigned char>(p));
-		memcpy(p, dataPtr, bloblen);
-		m_blobs.push_back(blob(bloblen, fieldNum, p));
-						
-	}
-
-	void addBlob(const blob& b)
-	{
-		m_blobs.push_back(b);
-	}
-
-	void setFieldCount(unsigned int v){m_bh.fieldCount=v;};
-	unsigned int fieldCount(){return m_bh.fieldCount;}
-	
-
-	/** Make boost::asio::multibuffer<const_buffer> from added blob.
-	 *  and write offset to record image of blob fields.
-	 *  @image pointer of normal result image.
-	 *  @size bytes of normal result image length.
-	 *  @return 
-	 *  result buffer image
-	 *  ---------------------------
-	 *  n               record image
-	 *  2				fieldNum
-	 *	4				dataLength
-	 *  n(dataLength)	data 
-	 *  2				null terminate
-	 *  2				fieldNum ...
-	 *  ----------------------------
-	 */
-	
-	unsigned int  makeMultiBuffer(std::vector<boost::asio::const_buffer>& mbuffer)
-	{
-		unsigned int size = 0;
-		if (m_bh.fieldCount)
-		{
-			//write buffer header
-			m_bh.rows = (unsigned short)(m_blobs.size()/m_bh.fieldCount);
-			mbuffer.push_back(boost::asio::buffer((char*)&m_bh, sizeof(blobHeader)));
-			size += sizeof(blobHeader);
-
-			for (size_t i=0;i<m_blobs.size();i++)
-			{
-				const blob& b = m_blobs[i];
-				//add field desc
-				mbuffer.push_back(boost::asio::buffer((char*)&b.bf, sizeof(blobField)));
-				size += sizeof(blobField);
-
-				//add field body
-				mbuffer.push_back(boost::asio::buffer(b.ptr, b.bf.size));
-
-				//add null terminate 
-				mbuffer.push_back(boost::asio::buffer(nullbyte, 2));
-
-				//update record image pointer to offset from record start
-				size += b.bf.size + 2;
-			}
-		}
-		return size;
-	}
-
-	/** Copy to single buffer.
-	 *  this is use for pipe server only.
-	 *  @param stat [out] return additional status. ex. STATUS_BUFFERTOOSMALL
-	 *  @return length of written by this function. 
-	 *  result buffer image
-	 *  ---------------------------
-	 *  n               record image
-	 *  2				fieldNum
-	 *	4				dataLength
-	 *  n(dataLength)	data 
-	 *  2				null terminate
-	 *  2				fieldNum ...
-	 *  ----------------------------
-	 */
-	unsigned int writeBuffer(unsigned char* buffer, unsigned int maxsize, int& stat)
-	{
-		stat = 0;
-		unsigned char* p = buffer;// + offset ;
-		if (m_bh.fieldCount)
-		{
-			//write buffer header
-			m_bh.rows = (unsigned short)(m_blobs.size()/m_bh.fieldCount);
-			memcpy(p, &m_bh, sizeof(blobHeader));
-			p += sizeof(blobHeader);
-
-			for (size_t i=0;i<m_blobs.size();i++)
-			{
-				const blob& b = m_blobs[i];
-				if (maxsize > (p - buffer) + b.bf.size + 2)
-				{
-					//write field desc
-					memcpy(p, &b.bf, sizeof(blobField));
-					p += sizeof(blobField);
-					//write field body
-					memcpy(p, b.ptr, b.bf.size);
-					
-					//write null terminate
-					p += b.bf.size;
-					memcpy(p, nullbyte, 2);
-					p += 2;
-				}else
-				{
-					stat = STATUS_BUFFERTOOSMALL;
-					break;
-				}
-			}
-		}
-		return(unsigned int)(p - buffer);
-	}
+    blobBuffer() { m_bh.fieldCount = 0; }
+    const blobHeader* getHeader() const { return &m_bh; };
+
+    void clear()
+    {
+        m_blobs.clear();
+        m_bh.fieldCount = 0;
+        m_bh.rows = 0;
+        m_data.clear();
+        m_datasize = 0;
+        m_blobCount = 0;
+    }
+
+    size_t blobs() { return m_blobCount; };
+    /**
+     *   @param dataPtr blob data body pointer in result record image.
+     */
+    void addBlob(unsigned int bloblen, unsigned short fieldNum,
+                 const unsigned char* dataPtr)
+    {
+        if (m_data.size() < m_datasize + bloblen + sizeof(blobField) + 2)
+            m_data.resize(m_datasize + bloblen + 1024);
+
+        unsigned char* p = &m_data[m_datasize];
+
+        blob b(bloblen, fieldNum, p + sizeof(blobField));
+        // m_blobs.push_back(b);
+
+        // write field desc
+        memcpy(p, &b.bf, sizeof(blobField));
+        p += sizeof(blobField);
+
+        // write field body
+        memcpy(p, dataPtr, b.bf.size);
+
+        // write null terminate
+        p += b.bf.size;
+        memcpy(p, nullbyte, 2);
+        p += 2;
+        m_datasize = (unsigned int)(p - &m_data[0]);
+        ++m_blobCount;
+    }
+
+    void addBlob(const blob& b)
+    {
+        m_blobs.push_back(b);
+        ++m_blobCount;
+    }
+
+    void setFieldCount(unsigned int v) { m_bh.fieldCount = v; };
+    unsigned int fieldCount() { return m_bh.fieldCount; }
+
+    /** Make boost::asio::multibuffer<const_buffer> from added blob.
+     *  and write offset to record image of blob fields.
+     *  @image pointer of normal result image.
+     *  @size bytes of normal result image length.
+     *  @return
+     *  result buffer image
+     *  ---------------------------
+     *  n               record image
+     *  2				fieldNum
+     *	4				dataLength
+     *  n(dataLength)	data
+     *  2				null terminate
+     *  2				fieldNum ...
+     *  ----------------------------
+     */
+
+    unsigned int
+    makeMultiBuffer(std::vector<boost::asio::const_buffer>& mbuffer)
+    {
+        unsigned int size = 0;
+        if (m_bh.fieldCount)
+        {
+            // write buffer header
+            m_bh.rows = (unsigned short)(m_blobCount / m_bh.fieldCount);
+            mbuffer.push_back(
+                boost::asio::buffer((char*)&m_bh, sizeof(blobHeader)));
+            size += sizeof(blobHeader);
+            if (m_blobs.size() == 0)
+            {
+                mbuffer.push_back(
+                    boost::asio::buffer((char*)&m_data[0], m_datasize));
+                size += m_datasize;
+            }
+            else
+            {
+                for (size_t i = 0; i < m_blobs.size(); i++)
+                {
+                    const blob& b = m_blobs[i];
+                    // add field desc
+                    mbuffer.push_back(
+                        boost::asio::buffer((char*)&b.bf, sizeof(blobField)));
+                    size += sizeof(blobField);
+
+                    // add field body
+                    mbuffer.push_back(boost::asio::buffer(b.ptr, b.bf.size));
+
+                    // add null terminate
+                    mbuffer.push_back(boost::asio::buffer(nullbyte, 2));
+
+                    // update record image pointer to offset from record start
+                    size += b.bf.size + 2;
+                }
+            }
+        }
+        return size;
+    }
+
+    /** Copy to single buffer.
+     *  this is use for pipe server only.
+     *  @param stat [out] return additional status. ex. STATUS_BUFFERTOOSMALL
+     *  @return length of written by this function.
+     *  result buffer image
+     *  ---------------------------
+     *  n               record image
+     *  2				fieldNum
+     *	4				dataLength
+     *  n(dataLength)	data
+     *  2				null terminate
+     *  2				fieldNum ...
+     *  ----------------------------
+     */
+    unsigned int writeBuffer(unsigned char* buffer, unsigned int maxsize,
+                             short& stat)
+    {
+        stat = 0;
+        unsigned char* p = buffer;
+        if (m_bh.fieldCount)
+        {
+            // write buffer header
+            m_bh.rows = (unsigned short)(m_blobCount / m_bh.fieldCount);
+            memcpy(p, &m_bh, sizeof(blobHeader));
+            p += sizeof(blobHeader);
+            if (m_blobs.size() == 0)
+            {
+                if (maxsize - (p - buffer) < m_datasize)
+                    stat = STATUS_BUFFERTOOSMALL;
+                else
+                {
+                    memcpy(p, &m_data[0], m_datasize);
+                    p += m_datasize;
+                }
+            }
+            else
+            {
+                for (size_t i = 0; i < m_blobs.size(); i++)
+                {
+                    const blob& b = m_blobs[i];
+                    if (maxsize > (p - buffer) + b.bf.size + 2)
+                    {
+                        // write field desc
+                        memcpy(p, &b.bf, sizeof(blobField));
+                        p += sizeof(blobField);
+                        // write field body
+                        memcpy(p, b.ptr, b.bf.size);
+
+                        // write null terminate
+                        p += b.bf.size;
+                        memcpy(p, nullbyte, 2);
+                        p += 2;
+                    }
+                    else
+                    {
+                        stat = STATUS_BUFFERTOOSMALL;
+                        break;
+                    }
+                }
+            }
+        }
+        return (unsigned int)(p - buffer);
+    }
 };
 
-}//namespace db
-}//namespace bzs
-#endif //BZS_DB_BLOBBUFFER_H
-
+} // namespace db
+} // namespace bzs
+#endif // BZS_DB_BLOBBUFFER_H