Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #48 fix #49

Closed
wants to merge 5 commits into from
Closed

Issue #48 fix #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f2d95a
Use proper size_t.
okeuday Apr 8, 2011
006d8c4
Remove test that relied on zmq_term blocking for open sockets.
okeuday Apr 9, 2011
c5e6415
Merge remote branch 'zeromq/erlzmq2'
okeuday Mar 26, 2012
7455d13
Merge remote-tracking branch 'upstream/master'
okeuday Feb 9, 2013
9171c69
Add {active_pid, pid()} option to socket/2, which implies {active, tr…
okeuday Feb 9, 2013
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
13 changes: 10 additions & 3 deletions c_src/erlzmq_nif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ typedef struct erlzmq_socket {
int64_t socket_index;
void * socket_zmq;
int active;
ErlNifPid active_pid;
ErlNifMutex * mutex;
} erlzmq_socket_t;

Expand Down Expand Up @@ -114,7 +115,7 @@ static ERL_NIF_TERM return_zmq_errno(ErlNifEnv* env, int const value);
static ErlNifFunc nif_funcs[] =
{
{"context", 1, erlzmq_nif_context},
{"socket", 3, erlzmq_nif_socket},
{"socket", 4, erlzmq_nif_socket},
{"bind", 2, erlzmq_nif_bind},
{"connect", 2, erlzmq_nif_connect},
{"setsockopt", 3, erlzmq_nif_setsockopt},
Expand Down Expand Up @@ -179,6 +180,7 @@ NIF(erlzmq_nif_socket)
erlzmq_context_t * context;
int socket_type;
int active;
ErlNifPid active_pid;

if (! enif_get_resource(env, argv[0], erlzmq_nif_resource_context,
(void **) &context)) {
Expand All @@ -193,6 +195,10 @@ NIF(erlzmq_nif_socket)
return enif_make_badarg(env);
}

if (! enif_get_local_pid(env, argv[3], &active_pid)) {
return enif_make_badarg(env);
}

erlzmq_socket_t * socket = enif_alloc_resource(erlzmq_nif_resource_socket,
sizeof(erlzmq_socket_t));
assert(socket);
Expand All @@ -203,6 +209,7 @@ NIF(erlzmq_nif_socket)
return return_zmq_errno(env, zmq_errno());
}
socket->active = active;
socket->active_pid = active_pid;
socket->mutex = enif_mutex_create("erlzmq_socket_t_mutex");
assert(socket->mutex);

Expand Down Expand Up @@ -785,7 +792,7 @@ static void * polling_thread(void * handle)
{
enif_mutex_unlock(r->data.recv.socket->mutex);
if (r->data.recv.socket->active == ERLZMQ_SOCKET_ACTIVE_ON) {
enif_send(NULL, &r->data.recv.pid, r->data.recv.env,
enif_send(NULL, &r->data.recv.socket->active_pid, r->data.recv.env,
enif_make_tuple3(r->data.recv.env,
enif_make_atom(r->data.recv.env, "zmq"),
enif_make_tuple2(r->data.recv.env,
Expand Down Expand Up @@ -820,7 +827,7 @@ static void * polling_thread(void * handle)
flags_list = enif_make_list(r->data.recv.env, 0);
}

enif_send(NULL, &r->data.recv.pid, r->data.recv.env,
enif_send(NULL, &r->data.recv.socket->active_pid, r->data.recv.env,
enif_make_tuple4(r->data.recv.env,
enif_make_atom(r->data.recv.env, "zmq"),
enif_make_tuple2(r->data.recv.env,
Expand Down
13 changes: 9 additions & 4 deletions src/erlzmq.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ context(Threads) when is_integer(Threads) ->
-spec socket(Context :: erlzmq_context(),
Type :: erlzmq_socket_type() |
list(erlzmq_socket_type() |
{active, boolean()})) ->
{active, boolean()} |
{active_pid, pid()})) ->
{ok, erlzmq_socket()} |
erlzmq_error().
socket(Context, Type) when is_atom(Type) ->
Expand All @@ -108,14 +109,18 @@ socket(Context, [H | [Type]]) when is_tuple(H) ->

-spec socket(Context :: erlzmq_context(),
Type :: erlzmq_socket_type(),
{active, boolean()}) ->
{active, boolean()} | {active_pid, pid()}) ->
{ok, erlzmq_socket()} |
erlzmq_error().
socket(Context, Type, {active, true}) ->
true = (Type =/= pub) and (Type =/= push) and (Type =/= xpub),
erlzmq_nif:socket(Context, socket_type(Type), 1);
erlzmq_nif:socket(Context, socket_type(Type), 1, self());
socket(Context, Type, {active_pid, Pid})
when is_pid(Pid), node(Pid) =:= node() ->
true = (Type =/= pub) and (Type =/= push) and (Type =/= xpub),
erlzmq_nif:socket(Context, socket_type(Type), 1, Pid);
socket(Context, Type, {active, false}) ->
erlzmq_nif:socket(Context, socket_type(Type), 0).
erlzmq_nif:socket(Context, socket_type(Type), 0, self()).


%% @doc Accept connections on a socket.
Expand Down
4 changes: 2 additions & 2 deletions src/erlzmq_nif.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
-module(erlzmq_nif).

-export([context/1,
socket/3,
socket/4,
bind/2,
connect/2,
send/3,
Expand Down Expand Up @@ -37,7 +37,7 @@ init() ->
context(_Threads) ->
erlang:nif_error(not_loaded).

socket(_Context, _Type, _Active) ->
socket(_Context, _Type, _Active, _ActivePid) ->
erlang:nif_error(not_loaded).

bind(_Socket, _Endpoint) ->
Expand Down
3 changes: 1 addition & 2 deletions test/erlzmq_test.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ hwm_loop(N, S) ->
?assertMatch({error, _} ,erlzmq:send(S, <<"test">>, [noblock])),
hwm_loop(N-1, S).


pair_inproc_test() ->
basic_tests("inproc://tester", pair, pair, active),
basic_tests("inproc://tester", pair, pair, passive).
Expand Down Expand Up @@ -76,7 +75,7 @@ shutdown_stress_loop(N) ->
?assertMatch(ok, erlzmq:term(C)),
shutdown_stress_loop(N-1).

shutdown_no_blocking_test() ->
shutdown_test() ->
{ok, C} = erlzmq:context(),
{ok, S} = erlzmq:socket(C, [pub, {active, false}]),
erlzmq:close(S),
Expand Down