add very simple (but already exposing many problems) wxIPC benchmark

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/ipc/baseserver.cpp b/samples/ipc/baseserver.cpp
index 1fa7e189e17c52563ed06dbe08a81904672bf17f..80581e576082ede9aa3daa563ccb194cc635f04b 100644 (file)
--- a/samples/ipc/baseserver.cpp
+++ b/samples/ipc/baseserver.cpp
@@ -39,19 +39,33 @@
 #include "wx/datetime.h"
 
 // ----------------------------------------------------------------------------
-// wxWin macros
+// local classes
 // ----------------------------------------------------------------------------
 
+// a simple connection class testing and logging various operations
 class MyConnection : public MyConnectionBase, public wxTimer
 {
 public:
     virtual bool Disconnect() { return wxConnection::Disconnect(); }
-    virtual bool OnExecute(const wxString& topic, const void *data, size_t size, wxIPCFormat format);
-    virtual const void *OnRequest(const wxString& topic, const wxString& item, size_t *size, wxIPCFormat format);
-    virtual bool OnPoke(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format);
+    virtual bool OnExecute(const wxString& topic,
+                           const void *data,
+                           size_t size,
+                           wxIPCFormat format);
+    virtual const void *OnRequest(const wxString& topic,
+                                  const wxString& item,
+                                  size_t *size,
+                                  wxIPCFormat format);
+    virtual bool OnPoke(const wxString& topic,
+                        const wxString& item,
+                        const void *data,
+                        size_t size,
+                        wxIPCFormat format);
     virtual bool OnStartAdvise(const wxString& topic, const wxString& item);
     virtual bool OnStopAdvise(const wxString& topic, const wxString& item);
-    virtual bool DoAdvise(const wxString& item, const void *data, size_t size, wxIPCFormat format);
+    virtual bool DoAdvise(const wxString& item,
+                          const void *data,
+                          size_t size,
+                          wxIPCFormat format);
     virtual bool OnDisconnect();
     virtual void Notify();
 
@@ -62,6 +76,38 @@ private:
     char            m_achRequestBytes[3];
 };
 
+// a connection used for benchmarking some IPC operations by
+// tests/benchmarks/ipcclient.cpp
+class BenchConnection : public wxConnection
+{
+public:
+    BenchConnection() { m_advise = false; }
+
+    virtual bool OnPoke(const wxString& topic,
+                        const wxString& item,
+                        const void *data,
+                        size_t size,
+                        wxIPCFormat format);
+    virtual bool OnStartAdvise(const wxString& topic, const wxString& item);
+    virtual bool OnStopAdvise(const wxString& topic, const wxString& item);
+
+private:
+    // return true if this is the supported topic+item combination, log an
+    // error message otherwise
+    bool IsSupportedTopicAndItem(const wxString& operation,
+                                 const wxString& topic,
+                                 const wxString& item) const;
+
+    // the item which can be manipulated by the client via Poke() calls
+    wxString m_item;
+
+    // should we notify the client about changes to m_item?
+    bool m_advise;
+
+    DECLARE_NO_COPY_CLASS(BenchConnection)
+};
+
+// a simple server accepting connections to IPC_TOPIC and IPC_BENCHMARK_TOPIC
 class MyServer : public wxServer
 {
 public:
@@ -140,22 +186,29 @@ MyServer::~MyServer()
 
 wxConnectionBase *MyServer::OnAcceptConnection(const wxString& topic)
 {
-    wxLogMessage("OnAcceptConnection(\"%s\")", topic.c_str());
+    wxLogMessage("OnAcceptConnection(\"%s\")", topic);
 
     if ( topic == IPC_TOPIC )
     {
         m_connection = new MyConnection;
-        wxLogMessage("Connection accepted");
-        return m_connection;
+    }
+    else if ( topic == IPC_BENCHMARK_TOPIC )
+    {
+        m_connection = new BenchConnection;
+    }
+    else // unknown topic
+    {
+        wxLogMessage("Unknown topic");
+        return NULL;
     }
 
-    // unknown topic
-    return NULL;
+    wxLogMessage("Connection accepted");
+    return m_connection;
 }
 
 void MyServer::Disconnect()
 {
-    if (m_connection)
+    if ( m_connection )
     {
         m_connection->Disconnect();
         delete m_connection;
@@ -204,14 +257,17 @@ MyConnection::OnRequest(const wxString& topic,
     }
     else if (item == "Date+len")
     {
-        m_sRequestDate = wxDateTime::Now().FormatTime() + " " + wxDateTime::Now().FormatDate();
+        m_sRequestDate = wxDateTime::Now().FormatTime() +
+                            " " + wxDateTime::Now().FormatDate();
         data = m_sRequestDate.c_str();
         *size = m_sRequestDate.Length() + 1;
     }
     else if (item == "bytes[3]")
     {
         data = m_achRequestBytes;
-        m_achRequestBytes[0] = '1'; m_achRequestBytes[1] = '2'; m_achRequestBytes[2] = '3';
+        m_achRequestBytes[0] = '1';
+        m_achRequestBytes[1] = '2';
+        m_achRequestBytes[2] = '3';
         *size = 3;
     }
     else
@@ -225,7 +281,7 @@ MyConnection::OnRequest(const wxString& topic,
 
 bool MyConnection::OnStartAdvise(const wxString& topic, const wxString& item)
 {
-    wxLogMessage("OnStartAdvise(\"%s\",\"%s\")", topic.c_str(), item.c_str());
+    wxLogMessage("OnStartAdvise(\"%s\",\"%s\")", topic, item);
     wxLogMessage("Returning true");
     m_sAdvise = item;
     Start(3000); // schedule our Notify() to be called in 3 seconds
@@ -234,7 +290,7 @@ bool MyConnection::OnStartAdvise(const wxString& topic, const wxString& item)
 
 bool MyConnection::OnStopAdvise(const wxString& topic, const wxString& item)
 {
-    wxLogMessage("OnStopAdvise(\"%s\",\"%s\")", topic.c_str(), item.c_str());
+    wxLogMessage("OnStopAdvise(\"%s\",\"%s\")", topic, item);
     wxLogMessage("Returning true");
     m_sAdvise.clear();
     Stop();
@@ -247,7 +303,8 @@ void MyConnection::Notify()
     {
         wxString s = wxDateTime::Now().Format();
         Advise(m_sAdvise, s);
-        s = wxDateTime::Now().FormatTime() + " " + wxDateTime::Now().FormatDate();
+        s = wxDateTime::Now().FormatTime() + " "
+                + wxDateTime::Now().FormatDate();
         Advise(m_sAdvise, s.mb_str(), s.length() + 1);
 
 #if wxUSE_DDE_FOR_IPC
@@ -265,7 +322,10 @@ void MyConnection::Notify()
     }
 }
 
-bool MyConnection::DoAdvise(const wxString& item, const void *data, size_t size, wxIPCFormat format)
+bool MyConnection::DoAdvise(const wxString& item,
+                            const void *data,
+                            size_t size,
+                            wxIPCFormat format)
 {
     Log("Advise", "", item, data, size, format);
     return wxConnection::DoAdvise(item, data, size, format);
@@ -276,3 +336,69 @@ bool MyConnection::OnDisconnect()
     wxLogMessage("OnDisconnect()");
     return true;
 }
+
+// ----------------------------------------------------------------------------
+// BenchConnection
+// ----------------------------------------------------------------------------
+
+bool BenchConnection::IsSupportedTopicAndItem(const wxString& operation,
+                                              const wxString& topic,
+                                              const wxString& item) const
+{
+    if ( topic != IPC_BENCHMARK_TOPIC ||
+            item != IPC_BENCHMARK_ITEM )
+    {
+        wxLogMessage("Unexpected %s(\"%s\", \"%s\") call.",
+                     operation, topic, item);
+        return false;
+    }
+
+    return true;
+}
+
+bool BenchConnection::OnPoke(const wxString& topic,
+                             const wxString& item,
+                             const void *data,
+                             size_t size,
+                             wxIPCFormat format)
+{
+    if ( !IsSupportedTopicAndItem("OnPoke", topic, item) )
+        return false;
+
+    if ( !IsTextFormat(format) )
+    {
+        wxLogMessage("Unexpected format %d in OnPoke().", format);
+        return false;
+    }
+
+    m_item = GetTextFromData(data, size, format);
+
+    if ( m_advise )
+    {
+        if ( !Advise(item, m_item) )
+            wxLogMessage("Failed to advise client about the change.");
+    }
+
+    return true;
+}
+
+bool BenchConnection::OnStartAdvise(const wxString& topic, const wxString& item)
+{
+    if ( !IsSupportedTopicAndItem("OnStartAdvise", topic, item) )
+        return false;
+
+    m_advise = true;
+
+    return true;
+}
+
+bool BenchConnection::OnStopAdvise(const wxString& topic, const wxString& item)
+{
+    if ( !IsSupportedTopicAndItem("OnStopAdvise", topic, item) )
+        return false;
+
+    m_advise = false;
+
+    return true;
+}
+

diff --git a/samples/ipc/ipcsetup.h b/samples/ipc/ipcsetup.h
index bfd44e56f1ab1ea0cfda80108fb8a89c62b94ac5..1dbffab7bfadfbe613888d70dc498fe164fd2518 100644 (file)
--- a/samples/ipc/ipcsetup.h
+++ b/samples/ipc/ipcsetup.h
@@ -15,14 +15,19 @@
 #include "wx/ipc.h"
 
 // the default service name
-#define IPC_SERVICE _T("4242")
+#define IPC_SERVICE "4242"
 //#define IPC_SERVICE _T("/tmp/wxsrv424")
 
 // the hostname
-#define IPC_HOST _T("localhost")
+#define IPC_HOST "localhost"
 
 // the IPC topic
-#define IPC_TOPIC _T("IPC TEST")
+#define IPC_TOPIC "IPC TEST"
 
 // the name of the item we're being advised about
-#define IPC_ADVISE_NAME _T("Item")
+#define IPC_ADVISE_NAME "Item"
+
+
+// the values used by tests/benchmarks/ipcclient.cpp
+#define IPC_BENCHMARK_TOPIC "wxIPC BENCH"
+#define IPC_BENCHMARK_ITEM "Benchmark"

diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in
index 8a4d8ab82b593d61f197439a8fb48b08aed6a291..98b51ded8b9d42cc68c0029cd9b7c637e2feb20f 100644 (file)
--- a/tests/benchmarks/Makefile.in
+++ b/tests/benchmarks/Makefile.in
@@ -46,6 +46,7 @@ BENCH_OBJECTS =  \
        bench_bench.o \
        bench_htmlpars.o \
        bench_htmltag.o \
+       bench_ipcclient.o \
        bench_strings.o \
        bench_tls.o
 
@@ -73,6 +74,9 @@ BENCH_OBJECTS =  \
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
        -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_0___WXLIB_NET_p = \
+       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p)
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -103,7 +107,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 bench$(EXEEXT): $(BENCH_OBJECTS)
-       $(CXX) -o $@ $(BENCH_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+       $(CXX) -o $@ $(BENCH_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_NET_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
        
        $(__bench___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
@@ -129,6 +133,9 @@ bench_htmlpars.o: $(srcdir)/htmlparser/htmlpars.cpp
 bench_htmltag.o: $(srcdir)/htmlparser/htmltag.cpp
        $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/htmlparser/htmltag.cpp
 
+bench_ipcclient.o: $(srcdir)/ipcclient.cpp
+       $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/ipcclient.cpp
+
 bench_strings.o: $(srcdir)/strings.cpp
        $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/strings.cpp
 

diff --git a/tests/benchmarks/bench.bkl b/tests/benchmarks/bench.bkl
index f69564c8394595f48d0efe3e7db5f145fbc3fcb9..d24d9fb401abeca1b07619fc6f0d7e81487b6288 100644 (file)
--- a/tests/benchmarks/bench.bkl
+++ b/tests/benchmarks/bench.bkl
@@ -13,10 +13,12 @@
             bench.cpp
             htmlparser/htmlpars.cpp
             htmlparser/htmltag.cpp
+            ipcclient.cpp
             strings.cpp
             tls.cpp
         </sources>
         <wx-lib>base</wx-lib>
+        <wx-lib>net</wx-lib>
     </exe>
 
     <wx-data id="data">

diff --git a/tests/benchmarks/bench.dsp b/tests/benchmarks/bench.dsp
index 512864bfe8458167a7d4004edbaef8880f18f5b9..193aa2597eb44ca26d60a13e678e84501bbb25f2 100644 (file)
--- a/tests/benchmarks/bench.dsp
+++ b/tests/benchmarks/bench.dsp
@@ -54,8 +54,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivudll\bench.exe" /debug /pdb:"vc_mswunivudll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console\r
-# ADD LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivudll\bench.exe" /debug /pdb:"vc_mswunivudll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console\r
+# ADD BASE LINK32 wxbase29u.lib wxbase29u_net.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivudll\bench.exe" /debug /pdb:"vc_mswunivudll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console\r
+# ADD LINK32 wxbase29u.lib wxbase29u_net.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivudll\bench.exe" /debug /pdb:"vc_mswunivudll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "bench - Win32 DLL Universal Debug"\r
 \r
@@ -77,8 +77,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\bench.exe" /debug /pdb:"vc_mswunivuddll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console\r
-# ADD LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\bench.exe" /debug /pdb:"vc_mswunivuddll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console\r
+# ADD BASE LINK32 wxbase29ud.lib wxbase29ud_net.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\bench.exe" /debug /pdb:"vc_mswunivuddll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console\r
+# ADD LINK32 wxbase29ud.lib wxbase29ud_net.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\bench.exe" /debug /pdb:"vc_mswunivuddll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "bench - Win32 DLL Release"\r
 \r
@@ -100,8 +100,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswudll\bench.exe" /debug /pdb:"vc_mswudll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console\r
-# ADD LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswudll\bench.exe" /debug /pdb:"vc_mswudll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console\r
+# ADD BASE LINK32 wxbase29u.lib wxbase29u_net.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswudll\bench.exe" /debug /pdb:"vc_mswudll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console\r
+# ADD LINK32 wxbase29u.lib wxbase29u_net.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswudll\bench.exe" /debug /pdb:"vc_mswudll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "bench - Win32 DLL Debug"\r
 \r
@@ -123,8 +123,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswuddll\bench.exe" /debug /pdb:"vc_mswuddll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console\r
-# ADD LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswuddll\bench.exe" /debug /pdb:"vc_mswuddll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console\r
+# ADD BASE LINK32 wxbase29ud.lib wxbase29ud_net.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswuddll\bench.exe" /debug /pdb:"vc_mswuddll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console\r
+# ADD LINK32 wxbase29ud.lib wxbase29ud_net.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswuddll\bench.exe" /debug /pdb:"vc_mswuddll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "bench - Win32 Universal Release"\r
 \r
@@ -146,8 +146,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivu\bench.exe" /debug /pdb:"vc_mswunivu\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console\r
-# ADD LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivu\bench.exe" /debug /pdb:"vc_mswunivu\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console\r
+# ADD BASE LINK32 wxbase29u.lib wxbase29u_net.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivu\bench.exe" /debug /pdb:"vc_mswunivu\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console\r
+# ADD LINK32 wxbase29u.lib wxbase29u_net.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivu\bench.exe" /debug /pdb:"vc_mswunivu\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "bench - Win32 Universal Debug"\r
 \r
@@ -169,8 +169,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivud\bench.exe" /debug /pdb:"vc_mswunivud\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console\r
-# ADD LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivud\bench.exe" /debug /pdb:"vc_mswunivud\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console\r
+# ADD BASE LINK32 wxbase29ud.lib wxbase29ud_net.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivud\bench.exe" /debug /pdb:"vc_mswunivud\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console\r
+# ADD LINK32 wxbase29ud.lib wxbase29ud_net.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivud\bench.exe" /debug /pdb:"vc_mswunivud\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "bench - Win32 Release"\r
 \r
@@ -192,8 +192,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswu\bench.exe" /debug /pdb:"vc_mswu\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console\r
-# ADD LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswu\bench.exe" /debug /pdb:"vc_mswu\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console\r
+# ADD BASE LINK32 wxbase29u.lib wxbase29u_net.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswu\bench.exe" /debug /pdb:"vc_mswu\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console\r
+# ADD LINK32 wxbase29u.lib wxbase29u_net.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswu\bench.exe" /debug /pdb:"vc_mswu\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console\r
 \r
 !ELSEIF  "$(CFG)" == "bench - Win32 Debug"\r
 \r
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswud\bench.exe" /debug /pdb:"vc_mswud\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console\r
-# ADD LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswud\bench.exe" /debug /pdb:"vc_mswud\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console\r
+# ADD BASE LINK32 wxbase29ud.lib wxbase29ud_net.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswud\bench.exe" /debug /pdb:"vc_mswud\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console\r
+# ADD LINK32 wxbase29ud.lib wxbase29ud_net.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswud\bench.exe" /debug /pdb:"vc_mswud\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console\r
 \r
 !ENDIF\r
 \r
@@ -247,6 +247,10 @@ SOURCE=.\htmlparser\htmltag.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\ipcclient.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\strings.cpp\r
 # End Source File\r
 # Begin Source File\r

diff --git a/tests/benchmarks/bench.dsw b/tests/benchmarks/bench.dsw
index 0727c9843184da64f42eee4b471bd79491d37c28..0d7db96fc9381097ef52e6ff25a0f1892f6cc82a 100644 (file)
--- a/tests/benchmarks/bench.dsw
+++ b/tests/benchmarks/bench.dsw
@@ -13,6 +13,9 @@ Package=<4>
 Begin Project Dependency\r
 Project_Dep_Name base\r
 End Project Dependency\r
+Begin Project Dependency\r
+Project_Dep_Name net\r
+End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
@@ -29,3 +32,15 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "net"=..\..\build\msw\wx_net.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r

diff --git a/tests/benchmarks/bench.vcproj b/tests/benchmarks/bench.vcproj
index c382ec270ceeb135186b8035b45747ab72df6774..4abc057ec9d0f95c4c3ab51026cee47fda69a478 100644 (file)
--- a/tests/benchmarks/bench.vcproj
+++ b/tests/benchmarks/bench.vcproj
@@ -44,7 +44,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r
+                               AdditionalDependencies="wxbase29u.lib  wxbase29u_net.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r
                                OutputFile="vc_mswunivudll\bench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
@@ -108,7 +108,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r
+                               AdditionalDependencies="wxbase29ud.lib  wxbase29ud_net.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r
                                OutputFile="vc_mswunivuddll\bench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
@@ -169,7 +169,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r
+                               AdditionalDependencies="wxbase29u.lib  wxbase29u_net.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r
                                OutputFile="vc_mswudll\bench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
@@ -233,7 +233,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r
+                               AdditionalDependencies="wxbase29ud.lib  wxbase29ud_net.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r
                                OutputFile="vc_mswuddll\bench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
@@ -294,7 +294,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r
+                               AdditionalDependencies="wxbase29u.lib  wxbase29u_net.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r
                                OutputFile="vc_mswunivu\bench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
@@ -358,7 +358,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r
+                               AdditionalDependencies="wxbase29ud.lib  wxbase29ud_net.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r
                                OutputFile="vc_mswunivud\bench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
@@ -419,7 +419,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r
+                               AdditionalDependencies="wxbase29u.lib  wxbase29u_net.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r
                                OutputFile="vc_mswu\bench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
@@ -483,7 +483,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r
+                               AdditionalDependencies="wxbase29ud.lib  wxbase29ud_net.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r
                                OutputFile="vc_mswud\bench.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
@@ -534,6 +534,9 @@
                        <File\r
                                RelativePath=".\htmlparser\htmltag.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\ipcclient.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath=".\strings.cpp">\r
                        </File>\r

diff --git a/tests/benchmarks/ipcclient.cpp b/tests/benchmarks/ipcclient.cpp
new file mode 100644 (file)
index 0000000..e0f2bab
--- /dev/null
+++ b/tests/benchmarks/ipcclient.cpp
@@ -0,0 +1,169 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        tests/benchmarks/ipcclient.cpp
+// Purpose:     wxIPC client side benchmarks
+// Author:      Vadim Zeitlin
+// Created:     2008-10-13
+// RCS-ID:      $Id$
+// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#include "bench.h"
+
+#include "wx/evtloop.h"
+
+#include "wx/ipc.h"
+#include "../../samples/ipc/ipcsetup.h"
+
+namespace
+{
+
+class PokeAdviseConn : public wxConnection
+{
+public:
+    PokeAdviseConn() { m_gotAdvised = false; }
+
+    bool GotAdvised()
+    {
+        if ( !m_gotAdvised )
+            return false;
+
+        m_gotAdvised = false;
+
+        return true;
+    }
+
+    const wxString& GetItem() const { return m_item; }
+
+    virtual bool OnAdvise(const wxString& topic,
+                          const wxString& item,
+                          const void *data,
+                          size_t size,
+                          wxIPCFormat format)
+    {
+        m_gotAdvised = true;
+
+        if ( topic != IPC_BENCHMARK_TOPIC ||
+                item != IPC_BENCHMARK_ITEM ||
+                    !IsTextFormat(format) )
+        {
+            m_item = "ERROR";
+            return false;
+        }
+
+        m_item = GetTextFromData(data, size, format);
+
+        return true;
+    }
+
+private:
+    wxString m_item;
+    bool m_gotAdvised;
+
+    DECLARE_NO_COPY_CLASS(PokeAdviseConn)
+};
+
+class PokeAdviseClient : public wxClient
+{
+public:
+    // provide a convenient helper taking care of connecting to the right
+    // server/service/topic and returning the connection of the derived type
+    // (or NULL if we failed to connect)
+    PokeAdviseConn *Connect()
+    {
+        wxString host = Bench::GetStringParameter();
+        if ( host.empty() )
+            host = IPC_HOST;
+
+        wxString service;
+        int port = Bench::GetNumericParameter();
+        if ( !port )
+            service = IPC_SERVICE;
+        else
+            service.Printf("%d", port);
+
+        return static_cast<PokeAdviseConn *>(
+                MakeConnection(host, service, IPC_BENCHMARK_TOPIC));
+    }
+
+
+    // override base class virtual to use a custom connection class
+    virtual wxConnectionBase *OnMakeConnection()
+    {
+        return new PokeAdviseConn;
+    }
+};
+
+class PokeAdvisePersistentConnection
+{
+public:
+    PokeAdvisePersistentConnection()
+    {
+        m_client = new PokeAdviseClient;
+        m_conn = m_client->Connect();
+        if ( m_conn )
+            m_conn->StartAdvise(IPC_BENCHMARK_ITEM);
+    }
+
+    ~PokeAdvisePersistentConnection()
+    {
+        if ( m_conn )
+        {
+            m_conn->StopAdvise(IPC_BENCHMARK_ITEM);
+            m_conn->Disconnect();
+        }
+
+        delete m_client;
+    }
+
+    PokeAdviseConn *Get() const { return m_conn; }
+
+private:
+    PokeAdviseClient *m_client;
+    PokeAdviseConn *m_conn;
+    bool m_initDone;
+
+    DECLARE_NO_COPY_CLASS(PokeAdvisePersistentConnection)
+};
+
+PokeAdvisePersistentConnection *theConnection = NULL;
+
+bool ConnInit()
+{
+    theConnection = new PokeAdvisePersistentConnection;
+    if ( !theConnection->Get() )
+    {
+        delete theConnection;
+        theConnection = NULL;
+        return false;
+    }
+
+    return true;
+}
+
+void ConnDone()
+{
+    delete theConnection;
+}
+
+} // anonymous namespace
+
+BENCHMARK_FUNC_WITH_INIT(IPCPokeAdvise, ConnInit, ConnDone)
+{
+    wxEventLoop loop;
+
+    PokeAdviseConn * const conn = theConnection->Get();
+
+    const wxString s(1024, '@');
+
+    if ( !conn->Poke(IPC_BENCHMARK_ITEM, s) )
+        return false;
+
+    while ( !conn->GotAdvised() )
+        loop.Dispatch();
+
+    if ( conn->GetItem() != s )
+        return false;
+
+    return true;
+}

diff --git a/tests/benchmarks/makefile.bcc b/tests/benchmarks/makefile.bcc
index 9356d2711b293ccc0b620856841d05080b9bdec8..8328ca9ccbe0a4bfb54a672a7783b85238f548d8 100644 (file)
--- a/tests/benchmarks/makefile.bcc
+++ b/tests/benchmarks/makefile.bcc
@@ -38,6 +38,7 @@ BENCH_OBJECTS =  \
        $(OBJS)\bench_bench.obj \
        $(OBJS)\bench_htmlpars.obj \
        $(OBJS)\bench_htmltag.obj \
+       $(OBJS)\bench_ipcclient.obj \
        $(OBJS)\bench_strings.obj \
        $(OBJS)\bench_tls.obj
 
@@ -143,6 +144,10 @@ __DLLFLAG_p = -DWXUSINGDLL
 __WXLIB_BASE_p = \
        wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
@@ -188,7 +193,7 @@ clean:
 
 $(OBJS)\bench.exe: $(BENCH_OBJECTS)
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|
-       c0x32.obj $(BENCH_OBJECTS),$@,, $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
+       c0x32.obj $(BENCH_OBJECTS),$@,, $(__WXLIB_BASE_p)  $(__WXLIB_NET_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
 |
 
 data: 
@@ -204,6 +209,9 @@ $(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp
 $(OBJS)\bench_htmltag.obj: .\htmlparser\htmltag.cpp
        $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\htmlparser\htmltag.cpp
 
+$(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp
+       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp
+
 $(OBJS)\bench_strings.obj: .\strings.cpp
        $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\strings.cpp
 

diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc
index 63247a765fb2e6e9933c0f7ea85fb25470fc1206..c8c7b7f1d736cede5516750b9215bef4cf5ef733 100644 (file)
--- a/tests/benchmarks/makefile.gcc
+++ b/tests/benchmarks/makefile.gcc
@@ -31,6 +31,7 @@ BENCH_OBJECTS =  \
        $(OBJS)\bench_bench.o \
        $(OBJS)\bench_htmlpars.o \
        $(OBJS)\bench_htmltag.o \
+       $(OBJS)\bench_ipcclient.o \
        $(OBJS)\bench_strings.o \
        $(OBJS)\bench_tls.o
 
@@ -131,6 +132,10 @@ ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = \
        -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
 endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_NET_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
+endif
 ifeq ($(MONOLITHIC),1)
 __WXLIB_MONO_p = \
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@@ -179,7 +184,7 @@ clean:
        -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe
 
 $(OBJS)\bench.exe: $(BENCH_OBJECTS)
-       $(CXX) -o $@ $(BENCH_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(BENCH_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_NET_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
@@ -194,6 +199,9 @@ $(OBJS)\bench_htmlpars.o: ./htmlparser/htmlpars.cpp
 $(OBJS)\bench_htmltag.o: ./htmlparser/htmltag.cpp
        $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\bench_ipcclient.o: ./ipcclient.cpp
+       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\bench_strings.o: ./strings.cpp
        $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
 

diff --git a/tests/benchmarks/makefile.vc b/tests/benchmarks/makefile.vc
index 91c417e2da768c29bef9c600126c48135dc74c9d..fb7cb3e559f0f47f3f22105a7cfa5b95619a3910 100644 (file)
--- a/tests/benchmarks/makefile.vc
+++ b/tests/benchmarks/makefile.vc
@@ -32,6 +32,7 @@ BENCH_OBJECTS =  \
        $(OBJS)\bench_bench.obj \
        $(OBJS)\bench_htmlpars.obj \
        $(OBJS)\bench_htmltag.obj \
+       $(OBJS)\bench_ipcclient.obj \
        $(OBJS)\bench_strings.obj \
        $(OBJS)\bench_tls.obj
 
@@ -215,6 +216,10 @@ __DLLFLAG_p = /DWXUSINGDLL
 __WXLIB_BASE_p = \
        wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
@@ -245,7 +250,7 @@ clean:
 
 $(OBJS)\bench.exe: $(BENCH_OBJECTS)
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<
-       $(BENCH_OBJECTS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
+       $(BENCH_OBJECTS)  $(__WXLIB_BASE_p)  $(__WXLIB_NET_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
 <<
 
 data: 
@@ -261,6 +266,9 @@ $(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp
 $(OBJS)\bench_htmltag.obj: .\htmlparser\htmltag.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\htmlparser\htmltag.cpp
 
+$(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp
+
 $(OBJS)\bench_strings.obj: .\strings.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\strings.cpp
 

diff --git a/tests/benchmarks/makefile.wat b/tests/benchmarks/makefile.wat
index 1b134bc5e4f1096ebc380a71af7ce121e413045a..3e3b9b01d42660530b9567c9da3d9fd15995dffd 100644 (file)
--- a/tests/benchmarks/makefile.wat
+++ b/tests/benchmarks/makefile.wat
@@ -183,6 +183,11 @@ __WXLIB_BASE_p =
 __WXLIB_BASE_p = &
        wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
+__WXLIB_NET_p =
+!ifeq MONOLITHIC 0
+__WXLIB_NET_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
 __WXLIB_MONO_p =
 !ifeq MONOLITHIC 1
 __WXLIB_MONO_p = &
@@ -212,6 +217,7 @@ BENCH_OBJECTS =  &
        $(OBJS)\bench_bench.obj &
        $(OBJS)\bench_htmlpars.obj &
        $(OBJS)\bench_htmltag.obj &
+       $(OBJS)\bench_ipcclient.obj &
        $(OBJS)\bench_strings.obj &
        $(OBJS)\bench_tls.obj
 
@@ -239,7 +245,7 @@ $(OBJS)\bench.exe :  $(BENCH_OBJECTS)
        @%append $(OBJS)\bench.lbc option caseexact
        @%append $(OBJS)\bench.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)
        @for %i in ($(BENCH_OBJECTS)) do @%append $(OBJS)\bench.lbc file %i
-       @for %i in ( $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\bench.lbc library %i
+       @for %i in ( $(__WXLIB_BASE_p)  $(__WXLIB_NET_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\bench.lbc library %i
        @%append $(OBJS)\bench.lbc
        @for %i in () do @%append $(OBJS)\bench.lbc option stack=%i
        wlink @$(OBJS)\bench.lbc
@@ -257,6 +263,9 @@ $(OBJS)\bench_htmlpars.obj :  .AUTODEPEND .\htmlparser\htmlpars.cpp
 $(OBJS)\bench_htmltag.obj :  .AUTODEPEND .\htmlparser\htmltag.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<
 
+$(OBJS)\bench_ipcclient.obj :  .AUTODEPEND .\ipcclient.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<
+
 $(OBJS)\bench_strings.obj :  .AUTODEPEND .\strings.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<