[med-svn] r16358 - in trunk/packages/dcmtk/tags: . 3.6.1~20131114-7/debian/patches

[Mathieu Malaterre]

Author: malat
Date: 2014-02-28 12:34:45 +0000 (Fri, 28 Feb 2014)
New Revision: 16358

Added:
   trunk/packages/dcmtk/tags/3.6.1~20131114-7/
   trunk/packages/dcmtk/tags/3.6.1~20131114-7/debian/patches/tpool2.patch
Log:
[svn-buildpackage] Tagging dcmtk 3.6.1~20131114-7

Copied: trunk/packages/dcmtk/tags/3.6.1~20131114-7/debian/patches/tpool2.patch (from rev 16357, trunk/packages/dcmtk/branches/experimental/debian/patches/tpool2.patch)
===================================================================
--- trunk/packages/dcmtk/tags/3.6.1~20131114-7/debian/patches/tpool2.patch	                        (rev 0)
+++ trunk/packages/dcmtk/tags/3.6.1~20131114-7/debian/patches/tpool2.patch	2014-02-28 12:34:45 UTC (rev 16358)
@@ -0,0 +1,83 @@
+--- dcmtk-3.6.1~20131114.orig/dcmnet/tests/tpool.cc
++++ dcmtk-3.6.1~20131114/dcmnet/tests/tpool.cc
+@@ -25,6 +25,7 @@
+ #ifdef WITH_THREADS
+ 
+ #include "dcmtk/ofstd/oftest.h"
++#include "dcmtk/dcmnet/diutil.h"
+ #include "dcmtk/dcmnet/scppool.h"
+ #include "dcmtk/dcmnet/scu.h"
+ 
+@@ -34,7 +35,8 @@ struct TestSCU : DcmSCU, OFThread
+ protected:
+     void run()
+     {
+-        negotiateAssociation();
++        result = negotiateAssociation();
++        DCMNET_FATAL("negotiate association: " << result.text());
+         result = sendECHORequest(0);
+         releaseAssociation();
+     }
+@@ -51,13 +53,12 @@ protected:
+ };
+ 
+ 
+-/* Test starts pool with a maximum of 5 SCP workers (default value).
+- * All workers are configured to respond to C-ECHO (Verification SOP
+- * Class). 20 SCU threads are created and connect simultaneously to
+- * the pool, send C-ECHO messages are release the association.
+- * Currently the pool ends itself after 3 seconds without connection
+- * request. This can be changed to a "shutDown()" call on the pool
+- * once it is implemented.
++/* Test starts pool with a maximum of 20 SCP workers. All workers are
++ * configured to respond to C-ECHO (Verification SOP Class). 20 SCU
++ * threads are created and connect simultaneously to the pool, send
++ * C-ECHO messages and release the association. Currently the pool
++ * ends itself after 3 seconds without connection request. This can
++ * be changed to a shutDown() call on the pool once it is implemented.
+  */
+ OFTEST(dcmnet_scp_pool)
+ {
+@@ -68,19 +69,21 @@ OFTEST(dcmnet_scp_pool)
+     config.setPort(11112);
+     config.setConnectionBlockingMode(DUL_NOBLOCK);
+ 
+-    /* Stop listening after 3 seconds. This makes sure the server pool
+-     * exits 3 seconds after the last connection request of the SCUs.
++    /* Stop listening after 20 seconds. This makes sure the server pool
++     * exits 20 seconds after the last connection request of the SCUs.
+      * As soon as it is possible to shut down the pool via API
+      * (currently under test), this should be done instead of exiting
+      * via connection timeout.
+      */
+-    config.setConnectionTimeout(5);
++    config.setConnectionTimeout(20);
+ 
+     pool.setMaxThreads(20);
+     OFList<OFString> xfers;
+     xfers.push_back(UID_LittleEndianExplicitTransferSyntax);
+     xfers.push_back(UID_LittleEndianImplicitTransferSyntax);
+     config.addPresentationContext(UID_VerificationSOPClass, xfers);
++    
++    pool.start();
+ 
+     OFVector<TestSCU*> scus(20);
+     for (OFVector<TestSCU*>::iterator it1 = scus.begin(); it1 != scus.end(); ++it1)
+@@ -94,7 +97,8 @@ OFTEST(dcmnet_scp_pool)
+         (*it1)->initNetwork();
+     }
+ 
+-    pool.start();
++    // "ensure" the pool is initialized before any SCU starts connecting to it.
++    OFStandard::sleep(5);
+ 
+     for (OFVector<TestSCU*>::const_iterator it2 = scus.begin(); it2 != scus.end(); ++it2)
+         (*it2)->start();
+@@ -102,6 +106,7 @@ OFTEST(dcmnet_scp_pool)
+     for (OFVector<TestSCU*>::iterator it3 = scus.begin(); it3 != scus.end(); ++it3)
+     {
+         (*it3)->join();
++        DCMNET_FATAL("send echo request: " << (*it3)->result.text());
+         OFCHECK((*it3)->result.good());
+         delete *it3;
+     }