couchbase 1.3.10 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 759661b05e920c3d62cc5983ce81f984779f4246
-  data.tar.gz: 7d34726c1916b7abdb13b53c90d3ec89c15d211c
+  metadata.gz: d306fbc4b3da87a77da5ba54614b55a6c461c489
+  data.tar.gz: 8b34013f1f1cab6e859a84c5dbfe9a9cab26515f
 SHA512:
-  metadata.gz: ccb69b2d1a2cb30ce956ff9a787b4cc3507ca071683f5eb787e32340b104559790b55015d44cb431a2e1359fcff649359513f9f6d4fdcded682292ba222851ca
-  data.tar.gz: 2af41a0142d0a0699dda8960a081f3bdd35bbcfbc536f7f1b68baaac5a6a79f30d89cdf2019daa966413d1556ae57a74861bf89453c13f69d7616b3af78039a0
+  metadata.gz: 0f404b5867f6a47fc00c651d0744edfabaa6ba824646d26b6a7e48e72e3da235099ed51f66541e5a0d2abf4a24acda6de2a1e3066098f3366d158a975b312992
+  data.tar.gz: 2e9dca46a279117f96abf83a0a9c6914db91b99e136e27787270508780efde09436b461da3bf7481c5d39f2ed292faefce6a65d219f7b239e1fe613efd1f6a97

data/README.markdown

@@ -17,110 +17,8 @@ documentation][api].
 ## INSTALL
 
 This gem depends [libcouchbase][3]. In most cases installing
-libcouchbase doesn't take much effort.
-
-### MacOS (Homebrew)
-
-    $ brew install libcouchbase
-
-The official homebrew repository contains only stable versions of
-libvbucket and libcouchbase, if you need preview, take a look at
-Couchbase's fork: https://github.com/couchbase/homebrew
-
-    $ brew install https://raw.github.com/couchbase/homebrew/preview/Library/Formula/libcouchbase.rb
-
-If you are experiencing issues with installing using the OS included
-ruby, the most likely reason is that architecture of libcouchbase and
-your ruby do not match (e.g. one component is fat binary while another
-is not). The best fix depends on the details of the components. If you
-are using the system ruby on Mac OS X (which contains both 32-bit and
-64-bit code), you need to install libcouchbase using the `--universal`
-option:
-
-    $ brew install --universal libcouchbase
-
-Another approach might be to try to use [rbenv][rbenv], install 64-bit
-only ruby and compile couchbase ruby gem there there. Here are the
-steps:
-
-    $ brew install rbenv ruby-build
-
-Add the following line to the end of your .bashrc:
-
-    if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
-
-Then install ruby and make it global:
-
-    $ rbenv install 2.1.2
-    $ rbenv global 2.1.2
-
-Now you are ready to install and use the couchbase ruby gem:
-
-    $ gem install couchbase
-
-### Debian (Ubuntu)
-
-Add the appropriate line to `/etc/apt/sources.list.d/couchbase.list` for
-your OS release:
-
-    # Ubuntu 11.10 Oneiric Ocelot (Debian unstable)
-    deb http://packages.couchbase.com/ubuntu oneiric oneiric/main
-
-    # Ubuntu 10.04 Lucid Lynx (Debian stable or testing)
-    deb http://packages.couchbase.com/ubuntu lucid lucid/main
-
-Import the Couchbase PGP key:
-
-    wget -O- http://packages.couchbase.com/ubuntu/couchbase.key | sudo apt-key add -
-
-Then install them
-
-    $ sudo apt-get update && sudo apt-get install libcouchbase-dev
-
-Again, if you need a preview of a future version, just use another repository in
-your `couchbase.list`
-
-    # Ubuntu 11.10 Oneiric Ocelot (Debian unstable)
-    deb http://packages.couchbase.com/preview/ubuntu oneiric oneiric/main
-
-    # Ubuntu 10.04 Lucid Lynx (Debian stable or testing)
-    deb http://packages.couchbase.com/preview/ubuntu lucid lucid/main
-
-### Centos (Redhat and rpm-based systems)
-
-Add these lines to /etc/yum.repos.d/couchbase.repo using the correct architecture
-
-    [couchbase]
-    name = Couchbase package repository
-    baseurl = http://packages.couchbase.com/rpm/5.5/i386
-
-    [couchbase]
-    name = Couchbase package repository
-    baseurl = http://packages.couchbase.com/rpm/5.5/x86_64
-
-Then to install libcouchbase itself, run:
-
-    $ sudo yum update && sudo yum install libcouchbase-devel
-
-We have preview repositories for RPMs too, use them if you want to try
-the latest version of libcouchbase:
-
-    [couchbase]
-    name = Couchbase package repository
-    baseurl = http://packages.couchbase.com/preview/rpm/5.5/i386
-
-    [couchbase]
-    name = Couchbase package repository
-    baseurl = http://packages.couchbase.com/preview/rpm/5.5/x86_64
-
-### Windows
-
-There are no additional dependencies for Windows systems. The gem carries
-a prebuilt binary for it.
-
-### Couchbase gem
-
-Now install the couchbase gem itself
+libcouchbase doesn't take much effort. After that you can install the
+couchbase gem itself:
 
     $ gem install couchbase
 
@@ -682,7 +580,7 @@ task and you will find all artifacts in `pkg/` directory:
 [overview]: http://docs.couchbase.com/couchbase-sdk-ruby-1.3/index.html
 [1]: http://couchbase.com/issues/browse/RCBC
 [2]: http://freenode.net/irc_servers.shtml
-[3]: http://www.couchbase.com/develop/c/current
+[3]: http://docs.couchbase.com/developer/c-2.4/download-install.html
 [4]: https://github.com/mxcl/homebrew/pulls/avsej
 [5]: http://code.google.com/p/memcached/wiki/BinaryProtocolRevamped
 [6]: https://rubygems.org/gems/couchbase-model

data/RELEASE_NOTES.markdown

@@ -3,6 +3,13 @@
 This document is a list of user visible feature changes and important
 bugfixes. Do not forget to update this doc in every important patch.
 
+## 1.3.11 (2015-01-08)
+
+* [minor] Update crossbuild system to use cmake for libcouchbase
+
+* [minor] Update to libcouchbase 2.4.5 and wire IO functions at
+  runtime
+
 ## 1.3.10 (2014-09-30)
 
 * [major] Updates regarding libcouchbase 2.4.2. Bundle "bsdio-inl.c"

data/ext/couchbase_ext/arguments.c

@@ -285,6 +285,17 @@ cb_params_store_init_item(struct cb_params_st *params, lcb_size_t idx,
     params->cmd.store.items[idx].v.v0.cas = cas;
     params->cmd.store.items[idx].v.v0.exptime = exptime;
     params->npayload += RSTRING_LEN(key_obj) + RSTRING_LEN(value_obj) + sizeof(flags) + sizeof(exptime);
+    switch (params->cmd.store.operation) {
+    case LCB_ADD:
+        params->cmd.store.items[idx].v.v0.cas = 0;
+        break;
+    case LCB_PREPEND:
+    case LCB_APPEND:
+        params->cmd.store.items[idx].v.v0.flags = 0;
+        break;
+    default:
+        break;
+    }
 }
 
     static int
@@ -890,6 +901,17 @@ do_params_build(VALUE ptr)
             params->cmd.store.transcoder_opts = rb_hash_new();
             cb_params_store_parse_options(params, opts);
             cb_params_store_parse_arguments(params, argc, argv);
+            switch (params->cmd.store.operation) {
+            case LCB_ADD:
+                params->cmd.store.cas = 0;
+                break;
+            case LCB_PREPEND:
+            case LCB_APPEND:
+                params->cmd.store.flags = 0;
+                break;
+            default:
+                break;
+            }
             break;
         case cb_cmd_get:
             params->cmd.get.quiet = params->bucket->quiet;

data/ext/couchbase_ext/eventmachine_plugin.c

@@ -20,8 +20,6 @@
 #ifndef _WIN32
 #ifdef BUILD_EVENTMACHINE_PLUGIN
 
-#include "libcouchbase/bsdio-inl.c"
-
 VALUE cb_mEm;
 VALUE cb_cEmSocket;
 VALUE em_cPeriodicTimer;
@@ -411,6 +409,7 @@ lcb_destroy_io_opts(struct lcb_io_opt_st *iops)
     LIBCOUCHBASE_API lcb_error_t
 cb_create_ruby_em_io_opts(int version, lcb_io_opt_t *io, void *arg)
 {
+    lcb_bsd_procs procs;
     struct lcb_io_opt_st *ret;
     rb_em_loop *loop;
     struct cb_bucket_st *bucket = arg;
@@ -433,7 +432,14 @@ cb_create_ruby_em_io_opts(int version, lcb_io_opt_t *io, void *arg)
     /* consider that struct isn't allocated by the library,
      * `need_cleanup' flag might be set in lcb_create() */
     ret->v.v0.need_cleanup = 0;
-    wire_lcb_bsd_impl(ret);
+    lcb_iops_wire_bsd_impl2(&procs, 0);
+    ret->v.v0.recv = procs.recv;
+    ret->v.v0.recvv = procs.recvv;
+    ret->v.v0.send = procs.send;
+    ret->v.v0.sendv = procs.sendv;
+    ret->v.v0.socket = procs.socket0;
+    ret->v.v0.connect = procs.connect0;
+    ret->v.v0.close = procs.close;
     ret->v.v0.delete_event = lcb_io_delete_event;
     ret->v.v0.destroy_event = lcb_io_destroy_event;
     ret->v.v0.create_event = lcb_io_create_event;

data/ext/couchbase_ext/extconf.rb

@@ -22,11 +22,11 @@ require 'rbconfig'
 # RC_ARCHS doesn't work under bundler on MacOS.
 if RUBY_PLATFORM =~ /darwin/ && defined?(RbConfig::ARCHFLAGS)
   [RbConfig::CONFIG, RbConfig::MAKEFILE_CONFIG].each do |cfg|
-    cfg["CFLAGS"].gsub!(RbConfig::ARCHFLAGS, '')
-    cfg["LDFLAGS"].gsub!(RbConfig::ARCHFLAGS, '')
-    cfg["LDSHARED"].gsub!(RbConfig::ARCHFLAGS, '')
-    cfg["LIBRUBY_LDSHARED"].gsub!(RbConfig::ARCHFLAGS, '')
-    cfg["configure_args"].gsub!(RbConfig::ARCHFLAGS, '')
+    cfg['CFLAGS'].gsub!(RbConfig::ARCHFLAGS, '')
+    cfg['LDFLAGS'].gsub!(RbConfig::ARCHFLAGS, '')
+    cfg['LDSHARED'].gsub!(RbConfig::ARCHFLAGS, '')
+    cfg['LIBRUBY_LDSHARED'].gsub!(RbConfig::ARCHFLAGS, '')
+    cfg['configure_args'].gsub!(RbConfig::ARCHFLAGS, '')
   end
 end
 
@@ -39,9 +39,9 @@ def define(macro, value = nil)
   $defs.push("-D #{[macro.upcase, value].compact.join('=')}")
 end
 
-($CFLAGS  ||= "") << " #{ENV["CFLAGS"]}"
-($LDFLAGS ||= "") << " #{ENV["LDFLAGS"]}"
-($LIBS    ||= "") << " #{ENV["LIBS"]}"
+($CFLAGS  ||= '') << " #{ENV['CFLAGS']}"
+($LDFLAGS ||= '') << " #{ENV['LDFLAGS']}"
+($LIBS    ||= '') << " #{ENV['LIBS']}"
 
 $CFLAGS << ' -std=c99 -Wall -Wextra '
 if ENV['DEBUG']
@@ -51,10 +51,9 @@ else
   $LDFLAGS << ' -Wl,--strip-debug' if RbConfig::CONFIG['target_os'] =~ /mingw32/
 end
 
-
 if RbConfig::CONFIG['target_os'] =~ /mingw32/
   $LDFLAGS << ' -static-libgcc'
-  dir_config("libcouchbase")
+  dir_config('libcouchbase')
 else
   LIBDIR = RbConfig::CONFIG['libdir']
   INCLUDEDIR = RbConfig::CONFIG['includedir']
@@ -88,8 +87,8 @@ else
     HEADER_DIRS.unshift File.join(brew_prefix, 'include')
   end
 
-  HEADER_DIRS.delete_if{|d| !File.exists?(d)}
-  LIB_DIRS.delete_if{|d| !File.exists?(d)}
+  HEADER_DIRS.delete_if { |d| !File.exist?(d) }
+  LIB_DIRS.delete_if { |d| !File.exist?(d) }
 
   # it will find the libcouchbase likely. you can specify its path otherwise
   #
@@ -99,12 +98,11 @@ else
   #
   #   ruby extconf.rb [--with-libcouchbase-dir=<dir>]
   #
-  dir_config("libcouchbase", HEADER_DIRS, LIB_DIRS)
+  dir_config('libcouchbase', HEADER_DIRS, LIB_DIRS)
 end
 
-
 if COMMON_HEADERS !~ /"ruby\.h"/
-  (COMMON_HEADERS ||= "") << %(\n#include "ruby.h"\n)
+  (COMMON_HEADERS ||= '') << %(\n#include "ruby.h"\n)
 end
 
 if try_compile(<<-SRC)
@@ -122,13 +120,13 @@ if try_compile(<<-SRC)
     return 0;
   }
   SRC
-  define("HAVE_STDARG_PROTOTYPES")
+  define('HAVE_STDARG_PROTOTYPES')
 end
 
 def die(message)
-  STDERR.puts "\n#{"*" * 70}"
-  STDERR.puts "#{message.gsub(/^/, "* ")}"
-  STDERR.puts "#{"*" * 70}\n\n"
+  STDERR.puts "\n#{'*' * 70}"
+  STDERR.puts "#{message.gsub(/^/, '* ')}"
+  STDERR.puts "#{'*' * 70}\n\n"
   abort
 end
 
@@ -171,26 +169,26 @@ SRC
 end
 
 # just to add -lcouchbase properly
-have_library("couchbase", "lcb_set_bootstrap_callback(NULL, NULL)", "libcouchbase/couchbase.h") or die(install_notice)
-have_header("mach/mach_time.h")
-have_header("stdint.h") or die("Failed to locate stdint.h")
-have_header("sys/time.h")
-have_header("fcntl.h")
-have_header("sys/socket.h")
-have_header("errno.h")
-
-have_type("st_index_t")
-have_func("clock_gettime")
-have_func("gettimeofday")
-have_func("QueryPerformanceCounter")
-have_func("gethrtime")
-have_func("rb_hash_lookup2")
-have_func("rb_thread_fd_select")
-have_func("rb_thread_blocking_region")
-have_func("rb_thread_call_without_gvl")
-have_func("poll", "poll.h")
-have_func("ppoll", "poll.h")
-have_func("rb_fiber_yield")
-define("_GNU_SOURCE")
-create_header("couchbase_config.h")
-create_makefile("couchbase_ext")
+have_library('couchbase', 'lcb_iops_wire_bsd_impl2(NULL, 0)', 'libcouchbase/couchbase.h') || die(install_notice)
+have_header('mach/mach_time.h')
+have_header('stdint.h') || die('Failed to locate stdint.h')
+have_header('sys/time.h')
+have_header('fcntl.h')
+have_header('sys/socket.h')
+have_header('errno.h')
+
+have_type('st_index_t')
+have_func('clock_gettime')
+have_func('gettimeofday')
+have_func('QueryPerformanceCounter')
+have_func('gethrtime')
+have_func('rb_hash_lookup2')
+have_func('rb_thread_fd_select')
+have_func('rb_thread_blocking_region')
+have_func('rb_thread_call_without_gvl')
+have_func('poll', 'poll.h')
+have_func('ppoll', 'poll.h')
+have_func('rb_fiber_yield')
+define('_GNU_SOURCE')
+create_header('couchbase_config.h')
+create_makefile('couchbase_ext')

data/ext/couchbase_ext/multithread_plugin.c

@@ -27,8 +27,6 @@
 #include <poll.h>
 #endif
 
-#include "libcouchbase/bsdio-inl.c"
-
 /* events sorted array */
 typedef struct rb_mt_event rb_mt_event;
 struct rb_mt_event {
@@ -1041,6 +1039,7 @@ lcb_destroy_io_opts(struct lcb_io_opt_st *iops)
     LIBCOUCHBASE_API lcb_error_t
 cb_create_ruby_mt_io_opts(int version, lcb_io_opt_t *io, void *arg)
 {
+    lcb_bsd_procs procs;
     struct lcb_io_opt_st *ret;
     rb_mt_loop *loop;
     (void)arg;
@@ -1059,7 +1058,15 @@ cb_create_ruby_mt_io_opts(int version, lcb_io_opt_t *io, void *arg)
     /* consider that struct isn't allocated by the library,
      * `need_cleanup' flag might be set in lcb_create() */
     ret->v.v0.need_cleanup = 0;
-    wire_lcb_bsd_impl(ret);
+    lcb_iops_wire_bsd_impl2(&procs, 0);
+    ret->v.v0.recv = procs.recv;
+    ret->v.v0.recvv = procs.recvv;
+    ret->v.v0.send = procs.send;
+    ret->v.v0.sendv = procs.sendv;
+    ret->v.v0.socket = procs.socket0;
+    ret->v.v0.connect = procs.connect0;
+    ret->v.v0.close = procs.close;
+
     ret->v.v0.delete_event = lcb_io_delete_event;
     ret->v.v0.destroy_event = lcb_io_destroy_event;
     ret->v.v0.create_event = lcb_io_create_event;

data/lib/couchbase/version.rb

@@ -17,5 +17,5 @@
 
 # Couchbase ruby client
 module Couchbase
-  VERSION = "1.3.10"
+  VERSION = '1.3.11'
 end

data/tasks/compile.rake

@@ -16,7 +16,7 @@
 #
 
 gem 'rake-compiler', '>= 0.7.5'
-require "rake/extensiontask"
+require 'rake/extensiontask'
 
 def gemspec
   @clean_gemspec ||= eval(File.read(File.expand_path('../../couchbase.gemspec', __FILE__)))
@@ -47,17 +47,17 @@ class Platform
 
   def short_versions
     res = []
-    each_version do |long, short|
+    each_version do |_long, short|
       res << short
     end
     res
   end
 end
 
-recent = "2.0.0-p353"
+recent = '2.0.0-p353'
 CROSS_PLATFORMS = [
   Platform.new(:name => 'x64-mingw32', :host => 'x86_64-w64-mingw32', :versions => %w(1.9.3-p484 2.0.0-p353 2.1.0)),
-  Platform.new(:name => 'x86-mingw32', :host => 'i686-w64-mingw32', :versions => %w(1.8.7-p374 1.9.3-p484 2.0.0-p353 2.1.0)),
+  Platform.new(:name => 'x86-mingw32', :host => 'i686-w64-mingw32', :versions => %w(1.8.7-p374 1.9.3-p484 2.0.0-p353 2.1.0))
 ]
 
 # Setup compile tasks.  Configuration can be passed via ENV.
@@ -69,16 +69,16 @@ CROSS_PLATFORMS = [
 #
 #  rake compile with_libcouchbase_dir=/opt/couchbase
 #
-Rake::ExtensionTask.new("couchbase_ext", gemspec) do |ext|
+Rake::ExtensionTask.new('couchbase_ext', gemspec) do |ext|
   ext.cross_compile = true
   ext.cross_platform = ENV['TARGET']
   if ENV['RUBY_CC_VERSION']
-    ext.lib_dir = "lib/couchbase"
+    ext.lib_dir = 'lib/couchbase'
   end
   ext.cross_compiling do |spec|
-    spec.files.delete("lib/couchbase/couchbase_ext.so")
-    spec.files.push("lib/couchbase_ext.rb", Dir["lib/couchbase/*/couchbase_ext.so"])
-    spec.files.push(Dir["lib/couchbase/*/couchbase_ext.so"])
+    spec.files.delete('lib/couchbase/couchbase_ext.so')
+    spec.files.push('lib/couchbase_ext.rb', Dir['lib/couchbase/*/couchbase_ext.so'])
+    spec.files.push(Dir['lib/couchbase/*/couchbase_ext.so'])
     file "#{ext.tmp_dir}/#{ext.cross_platform}/stage/lib/couchbase_ext.rb", &version_router
   end
 
@@ -86,7 +86,7 @@ Rake::ExtensionTask.new("couchbase_ext", gemspec) do |ext|
 
   ENV.each do |key, val|
     next unless key =~ /\Awith_(\w+)\z/i
-    opt = $1.downcase.tr('_', '-')
+    opt = Regexp.last_match[1].downcase.tr('_', '-')
     if File.directory?(path = File.expand_path(val))
       ext.config_options << "--with-#{opt}=#{path}"
     else
@@ -104,30 +104,30 @@ require 'mini_portile'
 require 'rake/extensioncompiler'
 
 class MiniPortile
-  alias :cook_without_checkpoint :cook
+  alias_method :cook_without_checkpoint, :cook
   def cook
     checkpoint = "ports/.#{name}-#{version}-#{host}.installed"
-    unless File.exist?(checkpoint)
-      cook_without_checkpoint
-      FileUtils.touch(checkpoint)
-    end
+    return if File.exist?(checkpoint)
+    cook_without_checkpoint
+    FileUtils.touch(checkpoint)
+  end
+
+  def configure
+    return if configured?
+
+    md5_file = File.join(tmp_path, 'configure.md5')
+    digest   = Digest::MD5.hexdigest(computed_options)
+    File.open(md5_file, 'w') { |f| f.write digest }
+
+    execute('configure', %(perl cmake/configure #{computed_options}))
   end
 end
 
-file "lib/couchbase_ext.rb", &version_router
-
-desc "Package gem for windows"
-task "package:windows" => ["package", "lib/couchbase_ext.rb"] do
-  vars = [
-    'CC',
-    'CFLAGS',
-    'CPATH',
-    'CPP',
-    'CPPFLAGS',
-    'LDFLAGS',
-    'LIBRARY_PATH',
-    'PATH'
-  ].reduce({}) do |h, v|
+file 'lib/couchbase_ext.rb', &version_router
+
+desc 'Package gem for windows'
+task 'package:windows' => ['package', 'lib/couchbase_ext.rb'] do
+  vars = %w(CC CFLAGS CPATH CPP CPPFLAGS LDFLAGS LIBRARY_PATH PATH).each_with_object({}) do |v, h|
     h[v] = ENV[v]
     h
   end
@@ -135,19 +135,14 @@ task "package:windows" => ["package", "lib/couchbase_ext.rb"] do
 
   CROSS_PLATFORMS.each do |platform|
     ENV['TARGET'] = platform.name
-    rm_rf("tmp/ ports/")
-    mkdir_p("ports")
-    recipe = MiniPortile.new("libcouchbase", "2.4.0_21_g879b4cd")
+    rm_rf('tmp/ ports/')
+    mkdir_p('ports')
+    recipe = MiniPortile.new('libcouchbase', '2.4.5')
     recipe.host = platform.host
     recipe.files << "http://packages.couchbase.com/clients/c/libcouchbase-#{recipe.version}.tar.gz"
-    recipe.configure_options.push("--disable-debug",
-                                  "--disable-dependency-tracking",
-                                  "--disable-couchbasemock",
-                                  "--enable-ssl=no",
-                                  "--disable-cxx",
-                                  "--disable-plugins",
-                                  "--disable-examples",
-                                  "--disable-tools")
+    recipe.configure_options.push('--disable-cxx',
+                                  '--disable-tests',
+                                  '--enable-static')
     recipe.cook
     recipe.activate
     platform.each_version do |long, short|
@@ -156,6 +151,6 @@ task "package:windows" => ["package", "lib/couchbase_ext.rb"] do
     vars.each do |k, v|
       ENV[k] = v
     end
-    sh("env RUBY_CC_VERSION=#{platform.short_versions.join(":")} RBENV_VERSION=#{recent} rbenv exec rake cross native gem")
+    sh("env RUBY_CC_VERSION=#{platform.short_versions.join(':')} RBENV_VERSION=#{recent} rbenv exec rake cross native gem")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.3.11
 platform: ruby
 authors:
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaji
@@ -244,7 +244,6 @@ files:
 - ext/couchbase_ext/get.c
 - ext/couchbase_ext/gethrtime.c
 - ext/couchbase_ext/http.c
-- ext/couchbase_ext/libcouchbase/bsdio-inl.c
 - ext/couchbase_ext/multithread_plugin.c
 - ext/couchbase_ext/observe.c
 - ext/couchbase_ext/result.c

data/ext/couchbase_ext/libcouchbase/bsdio-inl.c

@@ -1,223 +0,0 @@
-/**
- * Inline routines for common 'BSD'-style I/O for plugins.
- *
- * Include this file in your plugin and then call wire_lcb_bsd_impl on the
- * plugin instance.
- */
-
-static void
-wire_lcb_bsd_impl(lcb_io_opt_t io);
-
-#ifdef _WIN32
-#include "wsaerr-inl.c"
-static int
-get_wserr(lcb_socket_t sock)
-{
-    DWORD error = WSAGetLastError();
-    int ext = 0;
-    int len = sizeof(ext);
-
-    /* Retrieves extended error status and clear */
-    getsockopt(sock, SOL_SOCKET, SO_ERROR, (char *)&ext, &len);
-    return wsaerr_map_impl(error);
-}
-
-static lcb_ssize_t
-recvv_impl(lcb_io_opt_t iops, lcb_socket_t sock,
-           struct lcb_iovec_st *iov, lcb_size_t niov)
-{
-    DWORD flags = 0, nr;
-    WSABUF *bufptr = (WSABUF *)iov;
-
-    if (WSARecv(sock, bufptr, niov, &nr, &flags, NULL, NULL) == SOCKET_ERROR) {
-        iops->v.v0.error = get_wserr(sock);
-        if (iops->v.v0.error == ECONNRESET) {
-            return 0;
-        }
-        return -1;
-    }
-
-    (void)iops;
-    return (lcb_ssize_t)nr;
-}
-
-static lcb_ssize_t
-recv_impl(lcb_io_opt_t iops, lcb_socket_t sock, void *buf, lcb_size_t nbuf,
-          int fl_unused)
-{
-    WSABUF iov;
-    iov.len = nbuf;
-    iov.buf = buf;
-    (void)fl_unused;
-    return recvv_impl(iops, sock, (struct lcb_iovec_st *)&iov, 1);
-}
-
-static lcb_ssize_t
-sendv_impl(lcb_io_opt_t iops, lcb_socket_t sock, struct lcb_iovec_st *iov,
-           lcb_size_t niov)
-{
-    DWORD nw, fl = 0;
-    WSABUF *bufptr = (WSABUF *)iov;
-    if (WSASend(sock, bufptr, niov, &nw, fl, NULL, NULL) == SOCKET_ERROR) {
-        iops->v.v0.error = get_wserr(sock);
-        return -1;
-    }
-    return (lcb_ssize_t)nw;
-}
-
-static lcb_ssize_t
-send_impl(lcb_io_opt_t iops, lcb_socket_t sock, const void *buf, lcb_size_t nbuf,
-          int flags)
-{
-    WSABUF iov;
-    iov.buf = (void *)buf;
-    iov.len = nbuf;
-    (void)flags;
-    return sendv_impl(iops, sock, (struct lcb_iovec_st *)&iov, 1);
-}
-
-#else
-static lcb_ssize_t
-recvv_impl(lcb_io_opt_t iops, lcb_socket_t sock, struct lcb_iovec_st *iov,
-           lcb_size_t niov)
-{
-    struct msghdr mh;
-    lcb_ssize_t ret;
-
-    memset(&mh, 0, sizeof(mh));
-    mh.msg_iov = (struct iovec *)iov;
-    mh.msg_iovlen = niov;
-    ret = recvmsg(sock, &mh, 0);
-    if (ret < 0) {
-        iops->v.v0.error = errno;
-    }
-    return ret;
-}
-
-static lcb_ssize_t
-recv_impl(lcb_io_opt_t iops, lcb_socket_t sock, void *buf, lcb_size_t nbuf,
-          int flags)
-{
-    lcb_ssize_t ret = recv(sock, buf, nbuf, flags);
-    if (ret < 0) {
-        iops->v.v0.error = errno;
-    }
-    return ret;
-}
-
-static lcb_ssize_t
-sendv_impl(lcb_io_opt_t iops, lcb_socket_t sock, struct lcb_iovec_st *iov,
-           lcb_size_t niov)
-{
-    struct msghdr mh;
-    lcb_ssize_t ret;
-
-    memset(&mh, 0, sizeof(mh));
-    mh.msg_iov = (struct iovec *)iov;
-    mh.msg_iovlen = niov;
-    ret = sendmsg(sock, &mh, 0);
-    if (ret < 0) {
-        iops->v.v0.error = errno;
-    }
-    return ret;
-}
-
-static lcb_ssize_t
-send_impl(lcb_io_opt_t iops, lcb_socket_t sock, const void *buf, lcb_size_t nbuf,
-          int flags)
-{
-    lcb_ssize_t ret = send(sock, buf, nbuf, flags);
-    if (ret < 0) {
-        iops->v.v0.error = errno;
-    }
-    return ret;
-}
-
-#endif
-
-static int make_socket_nonblocking(lcb_socket_t sock)
-{
-#ifdef _WIN32
-    u_long nonblocking = 1;
-    if (ioctlsocket(sock, FIONBIO, &nonblocking) == SOCKET_ERROR) {
-        return -1;
-    }
-#else
-    int flags;
-    if ((flags = fcntl(sock, F_GETFL, NULL)) < 0) {
-        return -1;
-    }
-    if (fcntl(sock, F_SETFL, flags | O_NONBLOCK) == -1) {
-        return -1;
-    }
-#endif
-    return 0;
-}
-
-static lcb_socket_t
-socket_impl(lcb_io_opt_t iops, int domain, int type, int protocol)
-{
-    lcb_socket_t sock;
-#ifdef _WIN32
-    sock = (lcb_socket_t)WSASocket(domain, type, protocol, NULL, 0, 0);
-#else
-    sock = socket(domain, type, protocol);
-#endif
-    if (sock == INVALID_SOCKET) {
-        iops->v.v0.error = errno;
-    } else {
-        if (make_socket_nonblocking(sock) != 0) {
-#ifdef _WIN32
-            iops->v.v0.error = get_wserr(sock);
-#else
-            iops->v.v0.error = errno;
-#endif
-            iops->v.v0.close(iops, sock);
-            sock = INVALID_SOCKET;
-        }
-    }
-    return sock;
-}
-
-static void
-close_impl(lcb_io_opt_t iops, lcb_socket_t sock)
-{
-    (void)iops;
-#ifdef _WIN32
-    closesocket(sock);
-#else
-    close(sock);
-#endif
-}
-
-static int
-connect_impl(lcb_io_opt_t iops, lcb_socket_t sock, const struct sockaddr *name,
-             unsigned int namelen)
-{
-    int ret;
-
-#ifdef _WIN32
-    ret = WSAConnect(sock, name, (int)namelen, NULL, NULL, NULL, NULL);
-    if (ret == SOCKET_ERROR) {
-        iops->v.v0.error = get_wserr(sock);
-    }
-#else
-    ret = connect(sock, name, (socklen_t)namelen);
-    if (ret < 0) {
-        iops->v.v0.error = errno;
-    }
-#endif
-    return ret;
-}
-
-static void
-wire_lcb_bsd_impl(lcb_io_opt_t io)
-{
-    io->v.v0.recv = recv_impl;
-    io->v.v0.recvv = recvv_impl;
-    io->v.v0.send = send_impl;
-    io->v.v0.sendv = sendv_impl;
-    io->v.v0.socket = socket_impl;
-    io->v.v0.connect = connect_impl;
-    io->v.v0.close = close_impl;
-}