From ea0a44c8a964cad4276ec216319d32e95e4a4bc0 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Sat, 27 Feb 2010 14:18:02 +0100 Subject: Ruby binding removed --- bindings/Makefile.am | 8 +- bindings/ruby/Makefile.am | 11 -- bindings/ruby/extconf.rb | 28 ----- bindings/ruby/rbzmq.cpp | 288 ---------------------------------------------- 4 files changed, 2 insertions(+), 333 deletions(-) delete mode 100644 bindings/ruby/Makefile.am delete mode 100644 bindings/ruby/extconf.rb delete mode 100644 bindings/ruby/rbzmq.cpp (limited to 'bindings') diff --git a/bindings/Makefile.am b/bindings/Makefile.am index bb51360..a923153 100644 --- a/bindings/Makefile.am +++ b/bindings/Makefile.am @@ -2,10 +2,6 @@ if BUILD_JAVA DIR_J = java endif -if BUILD_RUBY -DIR_R = ruby -endif - -SUBDIRS = $(DIR_J) $(DIR_R) -DIST_SUBDIRS = java ruby +SUBDIRS = $(DIR_J) +DIST_SUBDIRS = java diff --git a/bindings/ruby/Makefile.am b/bindings/ruby/Makefile.am deleted file mode 100644 index 148daf0..0000000 --- a/bindings/ruby/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/include -I$(top_builddir)/include - -rblib_LTLIBRARIES = librbzmq.la -rblibdir = @RUBYDIR@ - -librbzmq_la_SOURCES = rbzmq.cpp - -librbzmq_la_LDFLAGS = -version-info @RBLTVER@ -librbzmq_la_CXXFLAGS = -Wall -pedantic -Werror -Wno-long-long -librbzmq_la_LIBADD = $(top_builddir)/src/libzmq.la - diff --git a/bindings/ruby/extconf.rb b/bindings/ruby/extconf.rb deleted file mode 100644 index 30c70fb..0000000 --- a/bindings/ruby/extconf.rb +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (c) 2007-2010 iMatix Corporation -# -# This file is part of 0MQ. -# -# 0MQ is free software; you can redistribute it and/or modify it under -# the terms of the Lesser GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# 0MQ is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# Lesser GNU General Public License for more details. -# -# You should have received a copy of the Lesser GNU General Public License -# along with this program. If not, see . - -require 'mkmf' -dir_config('libzmq') -if have_library('libzmq', 'zmq_init') - puts "Cool, I found your zmq install..." - create_makefile("zmq") -else - raise "Couldn't find zmq library. try setting --with-zmq-dir= to tell me where it is." -end - - diff --git a/bindings/ruby/rbzmq.cpp b/bindings/ruby/rbzmq.cpp deleted file mode 100644 index 1a31f6b..0000000 --- a/bindings/ruby/rbzmq.cpp +++ /dev/null @@ -1,288 +0,0 @@ -/* - Copyright (c) 2007-2010 iMatix Corporation - - This file is part of 0MQ. - - 0MQ is free software; you can redistribute it and/or modify it under - the terms of the Lesser GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - 0MQ is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - Lesser GNU General Public License for more details. - - You should have received a copy of the Lesser GNU General Public License - along with this program. If not, see . -*/ - -#include -#include -#include - -#include "../c/zmq.h" - -static void context_free (void *ctx) -{ - if (ctx) { - int rc = zmq_term (ctx); - assert (rc == 0); - } -} - -static VALUE context_alloc (VALUE class_) -{ - return rb_data_object_alloc (class_, NULL, 0, context_free); -} - -static VALUE context_initialize (VALUE self_, VALUE app_threads_, - VALUE io_threads_, VALUE flags_) -{ - assert (!DATA_PTR (self_)); - void *ctx = zmq_init (NUM2INT (app_threads_), NUM2INT (io_threads_), - NUM2INT (flags_)); - if (!ctx) { - rb_raise (rb_eRuntimeError, zmq_strerror (zmq_errno ())); - return Qnil; - } - - DATA_PTR (self_) = (void*) ctx; - return self_; -} - -static void socket_free (void *s) -{ - if (s) { - int rc = zmq_close (s); - assert (rc == 0); - } -} - -static VALUE socket_alloc (VALUE class_) -{ - return rb_data_object_alloc (class_, NULL, 0, socket_free); -} - -static VALUE socket_initialize (VALUE self_, VALUE context_, VALUE type_) -{ - assert (!DATA_PTR (self_)); - - if (strcmp (rb_obj_classname (context_), "ZMQ::Context") != 0) { - rb_raise (rb_eArgError, "expected ZMQ::Context object"); - return Qnil; - } - - void *s = zmq_socket (DATA_PTR (context_), NUM2INT (type_)); - if (!s) { - rb_raise (rb_eRuntimeError, zmq_strerror (zmq_errno ())); - return Qnil; - } - - DATA_PTR (self_) = (void*) s; - return self_; -} - - -static VALUE socket_setsockopt (VALUE self_, VALUE option_, - VALUE optval_) -{ - - int rc = 0; - - 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. - rc = zmq_setsockopt (DATA_PTR (self_), NUM2INT (option_), - (void *) &optval, 4); - } - break; - - case ZMQ_IDENTITY: - case ZMQ_SUBSCRIBE: - case ZMQ_UNSUBSCRIBE: - - // Forward the code to native 0MQ library. - rc = zmq_setsockopt (DATA_PTR (self_), NUM2INT (option_), - (void *) StringValueCStr (optval_), RSTRING_LEN (optval_)); - break; - - default: - rb_raise (rb_eRuntimeError, zmq_strerror (EINVAL)); - return Qnil; - } - - if (rc != 0) { - rb_raise (rb_eRuntimeError, zmq_strerror (zmq_errno ())); - return Qnil; - } - - return self_; -} - - -static VALUE socket_bind (VALUE self_, VALUE addr_) -{ - assert (DATA_PTR (self_)); - - int rc = zmq_bind (DATA_PTR (self_), rb_string_value_cstr (&addr_)); - if (rc != 0) { - rb_raise (rb_eRuntimeError, zmq_strerror (zmq_errno ())); - return Qnil; - } - - return Qnil; -} - -static VALUE socket_connect (VALUE self_, VALUE addr_) -{ - assert (DATA_PTR (self_)); - - int rc = zmq_connect (DATA_PTR (self_), rb_string_value_cstr (&addr_)); - if (rc != 0) { - rb_raise (rb_eRuntimeError, zmq_strerror (zmq_errno ())); - return Qnil; - } - - return Qnil; -} - -static VALUE socket_send (VALUE self_, VALUE msg_, VALUE flags_) -{ - assert (DATA_PTR (self_)); - - Check_Type (msg_, T_STRING); - - zmq_msg_t msg; - int rc = zmq_msg_init_size (&msg, RSTRING_LEN (msg_)); - if (rc != 0) { - rb_raise (rb_eRuntimeError, zmq_strerror (zmq_errno ())); - return Qnil; - } - memcpy (zmq_msg_data (&msg), RSTRING_PTR (msg_), RSTRING_LEN (msg_)); - - rc = zmq_send (DATA_PTR (self_), &msg, NUM2INT (flags_)); - if (rc != 0 && zmq_errno () == EAGAIN) { - rc = zmq_msg_close (&msg); - assert (rc == 0); - return Qfalse; - } - - if (rc != 0) { - rb_raise (rb_eRuntimeError, zmq_strerror (zmq_errno ())); - rc = zmq_msg_close (&msg); - assert (rc == 0); - return Qnil; - } - - rc = zmq_msg_close (&msg); - assert (rc == 0); - return Qtrue; -} - -static VALUE socket_flush (VALUE self_) -{ - assert (DATA_PTR (self_)); - - int rc = zmq_flush (DATA_PTR (self_)); - if (rc != 0) { - rb_raise (rb_eRuntimeError, zmq_strerror (zmq_errno ())); - return Qnil; - } - - return Qnil; -} - -static VALUE socket_recv (VALUE self_, VALUE flags_) -{ - assert (DATA_PTR (self_)); - - zmq_msg_t msg; - int rc = zmq_msg_init (&msg); - assert (rc == 0); - - rc = zmq_recv (DATA_PTR (self_), &msg, NUM2INT (flags_)); - if (rc != 0 && zmq_errno () == EAGAIN) { - rc = zmq_msg_close (&msg); - assert (rc == 0); - return Qnil; - } - - if (rc != 0) { - rb_raise (rb_eRuntimeError, zmq_strerror (zmq_errno ())); - rc = zmq_msg_close (&msg); - assert (rc == 0); - return Qnil; - } - - VALUE message = rb_str_new ((char*) zmq_msg_data (&msg), - zmq_msg_size (&msg)); - rc = zmq_msg_close (&msg); - assert (rc == 0); - return message; -} - -extern "C" void Init_librbzmq () -{ - VALUE zmq_module = rb_define_module ("ZMQ"); - VALUE context_type = rb_define_class_under (zmq_module, "Context", - rb_cObject); - rb_define_alloc_func (context_type, context_alloc); - rb_define_method (context_type, "initialize", - (VALUE(*)(...)) context_initialize, 3); - - VALUE socket_type = rb_define_class_under (zmq_module, "Socket", - rb_cObject); - rb_define_alloc_func (socket_type, socket_alloc); - rb_define_method (socket_type, "initialize", - (VALUE(*)(...)) socket_initialize, 2); - rb_define_method (socket_type, "setsockopt", - (VALUE(*)(...)) socket_setsockopt, 2); - rb_define_method (socket_type, "bind", - (VALUE(*)(...)) socket_bind, 1); - rb_define_method (socket_type, "connect", - (VALUE(*)(...)) socket_connect, 1); - rb_define_method (socket_type, "send", - (VALUE(*)(...)) socket_send, 2); - rb_define_method (socket_type, "flush", - (VALUE(*)(...)) socket_flush, 0); - rb_define_method (socket_type, "recv", - (VALUE(*)(...)) socket_recv, 1); - - rb_define_const (zmq_module, "HWM", INT2NUM (ZMQ_HWM)); - rb_define_const (zmq_module, "LWM", INT2NUM (ZMQ_LWM)); - rb_define_const (zmq_module, "SWAP", INT2NUM (ZMQ_SWAP)); - rb_define_const (zmq_module, "AFFINITY", INT2NUM (ZMQ_AFFINITY)); - rb_define_const (zmq_module, "IDENTITY", INT2NUM (ZMQ_IDENTITY)); - rb_define_const (zmq_module, "SUBSCRIBE", INT2NUM (ZMQ_SUBSCRIBE)); - rb_define_const (zmq_module, "UNSUBSCRIBE", INT2NUM (ZMQ_UNSUBSCRIBE)); - rb_define_const (zmq_module, "RATE", INT2NUM (ZMQ_RATE)); - rb_define_const (zmq_module, "RECOVERY_IVL", INT2NUM (ZMQ_RECOVERY_IVL)); - rb_define_const (zmq_module, "MCAST_LOOP", INT2NUM (ZMQ_MCAST_LOOP)); - rb_define_const (zmq_module, "SNDBUF", INT2NUM (ZMQ_SNDBUF)); - rb_define_const (zmq_module, "RCVBUF", INT2NUM (ZMQ_RCVBUF)); - - rb_define_const (zmq_module, "NOBLOCK", INT2NUM (ZMQ_NOBLOCK)); - rb_define_const (zmq_module, "NOFLUSH", INT2NUM (ZMQ_NOFLUSH)); - - rb_define_const (zmq_module, "P2P", INT2NUM (ZMQ_P2P)); - rb_define_const (zmq_module, "SUB", INT2NUM (ZMQ_SUB)); - rb_define_const (zmq_module, "PUB", INT2NUM (ZMQ_PUB)); - rb_define_const (zmq_module, "REQ", INT2NUM (ZMQ_REQ)); - rb_define_const (zmq_module, "REP", INT2NUM (ZMQ_REP)); - rb_define_const (zmq_module, "XREQ", INT2NUM (ZMQ_XREQ)); - rb_define_const (zmq_module, "XREP", INT2NUM (ZMQ_XREP)); - rb_define_const (zmq_module, "UPSTREAM", INT2NUM (ZMQ_UPSTREAM)); - rb_define_const (zmq_module, "DOWNSTREAM", INT2NUM (ZMQ_DOWNSTREAM)); - - rb_define_const (zmq_module, "POLL", INT2NUM (ZMQ_POLL)); -} -- cgit v1.2.3