From 54875050e24319dd8c7db6b8dbe5abea8f6ff3d6 Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Mon, 29 Mar 2021 22:45:12 +0200 Subject: [PATCH 1/3] LIB-14 Android build: Always include android/log.h not just on debug --- pEpLog.hh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pEpLog.hh b/pEpLog.hh index 16854bf..c5ea717 100644 --- a/pEpLog.hh +++ b/pEpLog.hh @@ -6,6 +6,9 @@ #include #include +#ifdef ANDROID + #include +#endif // pEpLog // ====== @@ -31,10 +34,6 @@ #ifdef NDEBUG #define pEpLog(msg) do{}while(0) #else - #ifdef ANDROID - #include - #endif - #define pEpLog(msg) \ do { \ std::stringstream msg_ss; \ From 9b4a3c78710ac7ffad145b1696e79d6dd4391733 Mon Sep 17 00:00:00 2001 From: heck Date: Tue, 30 Mar 2021 00:59:55 +0200 Subject: [PATCH 2/3] CI: DEPENDENCIES - libpEpAdapter does not specify engine version to be used. --- DEPENDENCIES | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index cc401dc..8f87b5f 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -1,5 +1,12 @@ # 1st Party Dependencies ## Prefer git tags instead of SHA hashes when possible. -pEpEngine=Release_2.1.23 -sequoia=365d00a08bec6a5a48d48a7c7893d78c27092b59 +# Change: +# libpEpAdapter does not specify any dependencies atm. +# libpEpAdapter is always being used as part of an adapter +# This adapter has to specify the pEpEngine version .e.g + + +# fdik: dep graph has to be taken from DEP file +# fdik: dependencies need to be resolved recursively from top to bottom +# fdik: stack then needs to be built from the bottom up From 9eb0b4c0326173922fed956160ddb8b820200967 Mon Sep 17 00:00:00 2001 From: heck Date: Tue, 30 Mar 2021 01:40:04 +0200 Subject: [PATCH 3/3] _inject_sync_event: undo the renaming for now. --- src/Adapter.cc | 14 +++++++------- src/Adapter.hh | 2 +- src/Adapter.hxx | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Adapter.cc b/src/Adapter.cc index cb1b4c3..95e3655 100644 --- a/src/Adapter.cc +++ b/src/Adapter.cc @@ -47,7 +47,7 @@ namespace pEp { ::messageToSend_t _messageToSend = nullptr; ::notifyHandshake_t _notifyHandshake = nullptr; bool _adapter_manages_sync_thread = false; - ::inject_sync_event_t _inject_action = _queue_sync_event; + ::inject_sync_event_t _inject_action = _inject_sync_event; std::thread _sync_thread; ::utility::locked_queue sync_evt_q; std::mutex mut; @@ -78,7 +78,7 @@ namespace pEp { // std::lock_guard lock(mut); _sync_mode = mode; if (_sync_mode == SyncModes::Sync) { - // init sesssion with inject_sync = process + // init session with inject_sync = process // stop sync session(release); _inject_action = _process_sync_event; @@ -94,7 +94,7 @@ namespace pEp { // init session with inject_sync = queue // start sync thread session(release); - _inject_action = _queue_sync_event; + _inject_action = _inject_sync_event; session(init); if(!_adapter_manages_sync_thread) { if (!is_sync_running()) { @@ -113,7 +113,7 @@ namespace pEp { // Adapter needs to shutdown sync thread } session(release); - _inject_action = _queue_sync_event; + _inject_action = _inject_sync_event; session(init); } return; @@ -130,8 +130,8 @@ namespace pEp { } } - // private - int _queue_sync_event(::SYNC_EVENT ev, void *management) + // public (json adapter needs it, but should use Session mgmt from libpEpAdapter eventually) + int _inject_sync_event(::SYNC_EVENT ev, void *management) { try { if (ev == nullptr) { @@ -207,7 +207,7 @@ namespace pEp { pEpLog("called"); if (_sync_thread.joinable()) { pEpLog("sync_is_running - injecting null event"); - _queue_sync_event(nullptr, nullptr); + _inject_sync_event(nullptr, nullptr); _sync_thread.join(); } } diff --git a/src/Adapter.hh b/src/Adapter.hh index e63b34a..7ab0dcd 100644 --- a/src/Adapter.hh +++ b/src/Adapter.hh @@ -42,7 +42,7 @@ namespace pEp { void set_sync_mode(SyncModes mode); - int _queue_sync_event(::SYNC_EVENT ev, void *management); + int _inject_sync_event(::SYNC_EVENT ev, void *management); int _process_sync_event(::SYNC_EVENT ev, void *management); ::PEP_STATUS _ensure_passphrase(::PEP_SESSION session, const char *fpr); diff --git a/src/Adapter.hxx b/src/Adapter.hxx index 80f4eb2..3878b2b 100644 --- a/src/Adapter.hxx +++ b/src/Adapter.hxx @@ -97,7 +97,7 @@ namespace pEp { /* * Sync Thread Startup - * 1. ensure session for the main thread (registers: messageToSend, _queue_sync_event, _ensure_passphrase) + * 1. ensure session for the main thread (registers: messageToSend, _inject_sync_event, _ensure_passphrase) * 2. Start the sync thread * 3. Defer execution until sync thread register_sync_callbacks() has returned * 4. Throw pending exception from the sync thread @@ -120,7 +120,7 @@ namespace pEp { _notifyHandshake = notifyHandshake; } pEpLog("ensure session for the main thread"); - // 1. re-initialize session for the main thread (registers: messageToSend, _queue_sync_event, _ensure_passphrase) + // 1. re-initialize session for the main thread (registers: messageToSend, _inject_sync_event, _ensure_passphrase) session(release); session(init);