7 files changed, 0 insertions, 416 deletions
diff --git a/cpp/src/qpid/broker/DelegatingPeriodicTimer.cpp b/cpp/src/qpid/broker/DelegatingPeriodicTimer.cpp
deleted file mode 100644
index 111d968543..0000000000
--- a/cpp/src/qpid/broker/DelegatingPeriodicTimer.cpp
+++ /dev/null
@@ -1,50 +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 "DelegatingPeriodicTimer.h"
-
-namespace qpid {
-namespace broker {
-
-DelegatingPeriodicTimer::DelegatingPeriodicTimer() {}
-
-void DelegatingPeriodicTimer::add(
-    const Task& task, sys::Duration period, const std::string& taskName)
-{
-    if (delegate.get())
-        delegate->add(task, period, taskName);
-    else {
-        Entry e;
-        e.task = task;
-        e.period = period;
-        e.name = taskName;
-        entries.push_back(e);
-    }
-}
-
-void DelegatingPeriodicTimer::setDelegate(std::auto_ptr<PeriodicTimer> impl) {
-    assert(impl.get());
-    assert(!delegate.get());
-    delegate = impl;
-    for (Entries::iterator i = entries.begin(); i != entries.end(); ++i)
-        delegate->add(i->task, i->period, i->name);
-}
-
-}} // namespace qpid::broker
diff --git a/cpp/src/qpid/broker/DelegatingPeriodicTimer.h b/cpp/src/qpid/broker/DelegatingPeriodicTimer.h
deleted file mode 100644
index 5186f41c3e..0000000000
--- a/cpp/src/qpid/broker/DelegatingPeriodicTimer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef QPID_BROKER_PERIODICTIMER_H
-#define QPID_BROKER_PERIODICTIMER_H
-
-/*
- *
- * 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 "qpid/sys/PeriodicTimer.h"
-#include <vector>
-#include <memory>
-
-namespace qpid {
-namespace broker {
-
-/**
- * A PeriodicTimer implementation that delegates to another PeriodicTimer.
- *
- * Tasks added while there is no delegate timer are stored.
- * When a delgate timer is set, stored tasks are added to it.
- */
-class DelegatingPeriodicTimer : public sys::PeriodicTimer
-{
-  public:
-    DelegatingPeriodicTimer();
-    /** Add a task: if no delegate, store it. When delegate set, add stored tasks */
-    void add(const Task& task, sys::Duration period, const std::string& taskName);
-    /** Set the delegate, transfers ownership of delegate. */
-    void setDelegate(std::auto_ptr<PeriodicTimer> delegate);
-    bool hasDelegate() { return delegate.get(); }
-  private:
-    struct Entry { Task task; sys::Duration period; std::string name; };
-    typedef std::vector<Entry> Entries;
-    std::auto_ptr<PeriodicTimer> delegate;
-    Entries entries;
-
-};
-
-}} // namespace qpid::broker
-
-#endif  /*!QPID_BROKER_PERIODICTIMER_H*/
diff --git a/cpp/src/qpid/cluster/PeriodicTimerImpl.cpp b/cpp/src/qpid/cluster/PeriodicTimerImpl.cpp
deleted file mode 100644
index ced34b572d..0000000000
--- a/cpp/src/qpid/cluster/PeriodicTimerImpl.cpp
+++ /dev/null
@@ -1,84 +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 "PeriodicTimerImpl.h"
-#include "Cluster.h"
-#include "qpid/framing/ProtocolVersion.h"
-#include "qpid/framing/ClusterPeriodicTimerBody.h"
-
-namespace qpid {
-namespace cluster {
-
-PeriodicTimerImpl::PeriodicTimerImpl(Cluster& c) : cluster(c) {}
-
-PeriodicTimerImpl::TaskEntry::TaskEntry(
-    Cluster& c, const Task& t, sys::Duration d, const std::string& n)
-    : TimerTask(d), cluster(c), timer(c.getBroker().getTimer()),
-      task(t), name(n), inFlight(false)
-{
-    timer.add(this);
-}
-
-void PeriodicTimerImpl::TaskEntry::fire() {
-    setupNextFire();
-    timer.add(this);
-    bool isElder = cluster.isElder(); // Call outside lock to avoid deadlock.
-    sys::Mutex::ScopedLock l(lock);
-    // Only the elder mcasts.
-    // Don't mcast another if we haven't yet received the last one.
-    if (isElder && !inFlight) {
-        QPID_LOG(trace, "Sending periodic-timer control for " << name);
-        inFlight = true;
-        cluster.getMulticast().mcastControl(
-            framing::ClusterPeriodicTimerBody(framing::ProtocolVersion(), name),
-            cluster.getId());
-    }
-}
-
-void PeriodicTimerImpl::TaskEntry::deliver() {
-    task();
-    sys::Mutex::ScopedLock l(lock);
-    inFlight = false;
-}
-
-
-void PeriodicTimerImpl::add(
-    const Task& task, sys::Duration period, const std::string& name)
-{
-    sys::Mutex::ScopedLock l(lock);
-    QPID_LOG(debug, "Periodic timer add entry for " << name);
-    if (map.find(name) != map.end())
-        throw Exception(QPID_MSG("Cluster timer task name added twice: " << name));
-    map[name] = new TaskEntry(cluster, task, period, name);
-}
-
-void PeriodicTimerImpl::deliver(const std::string& name) {
-    Map::iterator i;
-    {
-        sys::Mutex::ScopedLock l(lock);
-        i = map.find(name);
-        if (i == map.end())
-            throw Exception(QPID_MSG("Cluster timer unknown task: " << name));
-    }
-    QPID_LOG(debug, "Periodic timer execute " << name);
-    i->second->deliver();
-}
-
-}} // namespace qpid::cluster
diff --git a/cpp/src/qpid/cluster/PeriodicTimerImpl.h b/cpp/src/qpid/cluster/PeriodicTimerImpl.h
deleted file mode 100644
index cb0034bcef..0000000000
--- a/cpp/src/qpid/cluster/PeriodicTimerImpl.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef QPID_CLUSTER_PERIODICTIMERIMPL_H
-#define QPID_CLUSTER_PERIODICTIMERIMPL_H
-
-/*
- *
- * 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 "qpid/sys/PeriodicTimer.h"
-#include "qpid/sys/Mutex.h"
-#include <map>
-
-namespace qpid {
-namespace cluster {
-
-class Cluster;
-
-/**
- * Cluster implementation of PeriodicTimer.
- *
- * All members run a periodic task, elder mcasts periodic-timer control.
- * Actual task is executed on delivery of periodic-timer.
- */
-class PeriodicTimerImpl : public sys::PeriodicTimer
-{
-  public:
-    PeriodicTimerImpl(Cluster& cluster);
-    void add(const Task& task, sys::Duration period, const std::string& taskName);
-    void deliver(const std::string& name);
-
-  private:
-
-    class TaskEntry : public sys::TimerTask {
-      public:
-        TaskEntry(Cluster&, const Task&, sys::Duration period, const std::string& name);
-        void fire();
-        void deliver();
-      private:
-        sys::Mutex lock;
-        Cluster& cluster;
-        sys::Timer& timer;
-        Task task;
-        std::string name;
-        bool inFlight;
-    };
-
-    typedef std::map<std::string, boost::intrusive_ptr<TaskEntry> > Map;
-    struct TaskImpl;
-
-    sys::Mutex lock;
-    Map map;
-    Cluster& cluster;
-};
-}} // namespace qpid::cluster
-
-#endif  /*!QPID_CLUSTER_PERIODICTIMER_H*/
diff --git a/cpp/src/qpid/sys/PeriodicTimer.h b/cpp/src/qpid/sys/PeriodicTimer.h
deleted file mode 100644
index 290ffb6218..0000000000
--- a/cpp/src/qpid/sys/PeriodicTimer.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef QPID_SYS_PERIODICTIMER_H
-#define QPID_SYS_PERIODICTIMER_H
-
-/*
- *
- * 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 "Timer.h"
-#include <boost/function.hpp>
-
-namespace qpid {
-namespace sys {
-
-/**
- * Interface of a timer for periodic tasks that should be synchronized
- * across all brokers in a periodic. The standalone broker
- * implementation simply wraps qpid::sys::Timer. The clustered broker
- * implementation synchronizes execution of periodic tasks on all
- * periodic members.
- */
-class PeriodicTimer
-{
-  public:
-    typedef boost::function<void()> Task;
-
-    QPID_COMMON_EXTERN virtual ~PeriodicTimer() {}
-
-    /**
-     * Add a named task to be executed at the given period.
-     *
-     * The task registered under the same name will be executed on
-     * all brokers at the given period.
-     */
-    virtual void add(const Task& task, Duration period, const std::string& taskName) = 0;
-
-};
-}} // namespace qpid::sys
-
-#endif  /*!QPID_SYS_PERIODICTIMER_H*/
diff --git a/cpp/src/qpid/sys/PeriodicTimerImpl.cpp b/cpp/src/qpid/sys/PeriodicTimerImpl.cpp
deleted file mode 100644
index e2a6dccf3e..0000000000
--- a/cpp/src/qpid/sys/PeriodicTimerImpl.cpp
+++ /dev/null
@@ -1,49 +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 "PeriodicTimerImpl.h"
-
-namespace qpid {
-namespace sys {
-
-PeriodicTimerImpl::PeriodicTimerImpl(Timer& t) : timer(t) {}
-
-struct PeriodicTimerImpl::TaskImpl : public TimerTask {
-    Timer& timer;
-    Task task;
-
-    TaskImpl(Timer& timer_, const Task& task_, Duration period) :
-        TimerTask(period), timer(timer_), task(task_) {}
-
-    void fire() {
-        task();
-        setupNextFire();
-        timer.add(this);
-    }
-};
-
-void PeriodicTimerImpl::add(
-    const Task& task, Duration period, const std::string& /*taskName*/
-)
-{
-    timer.add(new TaskImpl(timer, task, period));
-}
-
-}} // namespace qpid::sys
diff --git a/cpp/src/qpid/sys/PeriodicTimerImpl.h b/cpp/src/qpid/sys/PeriodicTimerImpl.h
deleted file mode 100644
index 3fc9396f01..0000000000
--- a/cpp/src/qpid/sys/PeriodicTimerImpl.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef QPID_SYS_PERIODICTIMERIMPL_H
-#define QPID_SYS_PERIODICTIMERIMPL_H
-
-/*
- *
- * 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 "PeriodicTimer.h"
-#include "qpid/CommonImportExport.h"
-
-namespace qpid {
-namespace sys {
-
-/**
- * Standalone broker implementation of PeriodicTimer.
- */
-class PeriodicTimerImpl : public PeriodicTimer
-{
-  public:
-    QPID_COMMON_EXTERN PeriodicTimerImpl(Timer& timer);
-    QPID_COMMON_EXTERN void add(const Task& task,
-                                Duration period,
-                                const std::string& taskName);
-
-  private:
-    struct TaskImpl;
-    Timer& timer;
-};
-}} // namespace qpid::sys
-
-#endif  /*!QPID_SYS_PERIODICTIMER_H*/