diff --git a/ipaacalib/cpp/CMakeLists.txt b/ipaacalib/cpp/CMakeLists.txt
index 55395cc91303cd8c08a4ce372d2e6f4c519fb84b..9ce23f2c21615937afdf712dc080a825ed9ad8e7 100644
--- a/ipaacalib/cpp/CMakeLists.txt
+++ b/ipaacalib/cpp/CMakeLists.txt
@@ -6,6 +6,9 @@ project (ipaaca_cpp)
## use the following line to enable console debug messages in ipaaca
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIPAACA_DEBUG_MESSAGES")
+# expose the full RSB api in the headers (set only in ipaaca itself)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIPAACA_EXPOSE_FULL_RSB_API")
+
# find cmake modules locally too
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
@@ -18,8 +21,15 @@ find_package(Protobuf REQUIRED)
link_directories(${PROTOBUF_LIBRARY_DIRS})
include_directories(${PROTOBUF_INCLUDE_DIRS})
-#set(PROTOLIBS protobuf)
-set(RSBLIBS rsc rsbcore)
+##set(PROTOLIBS protobuf)
+#set(RSBLIBS rsc rsbcore)
+
+# add for for each new rsb version
+include_directories( ${PROJECT_SOURCE_DIR}/../../deps/include/rsc0.8 )
+include_directories( ${PROJECT_SOURCE_DIR}/../../deps/include/rsb0.8 )
+# change for each new rsb version
+set(RSBLIBS rsc.0.8 rsb.0.8)
+
#set(LIBS ${LIBS} ${BOOSTLIBS} ${PROTOLIBS} ${RSBLIBS})
#set(LIBS ${LIBS} ${PROTOLIBS} ${RSBLIBS})
@@ -57,6 +67,7 @@ include_directories( ${PROJECT_SOURCE_DIR}/include )
include_directories( ${PROJECT_SOURCE_DIR}/../../deps/include )
link_directories( ${PROJECT_SOURCE_DIR}/../../deps/lib )
+
# specify source files for ipaaca (auto-generated ones are in build/ )
set (SOURCE
src/ipaaca.cc
diff --git a/ipaacalib/cpp/include/ipaaca/ipaaca.h b/ipaacalib/cpp/include/ipaaca/ipaaca.h
index e9c0d1d8f00422d2bcccf9a52dcda47730ebdceb..a6504a6e2c3a64aef7f1d9d12b4480ff0d5a3b1e 100644
--- a/ipaacalib/cpp/include/ipaaca/ipaaca.h
+++ b/ipaacalib/cpp/include/ipaaca/ipaaca.h
@@ -23,6 +23,17 @@
#define IPAACA_TODO(i) ;
#endif
+#ifdef IPAACA_EXPOSE_FULL_RSB_API
+#include <rsc/runtime/TypeStringTools.h>
+#include <rsb/Factory.h>
+#include <rsb/Handler.h>
+#include <rsb/Event.h>
+#include <rsb/converter/Repository.h>
+#include <rsb/converter/ProtocolBufferConverter.h>
+#include <rsb/converter/Converter.h>
+#include <rsb/rsbexports.h>
+#endif
+
/// marking pure virtual functions for extra readability
#define _IPAACA_ABSTRACT_
@@ -41,26 +52,11 @@
#include <boost/pointer_cast.hpp>
#include <boost/lexical_cast.hpp>
-#include <rsc/runtime/TypeStringTools.h>
-#include <rsb/Factory.h>
-#include <rsb/Handler.h>
-#include <rsb/Event.h>
-#include <rsb/converter/Repository.h>
-#include <rsb/converter/ProtocolBufferConverter.h>
-#include <rsb/converter/Converter.h>
-#include <rsb/rsbexports.h>
-
#include <ipaaca/ipaaca.pb.h>
#include <pthread.h>
#include <uuid/uuid.h>
-//using namespace boost;
-//using namespace rsb;
-//using namespace rsb::filter;
-//using namespace rsb::converter;
-//using namespace rsb::patterns;
-
namespace ipaaca {
typedef uint32_t revision_t;
@@ -104,19 +100,29 @@ class Payload;
class IUInterface;
class IU;
class Message;
-class IUConverter;
-class MessageConverter;
class RemotePushIU;
class IULinkUpdate;
-class IULinkUpdateConverter;
class IUPayloadUpdate;
-class IUPayloadUpdateConverter;
class IUStore;
class FrozenIUStore;
class Buffer;
class InputBuffer;
class OutputBuffer;
+//class InputBufferRsbAdaptor;
+//class OutputBufferRsbAdaptor;
+
+class CallbackIUPayloadUpdate;
+class CallbackIULinkUpdate;
+class CallbackIUCommission;
+class CallbackIURetraction;
+
+class IUConverter;
+class MessageConverter;
+class IUPayloadUpdateConverter;
+class IULinkUpdateConverter;
+class IntConverter;
+
/// generate a UUID as an ASCII string
std::string generate_uuid_string();
@@ -277,47 +283,21 @@ class Buffer { //: public boost::enable_shared_from_this<Buffer> {//{{{
};
//}}}
-class CallbackIUPayloadUpdate: public rsb::patterns::Server::Callback<IUPayloadUpdate, int> {
- protected:
- Buffer* _buffer;
- public:
- CallbackIUPayloadUpdate(Buffer* buffer);
- boost::shared_ptr<int> call(const std::string& methodName, boost::shared_ptr<IUPayloadUpdate> update);
-};
-class CallbackIULinkUpdate: public rsb::patterns::Server::Callback<IULinkUpdate, int> {
- protected:
- Buffer* _buffer;
- public:
- CallbackIULinkUpdate(Buffer* buffer);
- public:
- boost::shared_ptr<int> call(const std::string& methodName, boost::shared_ptr<IULinkUpdate> update);
-};
-class CallbackIUCommission: public rsb::patterns::Server::Callback<protobuf::IUCommission, int> {
- protected:
- Buffer* _buffer;
- public:
- CallbackIUCommission(Buffer* buffer);
- public:
- boost::shared_ptr<int> call(const std::string& methodName, boost::shared_ptr<protobuf::IUCommission> update);
-};
-class CallbackIURetraction: public rsb::patterns::Server::Callback<protobuf::IURetraction, int> {
- protected:
- Buffer* _buffer;
- public:
- CallbackIURetraction(Buffer* buffer);
- public:
- boost::shared_ptr<int> call(const std::string& methodName, boost::shared_ptr<protobuf::IURetraction> update);
-};
-
class OutputBuffer: public Buffer { //, public boost::enable_shared_from_this<OutputBuffer> {//{{{
friend class IU;
friend class RemotePushIU;
+ friend class OutputBufferRsbAdaptor;
protected:
protected:
- std::map<std::string, rsb::Informer<rsb::AnyType>::Ptr> _informer_store;
+ //OutputBufferRsbAdaptor _rsb;
IUStore _iu_store;
Lock _iu_id_counter_lock;
+#ifdef IPAACA_EXPOSE_FULL_RSB_API
+ protected:
+ std::map<std::string, rsb::Informer<rsb::AnyType>::Ptr> _informer_store;
rsb::patterns::ServerPtr _server;
+ rsb::Informer<rsb::AnyType>::Ptr _get_informer(const std::string& category);
+#endif
protected:
// informing functions
void _send_iu_link_update(IUInterface* iu, bool is_delta, revision_t revision, const LinkMap& new_links, const LinkMap& links_to_remove, const std::string& writer_name="undef");
@@ -327,10 +307,8 @@ class OutputBuffer: public Buffer { //, public boost::enable_shared_from_this<Ou
// _remote_update_links(IULinkUpdate)
// _remote_update_payload(IUPayloadUpdate)
// _remote_commit(protobuf::IUCommission)
- protected:
void _publish_iu(boost::shared_ptr<IU> iu);
void _retract_iu(boost::shared_ptr<IU> iu);
- rsb::Informer<rsb::AnyType>::Ptr _get_informer(const std::string& category);
protected:
OutputBuffer(const std::string& basename);
void _initialize_server();
@@ -351,10 +329,17 @@ class OutputBuffer: public Buffer { //, public boost::enable_shared_from_this<Ou
class InputBuffer: public Buffer { //, public boost::enable_shared_from_this<InputBuffer> {//{{{
friend class IU;
friend class RemotePushIU;
+ friend class InputBufferRsbAdaptor;
+ //InputBufferRsbAdaptor _rsb;
+#ifdef IPAACA_EXPOSE_FULL_RSB_API
protected:
std::map<std::string, rsb::ListenerPtr> _listener_store;
std::map<std::string, rsb::patterns::RemoteServerPtr> _remote_server_store;
RemotePushIUStore _iu_store; // TODO genericize
+ rsb::patterns::RemoteServerPtr _get_remote_server(const std::string& unique_server_name);
+ rsb::ListenerPtr _create_category_listener_if_needed(const std::string& category);
+ void _handle_iu_events(rsb::EventPtr event);
+#endif
protected:
inline void _send_iu_link_update(IUInterface* iu, bool is_delta, revision_t revision, const LinkMap& new_links, const LinkMap& links_to_remove, const std::string& writer_name="undef")
{
@@ -368,10 +353,6 @@ class InputBuffer: public Buffer { //, public boost::enable_shared_from_this<Inp
{
IPAACA_WARNING("(ERROR) InputBuffer::_send_iu_commission() should never be invoked")
}
- protected:
- rsb::patterns::RemoteServerPtr _get_remote_server(const std::string& unique_server_name);
- rsb::ListenerPtr _create_category_listener_if_needed(const std::string& category);
- void _handle_iu_events(rsb::EventPtr event);
protected:
InputBuffer(const std::string& basename, const std::set<std::string>& category_interests);
InputBuffer(const std::string& basename, const std::vector<std::string>& category_interests);
@@ -395,20 +376,6 @@ class InputBuffer: public Buffer { //, public boost::enable_shared_from_this<Inp
};
//}}}
-class IUConverter: public rsb::converter::Converter<std::string> {//{{{
- public:
- IUConverter();
- std::string serialize(const rsb::AnnotatedData& data, std::string& wire);
- rsb::AnnotatedData deserialize(const std::string& wireSchema, const std::string& wire);
-};//}}}
-
-class MessageConverter: public rsb::converter::Converter<std::string> {//{{{
- public:
- MessageConverter();
- std::string serialize(const rsb::AnnotatedData& data, std::string& wire);
- rsb::AnnotatedData deserialize(const std::string& wireSchema, const std::string& wire);
-};//}}}
-
class IUPayloadUpdate {//{{{
public:
std::string uid;
@@ -420,12 +387,6 @@ class IUPayloadUpdate {//{{{
friend std::ostream& operator<<(std::ostream& os, const IUPayloadUpdate& obj);
typedef boost::shared_ptr<IUPayloadUpdate> ptr;
};//}}}
-class IUPayloadUpdateConverter: public rsb::converter::Converter<std::string> {//{{{
- public:
- IUPayloadUpdateConverter();
- std::string serialize(const rsb::AnnotatedData& data, std::string& wire);
- rsb::AnnotatedData deserialize(const std::string& wireSchema, const std::string& wire);
-};//}}}
class IULinkUpdate {//{{{
public:
@@ -438,20 +399,8 @@ class IULinkUpdate {//{{{
friend std::ostream& operator<<(std::ostream& os, const IULinkUpdate& obj);
typedef boost::shared_ptr<IULinkUpdate> ptr;
};//}}}
-class IULinkUpdateConverter: public rsb::converter::Converter<std::string> {//{{{
- public:
- IULinkUpdateConverter();
- std::string serialize(const rsb::AnnotatedData& data, std::string& wire);
- rsb::AnnotatedData deserialize(const std::string& wireSchema, const std::string& wire);
-};//}}}
-class IntConverter: public rsb::converter::Converter<std::string> {//{{{
- public:
- IntConverter();
- std::string serialize(const rsb::AnnotatedData& data, std::string& wire);
- rsb::AnnotatedData deserialize(const std::string& wireSchema, const std::string& wire);
-};//}}}
class Initializer
{
@@ -769,6 +718,72 @@ class NotImplementedError: public Exception//{{{
}
};//}}}
+#ifdef IPAACA_EXPOSE_FULL_RSB_API
+class CallbackIUPayloadUpdate: public rsb::patterns::Server::Callback<IUPayloadUpdate, int> {//{{{
+ protected:
+ Buffer* _buffer;
+ public:
+ CallbackIUPayloadUpdate(Buffer* buffer);
+ boost::shared_ptr<int> call(const std::string& methodName, boost::shared_ptr<IUPayloadUpdate> update);
+};//}}}
+class CallbackIULinkUpdate: public rsb::patterns::Server::Callback<IULinkUpdate, int> {//{{{
+ protected:
+ Buffer* _buffer;
+ public:
+ CallbackIULinkUpdate(Buffer* buffer);
+ public:
+ boost::shared_ptr<int> call(const std::string& methodName, boost::shared_ptr<IULinkUpdate> update);
+};//}}}
+class CallbackIUCommission: public rsb::patterns::Server::Callback<protobuf::IUCommission, int> {//{{{
+ protected:
+ Buffer* _buffer;
+ public:
+ CallbackIUCommission(Buffer* buffer);
+ public:
+ boost::shared_ptr<int> call(const std::string& methodName, boost::shared_ptr<protobuf::IUCommission> update);
+};//}}}
+class CallbackIURetraction: public rsb::patterns::Server::Callback<protobuf::IURetraction, int> {//{{{
+ protected:
+ Buffer* _buffer;
+ public:
+ CallbackIURetraction(Buffer* buffer);
+ public:
+ boost::shared_ptr<int> call(const std::string& methodName, boost::shared_ptr<protobuf::IURetraction> update);
+};//}}}
+
+class IUConverter: public rsb::converter::Converter<std::string> {//{{{
+ public:
+ IUConverter();
+ std::string serialize(const rsb::AnnotatedData& data, std::string& wire);
+ rsb::AnnotatedData deserialize(const std::string& wireSchema, const std::string& wire);
+};//}}}
+class MessageConverter: public rsb::converter::Converter<std::string> {//{{{
+ public:
+ MessageConverter();
+ std::string serialize(const rsb::AnnotatedData& data, std::string& wire);
+ rsb::AnnotatedData deserialize(const std::string& wireSchema, const std::string& wire);
+};//}}}
+class IUPayloadUpdateConverter: public rsb::converter::Converter<std::string> {//{{{
+ public:
+ IUPayloadUpdateConverter();
+ std::string serialize(const rsb::AnnotatedData& data, std::string& wire);
+ rsb::AnnotatedData deserialize(const std::string& wireSchema, const std::string& wire);
+};//}}}
+class IULinkUpdateConverter: public rsb::converter::Converter<std::string> {//{{{
+ public:
+ IULinkUpdateConverter();
+ std::string serialize(const rsb::AnnotatedData& data, std::string& wire);
+ rsb::AnnotatedData deserialize(const std::string& wireSchema, const std::string& wire);
+};//}}}
+class IntConverter: public rsb::converter::Converter<std::string> {//{{{
+ public:
+ IntConverter();
+ std::string serialize(const rsb::AnnotatedData& data, std::string& wire);
+ rsb::AnnotatedData deserialize(const std::string& wireSchema, const std::string& wire);
+};//}}}
+#endif
+
+
// additional misc classes ( Command line options )//{{{
class CommandLineOptions {
public:
diff --git a/ipaacalib/cpp/src/ipaaca.cc b/ipaacalib/cpp/src/ipaaca.cc
index 06ef34c9a73933f1e56537d7039e59a243c07d9d..60281f40612ccfee893e38627e8ffd86a40a5701 100644
--- a/ipaacalib/cpp/src/ipaaca.cc
+++ b/ipaacalib/cpp/src/ipaaca.cc
@@ -20,8 +20,9 @@ bool Initializer::initialized() { return _initialized; }
void Initializer::initialize_ipaaca_rsb_if_needed()
{
if (_initialized) return;
- ParticipantConfig config = ParticipantConfig::fromConfiguration();
- Factory::getInstance().setDefaultParticipantConfig(config);
+ // RYT FIXME This configuration stuff has been simply removed in rsb!
+ //ParticipantConfig config = ParticipantConfig::fromConfiguration();
+ //Factory::getInstance().setDefaultParticipantConfig(config);
boost::shared_ptr<IUConverter> iu_converter(new IUConverter());
converterRepository<std::string>()->registerConverter(iu_converter);
diff --git a/resolve.sh b/resolve.sh
index 8a145de568dbc29304b1cedff832c944b05acb10..20cb33876932e906a4491c28dbfb4265791ab752 100755
--- a/resolve.sh
+++ b/resolve.sh
@@ -1,24 +1,20 @@
#!/bin/bash
-
-# This file is deprecated.
-# Resolution is performed automatically in the soa script.
-
+# This file has been auto-generated by the soa script.
eval "`grep '^REQUIRED=\|^OPTIONAL=' DEPS.txt`"
REQ="$REQUIRED"
OPT="$OPTIONAL"
-
shopt -q nullglob || resetnullglob=1
shopt -s nullglob
shopt -q dotglob || resetdotglob=1
shopt -s dotglob
-
+echo "[1mPerforming local resolution... [m"
mkdir -p deps/bin
mkdir -p deps/lib
mkdir -p deps/include
mkdir -p deps/scripts
mkdir -p deps/python
for P in $REQ $OPT; do
- echo "Importing from $P ..."
+ echo "[1mImporting from $P ...[m"
files=(../$P/dist/bin/*);
[ "$files" ] && cp -a ../$P/dist/bin/* deps/bin/
files=(../$P/dist/lib/*);
@@ -31,13 +27,21 @@ for P in $REQ $OPT; do
[ "$files" ] && for zipfile in ../$P/dist/python/*.zip; do
unzip -oqq $zipfile -d deps/python
done
+ files=(../$P/dist/*.cpp.zip);
+ [ "$files" ] && for zipfile in ../$P/dist/*.cpp.zip; do
+ unzip -oqq $zipfile -d deps/
+ done
files=(../$P/dist/*.py.zip);
[ "$files" ] && for zipfile in ../$P/dist/*.py.zip; do
unzip -oqq $zipfile -d deps/python
done
+ files=(../$P/dist/*.scripts.zip);
+ [ "$files" ] && for zipfile in ../$P/dist/*.scripts.zip; do
+ unzip -oqq $zipfile -d deps/scripts
+ done
+ chmod -R +x deps/bin
+ chmod -R +x deps/scripts
done
-echo "Done."
-
+echo "[1mDone.[m"
[ "$resetdotglob" ] && shopt -u dotglob
-[ "$resetnullglob" ] && shopt -u nullglob
-
+[ "$resetnullglob" ] && shopt -u nullglob