Commit 1b7c22ac authored by neverlord's avatar neverlord

updated gen_server and unit testing Makefile.am

parent f5fc8ca8
CXX = /opt/local/bin/g++-mp-4.6 CXX = /opt/local/bin/g++-mp-4.6
CXXFLAGS = -std=c++0x -pedantic -Wall -Wextra -I/opt/local/include/ -I/Users/neverlord/libcppa -fpermissive -O2 #CXX = /usr/bin/g++-4.6
LIBS = -L/opt/local/lib -lboost_thread-mt -L/Users/neverlord/libcppa/.libs/ -lcppa CXXFLAGS = -std=c++0x -pedantic -Wall -Wextra -I/opt/local/include/ -I../ -fpermissive -O2
LIBS = -L../.libs/ -lcppa -L/opt/local/lib -L/usr/lib -lboost_thread-mt
all: all:
$(CXX) $(CXXFLAGS) $(LIBS) -o sequential_send sequential_send.cpp $(CXX) $(CXXFLAGS) -o sequential_send sequential_send.cpp $(LIBS)
$(CXX) $(CXXFLAGS) $(LIBS) -o parallel_send parallel_send.cpp $(CXX) $(CXXFLAGS) -o parallel_send parallel_send.cpp $(LIBS)
...@@ -12,9 +12,9 @@ void counter_actor() ...@@ -12,9 +12,9 @@ void counter_actor()
long count = 0; long count = 0;
receive_loop receive_loop
( (
on<atom("Get")>() >> [&]() on<atom("Get"), actor_ptr>() >> [&](actor_ptr client)
{ {
reply(count); send(client, count);
count = 0; count = 0;
}, },
on<atom("AddCount"), long>() >> [&](long val) on<atom("AddCount"), long>() >> [&](long val)
...@@ -48,7 +48,7 @@ long the_test(int msg_count) ...@@ -48,7 +48,7 @@ long the_test(int msg_count)
{ {
receive(rule); receive(rule);
} }
send(counter, atom("Get")); send(counter, atom("Get"), self());
long result = 0; long result = 0;
receive receive
( (
......
...@@ -12,9 +12,9 @@ void counter_actor() ...@@ -12,9 +12,9 @@ void counter_actor()
long count = 0; long count = 0;
receive_loop receive_loop
( (
on<atom("Get")>() >> [&]() on<atom("Get"), actor_ptr>() >> [&](actor_ptr client)
{ {
reply(count); send(client, count);
count = 0; count = 0;
}, },
on<atom("AddCount"), long>() >> [&](long val) on<atom("AddCount"), long>() >> [&](long val)
...@@ -32,7 +32,7 @@ long the_test(int msg_count) ...@@ -32,7 +32,7 @@ long the_test(int msg_count)
{ {
send(counter, atom("AddCount"), val); send(counter, atom("AddCount"), val);
} }
send(counter, atom("Get")); send(counter, atom("Get"), self());
long result = 0; long result = 0;
receive receive
( (
......
...@@ -24,4 +24,4 @@ unit_tests_DEPENDENCIES = ../.libs/libcppa.la ...@@ -24,4 +24,4 @@ unit_tests_DEPENDENCIES = ../.libs/libcppa.la
AM_CPPFLAGS = -I../ AM_CPPFLAGS = -I../
unit_tests_CXXFLAGS = --std=c++0x -pedantic -Wall -Wextra unit_tests_CXXFLAGS = --std=c++0x -pedantic -Wall -Wextra
AM_LDFLAGS = $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB) -L../.libs/ -lcppa unit_tests_LDADD = $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB) -L../.libs/ -lcppa
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