transactd 1.2.0 → 2.0.0

data/source/bzs/netsvc/server/serverTpool.h

@@ -1,3 +1,5 @@
+#ifndef BZS_NETSVC_SERVER_TPOOLSERVER_H
+#define BZS_NETSVC_SERVER_TPOOLSERVER_H
 /*=================================================================
    Copyright (C) 2012 2013 BizStation Corp All rights reserved.
 
@@ -12,13 +14,10 @@
    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.
 =================================================================*/
-#ifndef BZS_NETSVC_SERVER_TPOOLSERVER_H
-#define BZS_NETSVC_SERVER_TPOOLSERVER_H
-
 #include "iserver.h"
 #include <string>
 #include <vector>
@@ -26,59 +25,55 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/asio.hpp>
 
-
-
 #define SERVER_SYNC_THREAD_PER_IOS
 
-namespace boost{class condition_variable;}
-namespace bzs 
+namespace boost
+{
+class condition_variable;
+}
+namespace bzs
 {
-namespace netsvc 
+namespace netsvc
 {
-namespace server 
+namespace server
 {
 class IAppModuleBuilder;
 
-
 namespace tpool
 {
 extern unsigned int g_connections;
 
-
 class connection;
 class listener;
-class server: public iserver, private boost::noncopyable
+class server : public iserver, private boost::noncopyable
 {
-	
-	std::vector<boost::shared_ptr<listener> > m_listeners;
-	bool m_stopping;
-	
-	boost::asio::io_service m_ios;
-	boost::asio::deadline_timer m_timer;
-	const char* m_hostCheckName;
-	void startTimer();
-	void doClose();
-	void onCheckInternlShutdown(const boost::system::error_code& e);
-	void run();
+    std::vector<boost::shared_ptr<listener> > m_listeners;
+    boost::asio::io_service m_ios;
+    boost::asio::deadline_timer m_timer;
+    const char* m_hostCheckName;
+    bool m_stopping;
+    void startTimer();
+    void doClose();
+    void onCheckInternlShutdown(const boost::system::error_code& e);
+    void run();
+
 public:
-	explicit server(unsigned int thread_pool_size, const char* hostCheckName);
-	~server();
-	void start();
-	void stop();
-	static unsigned int m_threadPoolSize;
-	void registerErrorHandler(inotifyHandler* eh){erh = eh;}; 
-	void addApplication(boost::shared_ptr<IAppModuleBuilder> app
-				, const std::string& address, const std::string& port);
-	boost::asio::io_service& ios(){return m_ios;}
-	const char* hostCheckName(){return m_hostCheckName;};
-	static inotifyHandler* erh;
-	
+    explicit server(unsigned int thread_pool_size, const char* hostCheckName);
+    ~server();
+    void start();
+    void stop();
+    static unsigned int m_threadPoolSize;
+    void registerErrorHandler(inotifyHandler* eh) { erh = eh; };
+    void addApplication(boost::shared_ptr<IAppModuleBuilder> app,
+                        const std::string& address, const std::string& port);
+    boost::asio::io_service& ios() { return m_ios; }
+    const char* hostCheckName() { return m_hostCheckName; };
+    static inotifyHandler* erh;
 };
 
-}//namesapce tpool
-}//namespace sever
-}//namespace netsvc
-}//namespace bzs
-
-#endif //BZS_NETSVC_SERVER_TPOOLSERVER_H
+} // namesapce tpool
+} // namespace sever
+} // namespace netsvc
+} // namespace bzs
 
+#endif // BZS_NETSVC_SERVER_TPOOLSERVER_H

data/source/bzs/rtl/benchmark.cpp

@@ -12,8 +12,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.
 =================================================================*/
 
@@ -25,6 +25,14 @@
 #define BOOST_ERROR_CODE_HEADER_ONLY
 #define BOOST_CHRONO_INLINED
 
+#ifdef __BCPLUSPLUS__
+#define BZS_LINK_BOOST_SYSTEM
+#ifdef _WIN64
+#define BZS_LINK_BOOST_TIMER
+#define BZS_LINK_BOOST_CHRONO
+#endif
+#include <bzs/env/boost_bcb_link.h>
+#endif
 
 #pragma package(smart_init)
 
@@ -35,29 +43,52 @@ namespace rtl
 
 boost_timer benchmark::t;
 #ifdef BOOST_HIGH_RESOL_TIMER_ENABLE
-boost_timer::time_point  benchmark::m_start;
+boost_timer::time_point benchmark::m_start;
 #endif
 void benchmark::showTimeSec(bool result, const char* name)
 {
     if (result == true)
-	{
-        #ifdef BOOST_CPUTIMER_ENABLE
-		boost::timer::cpu_times elapsed = t.elapsed();
-		printf("%d msec %s\n", (int)(elapsed.wall/1000000), name);
+    {
+#ifdef BOOST_CPUTIMER_ENABLE
+        boost::timer::cpu_times elapsed = t.elapsed();
+        printf("%d msec %s\n", (int)(elapsed.wall / 1000000), name);
         printf("%s\r\n", boost::timer::format(elapsed).c_str());
-        #else
-		#ifdef BOOST_HIGH_RESOL_TIMER_ENABLE
-			boost_timer::time_point p = boost_timer::now();
-			boost::chrono::nanoseconds ns  = p - m_start;
-			printf("%d msec %s\n", (int)(ns.count()/1000000) , name);
-		#else
-			printf("%d msec %s\n", (int)(benchmark::t.elapsed()*1000), name);
-		#endif
-		#endif
-	}
-	else
+#else
+#ifdef BOOST_HIGH_RESOL_TIMER_ENABLE
+        boost_timer::time_point p = boost_timer::now();
+        boost::chrono::nanoseconds ns = p - m_start;
+        printf("%d msec %s\n", (int)(ns.count() / 1000000), name);
+#else
+        printf("%d msec %s\n", (int)(benchmark::t.elapsed() * 1000), name);
+#endif
+#endif
+    }
+    else
         printf("Erorr %s\n", name);
 }
+
+int benchmark::stop()
+{
+#ifdef BOOST_CPUTIMER_ENABLE
+    boost::timer::cpu_times elapsed = t.elapsed();
+    return (int)(elapsed.wall / 1000000);
+#else
+#ifdef BOOST_HIGH_RESOL_TIMER_ENABLE
+    boost_timer::time_point p = boost_timer::now();
+    boost::chrono::nanoseconds ns = p - m_start;
+                        return (int)(ns.count()/1000000;
+#else
+    return (int)(t.elapsed() * 1000);
+#endif
+#endif
+}
+
+void benchmark::showTimes(int result, const char* name)
+{
+    printf("------------------------------\n");
+    printf("%s%.4f(sec)\n", name, ((double)result) / 1000);
+}
+
 bool benchmark::report(boost::function<bool()> func, const char* name)
 {
     start();
@@ -69,28 +100,57 @@ bool benchmark::report(boost::function<bool()> func, const char* name)
 
 void benchmark::report2(boost::function<void()> func, const char* name)
 {
-  
+
     start();
     func();
     showTimeSec(1, name);
-
 }
 
 void benchmark::start()
 {
-   
-    #ifdef BOOST_CPUTIMER_ENABLE
+
+#ifdef BOOST_CPUTIMER_ENABLE
     t.stop();
     t.start();
-    #else
-		#ifdef BOOST_HIGH_RESOL_TIMER_ENABLE
-		m_start = boost_timer::now();
-		#else
-		t.restart();
-		#endif
-    #endif
+#else
+#ifdef BOOST_HIGH_RESOL_TIMER_ENABLE
+    m_start = boost_timer::now();
+#else
+    t.restart();
+#endif
+#endif
 }
 
+void benchmarkMt::start()
+{
+
+#ifdef BOOST_CPUTIMER_ENABLE
+    t.stop();
+    t.start();
+#else
+#ifdef BOOST_HIGH_RESOL_TIMER_ENABLE
+    m_start = boost_timer::now();
+#else
+    t.restart();
+#endif
+#endif
+}
+
+int benchmarkMt::end()
+{
+#ifdef BOOST_CPUTIMER_ENABLE
+    boost::timer::cpu_times elapsed = t.elapsed();
+    return (int)(elapsed.wall / 1000);
+#else
+#ifdef BOOST_HIGH_RESOL_TIMER_ENABLE
+    boost_timer::time_point p = boost_timer::now();
+    boost::chrono::nanoseconds ns = p - m_start;
+                        return (int)(ns.count()/1000;
+#else
+    return (int)(t.elapsed() * 1000000);
+#endif
+#endif
+}
 
-}//namespace rtl
-}//namespace bzs
+} // namespace rtl
+} // namespace bzs

data/source/bzs/rtl/benchmark.h

@@ -1,5 +1,5 @@
-#ifndef benchmarkH
-#define benchmarkH
+#ifndef BZS_RTL_BOOKMARK_H
+#define BZS_RTL_BOOKMARK_H
 /*=================================================================
    Copyright (C) 2013 BizStation Corp All rights reserved.
 
@@ -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/function.hpp>
@@ -24,20 +24,60 @@
 //#define BOOST_HIGH_RESOL_TIMER_ENABLE
 
 #if BOOST_VERSION > 104801
-	
-	#ifdef BOOST_HIGH_RESOL_TIMER_ENABLE
-		#include <boost/chrono/system_clocks.hpp>
-		#include <boost/chrono.hpp>
-		typedef boost::chrono::high_resolution_clock boost_timer;
-	#else
-		#define BOOST_CPUTIMER_ENABLE
-		#include <boost/timer/timer.hpp>
-		typedef boost::timer::cpu_timer boost_timer;
-	#endif
 
+#ifdef BOOST_HIGH_RESOL_TIMER_ENABLE
+#include <boost/chrono/system_clocks.hpp>
+#include <boost/chrono.hpp>
+typedef boost::chrono::high_resolution_clock boost_timer;
 #else
-    #include <boost/timer.hpp>
-    typedef boost::timer boost_timer;
+#define BOOST_CPUTIMER_ENABLE
+#include <boost/timer/timer.hpp>
+typedef boost::timer::cpu_timer boost_timer;
+#endif
+
+#else
+#ifdef __APPLE__
+#include <mach/mach_time.h>
+#include <limits>
+namespace boost
+{
+#define NANOSEC 1000000000
+class timer
+{
+public:
+    timer()
+    {
+        mach_timebase_info(&_base);
+        _start_time = mach_absolute_time();
+    }
+    void restart() { _start_time = mach_absolute_time(); }
+    double elapsed() const
+    {
+        uint64_t e = mach_absolute_time() - _start_time;
+        int unit = _base.numer / _base.denom;
+        return double(e * unit) / NANOSEC; // seconds
+    }
+    double elapsed_max() const
+    {
+        return (double((std::numeric_limits<std::clock_t>::max)()) -
+                double(_start_time)) /
+               (double(_base.denom / _base.numer) / NANOSEC);
+    }
+
+    double elapsed_min() const
+    {
+        return double(1) / double(double(_base.denom / _base.numer) / NANOSEC);
+    }
+
+private:
+    uint64_t _start_time;
+    mach_timebase_info_data_t _base;
+}; // timer
+}
+#else
+#include <boost/timer.hpp>
+#endif
+typedef boost::timer boost_timer;
 
 #endif
 
@@ -49,17 +89,31 @@ namespace rtl
 class benchmark
 {
     static boost_timer t;
-	#ifdef BOOST_HIGH_RESOL_TIMER_ENABLE
-	static boost_timer::time_point  m_start;
-	#endif
+#ifdef BOOST_HIGH_RESOL_TIMER_ENABLE
+    static boost_timer::time_point m_start;
+#endif
 public:
     static bool report(boost::function<bool()> func, const char* name);
     static void report2(boost::function<void()> func, const char* name);
     static void start();
+    static int stop();
+    static void showTimes(int result, const char* name);
     static void showTimeSec(bool result, const char* name);
-
 };
 
-}//namespace rtl
-}//namespace bzs
+// Multi thread version. Self measurement.
+class benchmarkMt
+{
+    boost_timer t;
+#ifdef BOOST_HIGH_RESOL_TIMER_ENABLE
+    boost_timer::time_point m_start;
 #endif
+
+public:
+    void start();
+    int end();
+};
+
+} // namespace rtl
+} // namespace bzs
+#endif // BZS_RTL_BOOKMARK_H