Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class SOFA_CORE_API PerComponentLoggingMessageHandler : public MessageHandler

/// Inherited from MessageHandler
void process(Message& m) override ;
std::string getName() const override { return "PerComponentLoggingMessageHandler"; }
} ;

///
Expand Down
1 change: 1 addition & 0 deletions Sofa/framework/Core/test/visual/DisplayFlags_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ class RAIIPerComponentLoggingMessageHandler : public helper::logging::PerCompone
{
helper::logging::MessageDispatcher::rmHandler(this);
}
std::string getName() const override { return "RAIIPerComponentLoggingMessageHandler"; }
};

TEST(DisplayFlags, readFromObject)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class SOFA_HELPER_API ClangMessageHandler : public MessageHandler
{
public:
void process(Message &m) override ;
std::string getName() const override { return "ClangMessageHandler"; }
};
} // namespace sofa::helper::logging

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class SOFA_HELPER_API ConsoleMessageHandler : public MessageHandler
/// DefaultStyleMessageFormatter object to format the message.
ConsoleMessageHandler(MessageFormatter* formatter = nullptr);
void process(Message &m) override ;
std::string getName() const override { return "ConsoleMessageHandler"; }
void setMessageFormatter( MessageFormatter* formatter );

private:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class SOFA_HELPER_API CountingMessageHandler : public MessageHandler

/// Inherited from MessageHandler
void process(Message& m) override ;
std::string getName() const override { return "CountingMessageHandler"; }
private:
std::vector<int> m_countMatching ;
} ;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class SOFA_HELPER_API ExceptionMessageHandler : public MessageHandler


void process(Message &m) override;

std::string getName() const override { return "ExceptionMessageHandler"; }
};
} // namespace sofa::helper::logging

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class SOFA_HELPER_API FileMessageHandler : public MessageHandler

~FileMessageHandler() override;
void process(Message& m) override ;
std::string getName() const override { return "FileMessageHandler"; }

bool isValid(); // is output file ok ?

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ class SOFA_HELPER_API LoggingMessageHandler : public MessageHandler
/// Inherited from MessageHandler
void process(Message& m) override ;

std::string getName() const override { return "LoggingMessageHandler"; }

private:
int m_activationCount {0};
vector<Message> m_messages ;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class SOFA_HELPER_API MessageHandler
public:
virtual ~MessageHandler(){}
virtual void process(Message& m) = 0 ;
virtual std::string getName() const = 0;
};


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ class SOFA_HELPER_API RoutingMessageHandler : public MessageHandler

/// Inherited from MessageHandler
void process(Message& m) override ;
std::string getName() const override { return "RoutingMessageHandler"; }

private:
std::vector<std::pair<FilterFunction, MessageHandler*> > m_filters;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class SOFA_HELPER_API SilentMessageHandler : public MessageHandler
{
public:
void process(Message& /*m*/) override;
std::string getName() const override { return "SilentMessageHandler"; }
};


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ class SOFA_HELPER_API TracyMessageHandler : public MessageHandler
TracyMessageHandler(MessageFormatter* formatter = nullptr);
void process(Message &m) override ;
void setMessageFormatter( MessageFormatter* formatter );
std::string getName() const override { return "TracyMessageHandler"; }

private:
private:
MessageFormatter *m_formatter { nullptr };

};
Expand Down
17 changes: 17 additions & 0 deletions Sofa/framework/Helper/test/logging/logging_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ class MyMessageHandler : public MessageHandler
m_messages.push_back(m);
}

std::string getName() const override { return "MyMessageHandler" ; }

size_t numMessages(){
return m_messages.size() ;
}
Expand All @@ -89,6 +91,7 @@ TEST(LoggingTest, noHandler)
{
// This test does not test anything, except the absence of crash
MessageDispatcher::clearHandlers() ;
ASSERT_EQ(MessageDispatcher::getHandlers().size(), 0);

msg_info("") << " info message with conversion" << 1.5 << "\n" ;
msg_deprecated("") << " deprecated message with conversion" << 1.5 << "\n" ;
Expand Down Expand Up @@ -134,6 +137,20 @@ TEST(LoggingTest, duplicatedHandler)
EXPECT_TRUE( h.numMessages() == 4u) ;
}

TEST(LoggingTest, rmHandler)
{
MessageDispatcher::clearHandlers();

MyMessageHandler h;

// First add is expected to return the handler ID.
EXPECT_TRUE(MessageDispatcher::addHandler(&h) == 0);

EXPECT_EQ(MessageDispatcher::rmHandler(&h), -1);

EXPECT_EQ(MessageDispatcher::getHandlers().size(), 0);
}

void f1()
{
for(unsigned int i=0;i<100000;i++){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ class SOFA_TESTING_API GtestMessageHandler : public MessageHandler

/// Inherited from MessageHandler
void process(Message& m) override ;
std::string getName() const override { return "GtestMessageHandler"; }

void pushFrame(Message::Type type, GtestMessageFrame* frame) ;
void popFrame(Message::Type type) ;
};
Expand Down
Loading