Skip to content
Snippets Groups Projects
Commit ef99900e authored by Eric Müller's avatar Eric Müller :mountain_bicyclist:
Browse files

Fixes for new log4cxx

Depends-On: topic:update_log4cxx, topic:spack_0.18.1
In-Container: /containers/testing/c17764p47_2022-11-26_1.img
Change-Id: I9cf6d3db35fef3410bcb3059fbf8e8acb84052da
parent c0fbb34c
No related branches found
No related tags found
No related merge requests found
......@@ -23,6 +23,7 @@
namespace log4cxx {
class Logger;
typedef std::shared_ptr<Logger> LoggerPtr;
} // namespace log4cxx
namespace hxcomm {
......@@ -248,7 +249,7 @@ private:
std::atomic<bool> m_run_receive;
log4cxx::Logger* m_logger;
log4cxx::LoggerPtr m_logger;
void work_receive();
std::thread m_worker_receive;
......
#pragma once
#include "hxcomm/common/utmessage.h"
#include <climits>
#include <memory>
#include <boost/fusion/tuple.hpp>
namespace log4cxx {
class Logger;
typedef std::shared_ptr<Logger> LoggerPtr;
} // namespace log4cxx
namespace hxcomm {
......@@ -139,7 +141,7 @@ private:
template <size_t... Header>
void decode_message_table_generator(size_t header, std::index_sequence<Header...>);
log4cxx::Logger* m_logger;
log4cxx::LoggerPtr m_logger;
enum class State
{
......
#pragma once
#include "hxcomm/common/utmessage.h"
#include <climits>
#include <memory>
#include <stdint.h>
namespace log4cxx {
class Logger;
typedef std::shared_ptr<Logger> LoggerPtr;
} // namespace log4cxx
namespace hxcomm {
......@@ -107,7 +109,7 @@ private:
word_queue_type& m_word_queue;
log4cxx::Logger* m_logger;
log4cxx::LoggerPtr m_logger;
};
} // namespace hxcomm
......
......@@ -77,7 +77,7 @@ detail::execute_messages_return_t<Connection> execute_messages(
Connection& connection, detail::execute_messages_argument_t<Connection> const& messages)
{
auto const [res, time] = detail::ExecutorMessages<Connection>()(connection, messages);
[[maybe_unused]] log4cxx::Logger* log = log4cxx::Logger::getLogger("hxcomm.execute_messages");
[[maybe_unused]] log4cxx::LoggerPtr log = log4cxx::Logger::getLogger("hxcomm.execute_messages");
HXCOMM_LOG_INFO(
log, "Executed messages(" << messages.size() << ") and got responses(" << res.size()
<< ") with time expenditure: " << std::endl
......
......@@ -14,6 +14,7 @@
#include "RCF/RCF.hpp"
#include <chrono>
#include <memory>
#include <string>
#include <vector>
#include <boost/uuid/uuid.hpp>
......@@ -24,7 +25,7 @@
namespace log4cxx {
class Logger;
typedef std::shared_ptr<Logger> LoggerPtr;
} // namespace log4cxx
namespace hxcomm {
......@@ -310,7 +311,7 @@ protected:
connect_parameters_type m_connect_parameters;
size_t m_connection_attempt_num_max;
std::chrono::milliseconds m_connection_attempt_wait_after;
log4cxx::Logger* m_logger;
log4cxx::LoggerPtr m_logger;
bool m_use_munge;
boost::uuids::uuid m_session_uuid;
std::shared_ptr<reinit_uploader_type> m_reinit_uploader;
......
......@@ -18,6 +18,7 @@
namespace log4cxx {
class Logger;
typedef std::shared_ptr<Logger> LoggerPtr;
} // namespace log4cxx
......@@ -238,7 +239,7 @@ protected:
bool m_allocate_license;
bool m_mock_mode;
std::unique_ptr<Connection> m_connection; /// Wrapped connection object.
log4cxx::Logger* m_logger;
log4cxx::LoggerPtr m_logger;
bool m_use_munge;
std::size_t m_max_num_connection_attempts;
std::chrono::milliseconds m_delay_after_connection_attempt;
......
#pragma once
#include "hxcomm/common/quiggeldy_interface_types.h"
#include <memory>
#include <thread>
namespace hxcomm {
......@@ -78,7 +79,7 @@ public:
void upload(UploaderT&) const;
private:
log4cxx::Logger* m_logger;
log4cxx::LoggerPtr m_logger;
mutable std::mutex m_mutex;
reinit_type m_stack;
......
......@@ -92,7 +92,7 @@ public:
void pop();
private:
log4cxx::Logger* m_logger;
log4cxx::LoggerPtr m_logger;
bool m_connection_supports_reinit;
std::weak_ptr<reinit_uploader_type> m_reinit_uploader;
std::weak_ptr<reinit_stack_type> m_reinit_stack;
......
......@@ -26,6 +26,7 @@
namespace log4cxx {
class Logger;
typedef std::shared_ptr<Logger> LoggerPtr;
} // namespace log4cxx
namespace hxcomm {
......@@ -237,7 +238,7 @@ private:
duration_type m_execution_duration{};
bool m_terminate_on_destruction;
log4cxx::Logger* m_logger;
log4cxx::LoggerPtr m_logger;
struct ResetHaltListener
{
......
......@@ -6,6 +6,8 @@ namespace log4cxx {
class Logger;
typedef std::shared_ptr<Logger> LoggerPtr;
} // namespace log4cxx
namespace pyhxcomm {
......@@ -82,7 +84,7 @@ private:
void setup_logger();
log4cxx::Logger* m_logger;
log4cxx::LoggerPtr m_logger;
/**
* Disconnect (i.e. destruct) connection early.
......
......@@ -14,6 +14,8 @@ namespace log4cxx {
class Logger;
typedef std::shared_ptr<Logger> LoggerPtr;
} // namespace log4cxx
namespace pyhxcomm {
......@@ -106,7 +108,7 @@ private:
void setup_logger();
log4cxx::Logger* m_logger;
log4cxx::LoggerPtr m_logger;
};
namespace detail {
......@@ -181,7 +183,7 @@ private:
void setup_logger();
log4cxx::Logger* m_logger;
log4cxx::LoggerPtr m_logger;
};
/**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment