Commit fdef7f32 authored by Neverlord's avatar Neverlord

fixed logging issues in OpenCL build, closes #119

parent a0d0f67c
...@@ -45,6 +45,8 @@ ...@@ -45,6 +45,8 @@
#include "cppa/message_header.hpp" #include "cppa/message_header.hpp"
#include "cppa/system_messages.hpp" #include "cppa/system_messages.hpp"
#include "cppa/io/middleman.hpp"
#include "cppa/util/shared_spinlock.hpp" #include "cppa/util/shared_spinlock.hpp"
#include "cppa/util/shared_lock_guard.hpp" #include "cppa/util/shared_lock_guard.hpp"
...@@ -64,7 +66,9 @@ abstract_actor::abstract_actor(actor_id aid) ...@@ -64,7 +66,9 @@ abstract_actor::abstract_actor(actor_id aid)
abstract_actor::abstract_actor() abstract_actor::abstract_actor()
: m_id(get_actor_registry()->next_id()), m_is_proxy(false) : m_id(get_actor_registry()->next_id()), m_is_proxy(false)
, m_exit_reason(exit_reason::not_exited) { } , m_exit_reason(exit_reason::not_exited) {
m_node = get_middleman()->node();
}
bool abstract_actor::link_to_impl(const actor_addr& other) { bool abstract_actor::link_to_impl(const actor_addr& other) {
if (other && other != this) { if (other && other != this) {
......
...@@ -97,9 +97,11 @@ void opencl_metainfo::initialize() ...@@ -97,9 +97,11 @@ void opencl_metainfo::initialize()
const void *, const void *,
size_t, size_t,
void *) { void *) {
CPPA_LOG_ERROR("\n##### Error message via pfn_notify #####\n" + CPPA_LOGC_ERROR("cppa::opencl::opencl_metainfo",
string(errinfo) + "initialize",
"\n########################################"); "\n##### Error message via pfn_notify #####\n" +
string(errinfo) +
"\n########################################");
}; };
// create a context // create a context
......
...@@ -122,6 +122,10 @@ class square_matrix { ...@@ -122,6 +122,10 @@ class square_matrix {
static constexpr size_t num_elements = Size * Size; static constexpr size_t num_elements = Size * Size;
static void announce() {
cppa::announce<square_matrix>(&square_matrix::m_data);
}
square_matrix(square_matrix&&) = default; square_matrix(square_matrix&&) = default;
square_matrix(const square_matrix&) = default; square_matrix(const square_matrix&) = default;
square_matrix& operator=(square_matrix&&) = default; square_matrix& operator=(square_matrix&&) = default;
...@@ -310,7 +314,7 @@ int main() { ...@@ -310,7 +314,7 @@ int main() {
CPPA_TEST(test_opencl); CPPA_TEST(test_opencl);
announce<ivec>(); announce<ivec>();
announce<matrix_type>(); matrix_type::announce();
test_opencl(); test_opencl();
await_all_actors_done(); await_all_actors_done();
......
Markdown is supported
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