From ae896d73d4914fa96f053a0443f6b05003c12b35 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Wed, 4 Jul 2007 03:24:48 +0000
Subject:  2007-07-02    <aconway@redhat.com

         * qpid/sys/Shlib.h, .cpp: Portable shared library abstraction.
          - Shlib: load, unload, getSymbol
          - AutoShlib: unload in destructor.
         * qpid/sys/apr/Shlib.cpp sys/posix/Shlib.cpp: APR/Posix impls

         * qpid/sys/Module.h: Reimplemented Module in terms of AutoShlib.
         * qpid/Plugin.cpp, .h: Removed dlopen - use Shlib instead.

         * qpid/broker/Broker.cpp: Added missing #include "qpid/log/Statement.h"
         * tests/Shlib.cpp, shlibtest.cpp: Unit test


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@553056 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/sys/apr/Module.h | 114 ------------------------------------------
 1 file changed, 114 deletions(-)
 delete mode 100644 cpp/src/qpid/sys/apr/Module.h

(limited to 'cpp/src/qpid/sys/apr/Module.h')

diff --git a/cpp/src/qpid/sys/apr/Module.h b/cpp/src/qpid/sys/apr/Module.h
deleted file mode 100644
index ff93a0eaf0..0000000000
--- a/cpp/src/qpid/sys/apr/Module.h
+++ /dev/null
@@ -1,114 +0,0 @@
-#ifndef _sys_apr_Module_h
-#define _sys_apr_Module_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/log/Statement.h"
-#include "qpid/QpidError.h"
-#include "APRBase.h"
-#include "APRPool.h"
-
-#include <boost/noncopyable.hpp>
-#include <iostream>
-#include <apr_dso.h>
-
-namespace qpid {
-namespace sys {
-
-typedef apr_dso_handle_t* dso_handle_t;
-
-template <class T> class Module : private boost::noncopyable
-{
-    typedef T* create_t();
-    typedef void destroy_t(T*);
-    
-    dso_handle_t handle;
-    destroy_t* destroy;
-    T* ptr;
-
-    void load(const std::string& name);
-    void unload();
-    void* getSymbol(const std::string& name);
-
-public:
-    Module(const std::string& name);
-    T* operator->(); 
-    T* get(); 
-    ~Module() throw();
-};
-
-template <class T> Module<T>::Module(const std::string& module) : destroy(0), ptr(0) 
-{
-    load(module);
-    //TODO: need a better strategy for symbol names to allow multiple
-    //modules to be loaded without clashes...
-
-    //Note: need the double cast to avoid errors in casting from void* to function pointer with -pedantic
-    create_t* create = reinterpret_cast<create_t*>(reinterpret_cast<intptr_t>(getSymbol("create")));
-    destroy = reinterpret_cast<destroy_t*>(reinterpret_cast<intptr_t>(getSymbol("destroy")));
-    ptr = create();
-}
-
-template <class T> T* Module<T>::operator->() 
-{ 
-    return ptr; 
-}
-
-template <class T> T* Module<T>::get() 
-{ 
-    return ptr; 
-}
-
-template <class T> Module<T>::~Module() throw()
-{
-    try {
-        if (handle && ptr) {
-            destroy(ptr);
-        }
-        if (handle) unload();
-    } catch (std::exception& e) {
-        QPID_LOG(error, "Error while destroying module: " << e.what());
-    }
-    destroy = 0;
-    handle = 0;
-    ptr = 0;
-}
-
-template <class T> void Module<T>::load(const std::string& name)
-{
-    CHECK_APR_SUCCESS(apr_dso_load(&handle, name.c_str(), APRPool::get()));
-}
-
-template <class T> void Module<T>::unload()
-{
-    CHECK_APR_SUCCESS(apr_dso_unload(handle));
-}
-
-template <class T> void* Module<T>::getSymbol(const std::string& name)
-{
-    apr_dso_handle_sym_t symbol;
-    CHECK_APR_SUCCESS(apr_dso_sym(&symbol, handle, name.c_str()));
-    return (void*) symbol;
-}
-
-}}
-#endif //ifndef _sys_apr_Module_h
-
-- 
cgit v1.2.1