X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ftest_thread_pool_observer.cpp;h=c5810c2a63f77b774694196f9f866958251476b2;hb=f7c9dc398b4cb271ae95c46a7741b0a35ad57523;hp=fc508b382e520b5409126ef7add4f746af1151d3;hpb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;p=metaproxy-moved-to-github.git

diff --git a/src/test_thread_pool_observer.cpp b/src/test_thread_pool_observer.cpp
index fc508b3..c5810c2 100644
--- a/src/test_thread_pool_observer.cpp
+++ b/src/test_thread_pool_observer.cpp
@@ -1,35 +1,15 @@
-/* $Id: test_thread_pool_observer.cpp,v 1.9 2006-03-16 10:40:59 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: test_thread_pool_observer.cpp,v 1.13 2007-04-18 12:06:59 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-%LICENSE%
- */
-/* $Id: test_thread_pool_observer.cpp,v 1.9 2006-03-16 10:40:59 adam Exp $
-   Copyright (c) 1998-2005-2006, Index Data.
-
-This file is part of the yaz-proxy.
-
-YAZ proxy is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-YAZ proxy is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+   See the LICENSE file for details
  */
 
 #include "config.hpp"
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <yaz++/pdu-assoc.h>
-#include <yaz++/socket-manager.h>
+#include <yazpp/pdu-assoc.h>
+#include <yazpp/socket-manager.h>
 #include <yaz/log.h>
 #include "pipe.hpp"
 #include "thread_pool_observer.hpp"
@@ -102,6 +82,14 @@ void My_Timer_Thread::socketNotify(int event)
     m->m_val = m_requests++;
     m->m_timer = this;
     m_t->put(m);
+#if 0
+    // prevent input queue from being filled up..
+    // bug #1064: Test test_thread_pool_observer hangs
+    // fortunately we don't need this hack. because put (ebove)
+    // will block itself if needed
+    if (m->m_val == 30)
+         m_obs->deleteObserver(this);
+#endif
 }
 
 BOOST_AUTO_UNIT_TEST( thread_pool_observer1 ) 
@@ -113,7 +101,7 @@ BOOST_AUTO_UNIT_TEST( thread_pool_observer1 )
     while (t.m_responses < 30 && mySocketManager.processEvent() > 0)
         ;
     BOOST_CHECK_EQUAL(t.m_responses, 30);
-    BOOST_CHECK(t.m_sum >= 435);
+    BOOST_CHECK(t.m_sum >= 435); // = 29*30/2
 }
 
 /*