setsockopt cleanup in rbzmq

This commit is contained in:
malosek
2009-09-16 14:55:11 +02:00
parent 3534732c06
commit 3b2c3cae09
2 changed files with 37 additions and 59 deletions

View File

@@ -29,7 +29,7 @@ message_count = ARGV[2].to_i
ctx = Context.new(1, 1) ctx = Context.new(1, 1)
s = Socket.new(ctx, SUB); s = Socket.new(ctx, SUB);
s.setsockopt (SUBSCRIBE, "*"); s.setsockopt(SUBSCRIBE, "*");
# Add your socket options here. # Add your socket options here.
# For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM. # For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.

View File

@@ -83,74 +83,52 @@ static VALUE socket_initialize (VALUE self_, VALUE context_, VALUE type_)
return self_; return self_;
} }
/*
static VALUE rb_setsockopt (VALUE self_, VALUE socket_, VALUE option_, static VALUE socket_setsockopt (VALUE self_, VALUE option_,
VALUE optval_) VALUE optval_)
{ {
// Get the socket.
void* socket;
Data_Get_Struct (socket_, void*, socket);
int rc = 0; int rc = 0;
if (TYPE (optval_) == T_STRING) { switch (NUM2INT (option_)) {
case ZMQ_HWM:
case ZMQ_LWM:
case ZMQ_SWAP:
case ZMQ_AFFINITY:
case ZMQ_RATE:
case ZMQ_RECOVERY_IVL:
case ZMQ_MCAST_LOOP:
{
long optval = FIX2LONG (optval_);
// Forward the code to native 0MQ library. // Forward the code to native 0MQ library.
rc = zmq_setsockopt (socket, NUM2INT (option_), rc = zmq_setsockopt (DATA_PTR (self_), NUM2INT (option_),
(void *) StringValueCStr (optval_), RSTRING_LEN (optval_)); (void *) &optval, 4);
}
}
else if (TYPE (optval_) == T_FLOAT) {
double optval = NUM2DBL (optval_); break;
case ZMQ_IDENTITY:
// Forward the code to native 0MQ library. case ZMQ_SUBSCRIBE:
rc = zmq_setsockopt (socket, NUM2INT (option_), case ZMQ_UNSUBSCRIBE:
(void*) &optval, 8);
}
else if (TYPE (optval_) == T_FIXNUM) {
long optval = FIX2LONG (optval_); // Forward the code to native 0MQ library.
rc = zmq_setsockopt (DATA_PTR (self_), NUM2INT (option_),
// Forward the code to native 0MQ library. (void *) StringValueCStr (optval_), RSTRING_LEN (optval_));
rc = zmq_setsockopt (socket, NUM2INT (option_), break;
(void *) &optval, 4);
}
else if (TYPE (optval_) == T_BIGNUM) {
long optval = NUM2LONG (optval_); default:
rc = -1;
// Forward the code to native 0MQ library. errno = EINVAL;
rc = zmq_setsockopt (socket, NUM2INT (option_), }
(void *) &optval, 4);
}
else if (TYPE (optval_) == T_ARRAY) {
// Forward the code to native 0MQ library. if (rc != 0) {
rc = zmq_setsockopt (socket, NUM2INT (option_), rb_raise (rb_eRuntimeError, strerror (errno));
(void *) RARRAY_PTR (optval_), RARRAY_LEN (optval_)); return Qnil;
}
}
else if (TYPE (optval_) == T_STRUCT) {
// Forward the code to native 0MQ library.
rc = zmq_setsockopt (socket, NUM2INT (option_),
(void *) RSTRUCT_PTR (optval_), RSTRUCT_LEN (optval_));
}
else
rb_raise(rb_eRuntimeError, "Unknown type");
assert (rc == 0);
return self_; return self_;
} }
*/
static VALUE socket_bind (VALUE self_, VALUE addr_) static VALUE socket_bind (VALUE self_, VALUE addr_)
{ {
@@ -264,8 +242,8 @@ extern "C" void Init_librbzmq ()
rb_define_alloc_func (socket_type, socket_alloc); rb_define_alloc_func (socket_type, socket_alloc);
rb_define_method (socket_type, "initialize", rb_define_method (socket_type, "initialize",
(VALUE(*)(...)) socket_initialize, 2); (VALUE(*)(...)) socket_initialize, 2);
// rb_define_method (socket_type, "setsockopt", rb_define_method (socket_type, "setsockopt",
// (VALUE(*)(...)) socket_setsockopt, 2); (VALUE(*)(...)) socket_setsockopt, 2);
rb_define_method (socket_type, "bind", rb_define_method (socket_type, "bind",
(VALUE(*)(...)) socket_bind, 1); (VALUE(*)(...)) socket_bind, 1);
rb_define_method (socket_type, "connect", rb_define_method (socket_type, "connect",