diff --git a/fairmq/shmem/Common.h b/fairmq/shmem/Common.h index ed35016f..b17c3882 100644 --- a/fairmq/shmem/Common.h +++ b/fairmq/shmem/Common.h @@ -180,7 +180,6 @@ struct RegionInfo , fUserFlags(userFlags) , fSize(size) , fRCSegmentSize(rcSegmentSize) - , fDestroyed(false) {} Str fPath; @@ -188,7 +187,7 @@ struct RegionInfo uint64_t fUserFlags; uint64_t fSize; uint64_t fRCSegmentSize; - bool fDestroyed; + bool fDestroyed{false}; }; using Uint16RegionInfoPairAlloc = boost::interprocess::allocator, SegmentManager>; diff --git a/fairmq/shmem/Monitor.cxx b/fairmq/shmem/Monitor.cxx index b996caac..3a796dd8 100644 --- a/fairmq/shmem/Monitor.cxx +++ b/fairmq/shmem/Monitor.cxx @@ -59,12 +59,18 @@ void signalHandler(int signal) gSignalStatus = signal; } -Monitor::Monitor(string shmId, bool selfDestruct, bool interactive, bool viewOnly, unsigned int timeoutInMS, unsigned int intervalInMS, bool monitor, bool cleanOnExit) +Monitor::Monitor(string shmId, + bool selfDestruct, + bool interactive, + bool viewOnly, + unsigned int timeoutInMS, + unsigned int intervalInMS, + bool monitor, + bool cleanOnExit) : fSelfDestruct(selfDestruct) , fInteractive(interactive) , fViewOnly(viewOnly) , fMonitor(monitor) - , fSeenOnce(false) , fCleanOnExit(cleanOnExit) , fTimeoutInMS(timeoutInMS) , fIntervalInMS(intervalInMS) diff --git a/fairmq/shmem/Monitor.h b/fairmq/shmem/Monitor.h index 39f34c34..5e346b98 100644 --- a/fairmq/shmem/Monitor.h +++ b/fairmq/shmem/Monitor.h @@ -170,7 +170,7 @@ class Monitor bool fInteractive; // running in interactive mode bool fViewOnly; // view only mode bool fMonitor; - bool fSeenOnce; // true is segment has been opened successfully at least once + bool fSeenOnce{false}; // true is segment has been opened successfully at least once bool fCleanOnExit; unsigned int fTimeoutInMS; unsigned int fIntervalInMS; diff --git a/fairmq/shmem/Socket.h b/fairmq/shmem/Socket.h index 2daa6fd1..7db8b988 100644 --- a/fairmq/shmem/Socket.h +++ b/fairmq/shmem/Socket.h @@ -39,18 +39,19 @@ namespace fair::mq::shmem class Socket final : public fair::mq::Socket { public: - Socket(Manager& manager, const std::string& type, const std::string& name, const std::string& id, void* context, fair::mq::TransportFactory* fac = nullptr) + Socket(Manager& manager, + const std::string& type, + const std::string& name, + const std::string& id, + void* context, + fair::mq::TransportFactory* fac = nullptr) : fair::mq::Socket(fac) , fManager(manager) , fId(id + "." + name + "." + type) - , fSocket(nullptr) - , fMonitorSocket(nullptr) , fBytesTx(0) , fBytesRx(0) , fMessagesTx(0) , fMessagesRx(0) - , fTimeout(100) - , fConnectedPeersCount(0) , fMetadataMsgSize(manager.GetMetadataMsgSize()) { assert(context); @@ -456,15 +457,15 @@ class Socket final : public fair::mq::Socket private: Manager& fManager; std::string fId; - void* fSocket; - void* fMonitorSocket; + void* fSocket{nullptr}; + void* fMonitorSocket{nullptr}; std::atomic fBytesTx; std::atomic fBytesRx; std::atomic fMessagesTx; std::atomic fMessagesRx; - int fTimeout; - mutable unsigned long fConnectedPeersCount; + int fTimeout{100}; + mutable unsigned long fConnectedPeersCount{0}; std::size_t fMetadataMsgSize; }; diff --git a/fairmq/shmem/UnmanagedRegionImpl.h b/fairmq/shmem/UnmanagedRegionImpl.h index b9048b3d..e33d737e 100644 --- a/fairmq/shmem/UnmanagedRegionImpl.h +++ b/fairmq/shmem/UnmanagedRegionImpl.h @@ -37,8 +37,6 @@ class UnmanagedRegionImpl final : public fair::mq::UnmanagedRegion fair::mq::TransportFactory* factory) : fair::mq::UnmanagedRegion(factory) , fManager(manager) - , fRegion(nullptr) - , fRegionId(0) { auto [regionPtr, regionId] = fManager.CreateRegion(size, callback, bulkCallback, std::move(cfg)); fRegion = regionPtr; @@ -62,8 +60,8 @@ class UnmanagedRegionImpl final : public fair::mq::UnmanagedRegion private: Manager& fManager; - shmem::UnmanagedRegion* fRegion; - uint16_t fRegionId; + shmem::UnmanagedRegion* fRegion{nullptr}; + uint16_t fRegionId{0}; }; } // namespace fair::mq::shmem diff --git a/fairmq/zeromq/Context.h b/fairmq/zeromq/Context.h index a02b6794..9818cbff 100644 --- a/fairmq/zeromq/Context.h +++ b/fairmq/zeromq/Context.h @@ -37,7 +37,6 @@ class Context Context(int numIoThreads) : fZmqCtx(zmq_ctx_new()) , fInterrupted(false) - , fRegionCounter(1) { if (!fZmqCtx) { throw ContextError(tools::ToString("failed creating context, reason: ", zmq_strerror(errno))); @@ -180,7 +179,7 @@ class Context mutable std::mutex fMtx; std::atomic fInterrupted; - uint16_t fRegionCounter; + uint16_t fRegionCounter{1}; std::condition_variable fRegionEventsCV; std::vector fRegionInfos; std::queue fRegionEvents; diff --git a/fairmq/zeromq/Socket.h b/fairmq/zeromq/Socket.h index 345df77b..6b48b653 100644 --- a/fairmq/zeromq/Socket.h +++ b/fairmq/zeromq/Socket.h @@ -41,8 +41,7 @@ class Socket final : public fair::mq::Socket , fBytesRx(0) , fMessagesTx(0) , fMessagesRx(0) - , fTimeout(100) - , fConnectedPeersCount(0) + { if (fSocket == nullptr) { LOG(error) << "Failed creating socket " << fId << ", reason: " << zmq_strerror(errno); @@ -405,8 +404,8 @@ class Socket final : public fair::mq::Socket std::atomic fMessagesTx; std::atomic fMessagesRx; - int fTimeout; - mutable unsigned long fConnectedPeersCount; + int fTimeout{100}; + mutable unsigned long fConnectedPeersCount{0}; }; } // namespace fair::mq::zmq