2006-12-01 Jim Meyering <meyering@redhat.com>

This delta imposes two major changes on the C++ hierarchy:
  - adds autoconf, automake, libtool support
  - makes the hierarchy flatter and renames a few files (e.g., Queue.h,
  Queue.cpp) that appeared twice, once under client/ and again under broker/.

In the process, I've changed many #include directives, mostly
to remove a qpid/ or qpid/framing/ prefix from the file name argument.
Although most changes were to .cpp and .h files under qpid/cpp/, there
were also several to template files under qpid/gentools, and even one
to CppGenerator.java.

Nearly all files are moved to a new position in the hierarchy.
The new hierarchy looks like this:

  src               # this is the new home of qpidd.cpp
  tests             # all tests are here.  See Makefile.am.
  gen               # As before, all generated files go here.
  lib               # This is just a container for the 3 lib dirs:
  lib/client
  lib/broker
  lib/common
  lib/common/framing
  lib/common/sys
  lib/common/sys/posix
  lib/common/sys/apr
  build-aux
  m4


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@481159 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 247 deletions

diff --git a/cpp/test/unit/qpid/posix/EventChannelThreadsTest.cpp b/cpp/test/unit/qpid/posix/EventChannelThreadsTest.cpp
deleted file mode 100644
index 5c467880be..0000000000
--- a/cpp/test/unit/qpid/posix/EventChannelThreadsTest.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-#include <iostream>
-#include <boost/bind.hpp>
-
-#include <qpid/sys/Socket.h>
-#include <qpid/posix/EventChannelThreads.h>
-#include <qpid_test_plugin.h>
-
-
-using namespace std;
-
-using namespace qpid::sys;
-
-const int nConnections = 5;
-const int nMessages = 10; // Messages read/written per connection.
-
-
-// Accepts + reads + writes.
-const int totalEvents = nConnections+2*nConnections*nMessages;
-
-/**
- * Messages are numbered 0..nMessages.
- * We count the total number of events, and the
- * number of reads and writes for each message number.
- */
-class TestResults : public Monitor {
-  public:
-    TestResults() : isShutdown(false), nEventsRemaining(totalEvents) {}
-
-    void countEvent() {
-        if (--nEventsRemaining == 0)
-            shutdown();
-    }
-
-    void countRead(int messageNo) {
-        ++reads[messageNo];
-        countEvent();
-    }
-
-    void countWrite(int messageNo) {
-        ++writes[messageNo];
-        countEvent();
-    }
-
-    void shutdown(const std::string& exceptionMsg = std::string()) {
-        ScopedLock lock(*this);
-        exception = exceptionMsg;
-        isShutdown = true;
-        notifyAll();
-    }
-    
-    void wait() {
-        ScopedLock lock(*this);
-        Time deadline = now() + 10*TIME_SEC; 
-        while (!isShutdown) {
-            CPPUNIT_ASSERT(Monitor::wait(deadline));
-        }
-    }
-
-    bool isShutdown;
-    std::string exception;
-    AtomicCount reads[nMessages];
-    AtomicCount writes[nMessages];
-    AtomicCount nEventsRemaining;
-};
-
-TestResults results;
-
-EventChannelThreads::shared_ptr threads;
-
-// Functor to wrap callbacks in try/catch.
-class SafeCallback {
-  public:
-    SafeCallback(Runnable& r) : callback(r.functor()) {}
-    SafeCallback(Event::Callback cb) : callback(cb) {}
-    
-    void operator()() {
-        std::string exception;
-        try {
-            callback();
-            return;
-        }
-        catch (const std::exception& e) {
-            exception = e.what();
-        }
-        catch (...) {
-            exception = "Unknown exception.";
-        }
-        results.shutdown(exception);
-    }
-
-  private:
-    Event::Callback callback;
-};
-
-/** Repost an event N times. */
-class Repost {
-  public:
-    Repost(int n) : count (n) {}
-    virtual ~Repost() {}
-    
-    void repost(Event* event) {
-        if (--count==0) {
-            delete event;
-        } else {
-            threads->postEvent(event);
-        }
-    }
-  private:
-    int count;
-};
-    
-            
-
-/** Repeating read event. */
-class TestReadEvent : public ReadEvent, public Runnable, private Repost {
-  public:
-    explicit TestReadEvent(int fd=-1) :
-        ReadEvent(fd, &value, sizeof(value), SafeCallback(*this)),
-        Repost(nMessages)
-    {}
-    
-    void run() {
-        CPPUNIT_ASSERT_EQUAL(sizeof(value), getSize());
-        CPPUNIT_ASSERT(0 <= value);
-        CPPUNIT_ASSERT(value < nMessages);
-        results.countRead(value);
-        repost(this);
-    }
-    
-  private:
-    int value;
-    ReadEvent original;
-};
-
-
-/** Fire and forget write event */
-class TestWriteEvent : public WriteEvent, public Runnable, private Repost {
-  public:
-    TestWriteEvent(int fd=-1) :
-        WriteEvent(fd, &value, sizeof(value), SafeCallback(*this)),
-        Repost(nMessages),
-        value(0)
-    {}
-    
-    void run() {
-        CPPUNIT_ASSERT_EQUAL(sizeof(int), getSize());
-        results.countWrite(value++);
-        repost(this);
-    }
-
-  private:
-    int value;
-};
-
-/** Fire-and-forget Accept event, posts reads on the accepted connection. */
-class TestAcceptEvent : public AcceptEvent, public Runnable, private Repost {
-  public:
-    TestAcceptEvent(int fd=-1) :
-        AcceptEvent(fd, SafeCallback(*this)),
-        Repost(nConnections)
-    {}
-    
-    void run() {
-        threads->postEvent(new TestReadEvent(getAcceptedDesscriptor()));
-        results.countEvent();
-        repost(this);
-    }
-};
-
-class EventChannelThreadsTest : public CppUnit::TestCase
-{
-    CPPUNIT_TEST_SUITE(EventChannelThreadsTest);
-    CPPUNIT_TEST(testThreads);
-    CPPUNIT_TEST_SUITE_END();
-
-  public:
-
-    void setUp() {
-        threads = EventChannelThreads::create(EventChannel::create());
-    }
-
-    void tearDown() {
-        threads.reset();
-    }
-
-    void testThreads()
-    {
-        Socket listener = Socket::createTcp();
-        int port = listener.listen();
-
-        // Post looping accept events, will repost nConnections times.
-        // The accept event will automatically post read events.
-        threads->postEvent(new TestAcceptEvent(listener.fd()));
-
-        // Make connections.
-        Socket connections[nConnections];
-        for (int i = 0; i < nConnections; ++i) {
-            connections[i] = Socket::createTcp();
-            connections[i].connect("localhost", port);
-        }
-
-        // Post looping write events.
-        for (int i = 0; i < nConnections; ++i) {
-            threads->postEvent(new TestWriteEvent(connections[i].fd()));
-        }
-
-        // Wait for all events to be dispatched.
-        results.wait();
-
-        if (!results.exception.empty()) CPPUNIT_FAIL(results.exception);
-        CPPUNIT_ASSERT_EQUAL(0, int(results.nEventsRemaining));
-
-        // Expect a read and write for each messageNo from each connection.
-        for (int messageNo = 0; messageNo < nMessages; ++messageNo) {
-            CPPUNIT_ASSERT_EQUAL(nConnections, int(results.reads[messageNo]));
-            CPPUNIT_ASSERT_EQUAL(nConnections, int(results.writes[messageNo]));
-        }
-
-        threads->shutdown();
-        threads->join();
-    }
-};
-
-// Make this test suite a plugin.
-CPPUNIT_PLUGIN_IMPLEMENT();
-CPPUNIT_TEST_SUITE_REGISTRATION(EventChannelThreadsTest);
-