libcouchbase 0.2.0 → 0.3.1

data/lib/libcouchbase/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true, encoding: ASCII-8BIT
 
 module Libcouchbase
-    VERSION = '0.2.0'
+    VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libcouchbase
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -342,6 +342,7 @@ files:
 - ext/libcouchbase/include/memcached/COPYING
 - ext/libcouchbase/include/memcached/README
 - ext/libcouchbase/include/memcached/protocol_binary.h
+- ext/libcouchbase/include/memcached/vbucket.h
 - ext/libcouchbase/packaging/README
 - ext/libcouchbase/packaging/abicheck/.gitignore
 - ext/libcouchbase/packaging/abicheck/Makefile
@@ -386,15 +387,15 @@ files:
 - ext/libcouchbase/src/aspend.h
 - ext/libcouchbase/src/auth-priv.h
 - ext/libcouchbase/src/auth.cc
-- ext/libcouchbase/src/bootstrap.cc
+- ext/libcouchbase/src/bootstrap.c
 - ext/libcouchbase/src/bootstrap.h
 - ext/libcouchbase/src/bucketconfig/bc_cccp.cc
-- ext/libcouchbase/src/bucketconfig/bc_file.cc
-- ext/libcouchbase/src/bucketconfig/bc_http.cc
+- ext/libcouchbase/src/bucketconfig/bc_file.c
+- ext/libcouchbase/src/bucketconfig/bc_http.c
 - ext/libcouchbase/src/bucketconfig/bc_http.h
-- ext/libcouchbase/src/bucketconfig/bc_mcraw.cc
+- ext/libcouchbase/src/bucketconfig/bc_mcraw.c
 - ext/libcouchbase/src/bucketconfig/clconfig.h
-- ext/libcouchbase/src/bucketconfig/confmon.cc
+- ext/libcouchbase/src/bucketconfig/confmon.c
 - ext/libcouchbase/src/callbacks.c
 - ext/libcouchbase/src/cbft.cc
 - ext/libcouchbase/src/cntl.cc
@@ -402,10 +403,7 @@ files:
 - ext/libcouchbase/src/connspec.cc
 - ext/libcouchbase/src/connspec.h
 - ext/libcouchbase/src/ctx-log-inl.h
-- ext/libcouchbase/src/dns-srv.cc
 - ext/libcouchbase/src/dump.cc
-- ext/libcouchbase/src/errmap.cc
-- ext/libcouchbase/src/errmap.h
 - ext/libcouchbase/src/getconfig.cc
 - ext/libcouchbase/src/gethrtime.c
 - ext/libcouchbase/src/handler.cc
@@ -422,9 +420,9 @@ files:
 - ext/libcouchbase/src/iofactory.c
 - ext/libcouchbase/src/jsparse/parser.cc
 - ext/libcouchbase/src/jsparse/parser.h
-- ext/libcouchbase/src/lcbht/lcbht.cc
+- ext/libcouchbase/src/lcbht/lcbht.c
 - ext/libcouchbase/src/lcbht/lcbht.h
-- ext/libcouchbase/src/lcbio/connect.cc
+- ext/libcouchbase/src/lcbio/connect.c
 - ext/libcouchbase/src/lcbio/connect.h
 - ext/libcouchbase/src/lcbio/ctx.c
 - ext/libcouchbase/src/lcbio/ctx.h
@@ -438,7 +436,6 @@ files:
 - ext/libcouchbase/src/lcbio/protoctx.c
 - ext/libcouchbase/src/lcbio/rw-inl.h
 - ext/libcouchbase/src/lcbio/ssl.h
-- ext/libcouchbase/src/lcbio/timer-cxx.h
 - ext/libcouchbase/src/lcbio/timer-ng.h
 - ext/libcouchbase/src/lcbio/timer.c
 - ext/libcouchbase/src/legacy.c
@@ -459,7 +456,6 @@ files:
 - ext/libcouchbase/src/mcserver/mcserver.h
 - ext/libcouchbase/src/mcserver/negotiate.cc
 - ext/libcouchbase/src/mcserver/negotiate.h
-- ext/libcouchbase/src/mctx-helper.h
 - ext/libcouchbase/src/n1ql/ixmgmt.cc
 - ext/libcouchbase/src/n1ql/n1ql-internal.h
 - ext/libcouchbase/src/n1ql/n1ql.cc
@@ -470,21 +466,22 @@ files:
 - ext/libcouchbase/src/netbuf/netbuf.h
 - ext/libcouchbase/src/newconfig.cc
 - ext/libcouchbase/src/nodeinfo.cc
-- ext/libcouchbase/src/operations/cbflush.cc
-- ext/libcouchbase/src/operations/counter.cc
+- ext/libcouchbase/src/operations/cbflush.c
+- ext/libcouchbase/src/operations/counter.c
 - ext/libcouchbase/src/operations/durability-cas.cc
 - ext/libcouchbase/src/operations/durability-seqno.cc
 - ext/libcouchbase/src/operations/durability.cc
 - ext/libcouchbase/src/operations/durability_internal.h
-- ext/libcouchbase/src/operations/get.cc
+- ext/libcouchbase/src/operations/get.c
 - ext/libcouchbase/src/operations/observe-seqno.cc
-- ext/libcouchbase/src/operations/observe.cc
-- ext/libcouchbase/src/operations/pktfwd.cc
-- ext/libcouchbase/src/operations/remove.cc
+- ext/libcouchbase/src/operations/observe.c
+- ext/libcouchbase/src/operations/pktfwd.c
+- ext/libcouchbase/src/operations/remove.c
 - ext/libcouchbase/src/operations/stats.cc
-- ext/libcouchbase/src/operations/store.cc
+- ext/libcouchbase/src/operations/store.c
 - ext/libcouchbase/src/operations/subdoc.cc
-- ext/libcouchbase/src/operations/touch.cc
+- ext/libcouchbase/src/operations/touch.c
+- ext/libcouchbase/src/packetutils.c
 - ext/libcouchbase/src/packetutils.h
 - ext/libcouchbase/src/probes.d
 - ext/libcouchbase/src/rdb/bigalloc.c
@@ -493,13 +490,15 @@ files:
 - ext/libcouchbase/src/rdb/libcalloc.c
 - ext/libcouchbase/src/rdb/rope.c
 - ext/libcouchbase/src/rdb/rope.h
-- ext/libcouchbase/src/retrychk.cc
+- ext/libcouchbase/src/retrychk.c
 - ext/libcouchbase/src/retryq.cc
 - ext/libcouchbase/src/retryq.h
 - ext/libcouchbase/src/ringbuffer.c
 - ext/libcouchbase/src/ringbuffer.h
 - ext/libcouchbase/src/settings.c
 - ext/libcouchbase/src/settings.h
+- ext/libcouchbase/src/simplestring.c
+- ext/libcouchbase/src/simplestring.h
 - ext/libcouchbase/src/sllist-inl.h
 - ext/libcouchbase/src/sllist.h
 - ext/libcouchbase/src/ssl/CMakeLists.txt
@@ -507,6 +506,7 @@ files:
 - ext/libcouchbase/src/ssl/ssl_common.c
 - ext/libcouchbase/src/ssl/ssl_e.c
 - ext/libcouchbase/src/ssl/ssl_iot_common.h
+- ext/libcouchbase/src/ssobuf.h
 - ext/libcouchbase/src/strcodecs/base64.c
 - ext/libcouchbase/src/strcodecs/strcodecs.h
 - ext/libcouchbase/src/timings.c
@@ -522,9 +522,9 @@ files:
 - ext/libcouchbase/src/vbucket/rfc1321/md5.h
 - ext/libcouchbase/src/vbucket/rfc1321/md5c-inl.h
 - ext/libcouchbase/src/vbucket/vbucket.c
-- ext/libcouchbase/src/views/docreq.cc
+- ext/libcouchbase/src/views/docreq.c
 - ext/libcouchbase/src/views/docreq.h
-- ext/libcouchbase/src/views/viewreq.cc
+- ext/libcouchbase/src/views/viewreq.c
 - ext/libcouchbase/src/views/viewreq.h
 - ext/libcouchbase/src/wait.cc
 - ext/libcouchbase/tests/CMakeLists.txt
@@ -545,6 +545,7 @@ files:
 - ext/libcouchbase/tests/basic/t_ringbuffer.cc
 - ext/libcouchbase/tests/basic/t_slist.cc
 - ext/libcouchbase/tests/basic/t_strerror.cc
+- ext/libcouchbase/tests/basic/t_string.cc
 - ext/libcouchbase/tests/basic/t_urlencode.cc
 - ext/libcouchbase/tests/check-all.cc
 - ext/libcouchbase/tests/htparse/t_basic.cc
@@ -568,7 +569,6 @@ files:
 - ext/libcouchbase/tests/iotests/t_configcache.cc
 - ext/libcouchbase/tests/iotests/t_confmon.cc
 - ext/libcouchbase/tests/iotests/t_durability.cc
-- ext/libcouchbase/tests/iotests/t_errmap.cc
 - ext/libcouchbase/tests/iotests/t_forward.cc
 - ext/libcouchbase/tests/iotests/t_get.cc
 - ext/libcouchbase/tests/iotests/t_http.cc

data/ext/libcouchbase/src/bootstrap.cc

@@ -1,216 +0,0 @@
-/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/*
- *     Copyright 2014 Couchbase, Inc.
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- */
-
-#define LCB_BOOTSTRAP_DEFINE_STRUCT 1
-#include "internal.h"
-
-
-#define LOGARGS(instance, lvl) instance->settings, "bootstrap", LCB_LOG_##lvl, __FILE__, __LINE__
-
-using lcb::clconfig::EventType;
-using lcb::clconfig::ConfigInfo;
-using namespace lcb;
-
-/**
- * This function is where the configuration actually takes place. We ensure
- * in other functions that this is only ever called directly from an event
- * loop stack frame (or one of the small mini functions here) so that we
- * don't accidentally end up destroying resources underneath us.
- */
-void Bootstrap::config_callback(EventType event, ConfigInfo *info) {
-    using namespace lcb::clconfig;
-    lcb_t instance = parent;
-
-    if (event != CLCONFIG_EVENT_GOT_NEW_CONFIG) {
-        if (event == CLCONFIG_EVENT_PROVIDERS_CYCLED) {
-            if (!LCBT_VBCONFIG(instance)) {
-                initial_error(LCB_ERROR, "No more bootstrap providers remain");
-            }
-        }
-        return;
-    }
-
-    instance->last_error = LCB_SUCCESS;
-
-    /** Ensure we're not called directly twice again */
-    if (state < S_INITIAL_TRIGGERED) {
-        state = S_INITIAL_TRIGGERED;
-    }
-
-    tm.cancel();
-
-    lcb_log(LOGARGS(instance, DEBUG), "Instance configured!");
-
-    if (info->get_origin() != CLCONFIG_FILE) {
-        /* Set the timestamp for the current config to control throttling,
-         * but only if it's not an initial file-based config. See CCBC-482 */
-        last_refresh = gethrtime();
-        errcounter = 0;
-    }
-
-    if (info->get_origin() == CLCONFIG_CCCP) {
-        /* Disable HTTP provider if we've received something via CCCP */
-
-        if (instance->cur_configinfo == NULL ||
-                instance->cur_configinfo->get_origin() != CLCONFIG_HTTP) {
-            /* Never disable HTTP if it's still being used */
-            instance->confmon->set_active(CLCONFIG_HTTP, false);
-        }
-    }
-
-    if (instance->type != LCB_TYPE_CLUSTER) {
-        lcb_update_vbconfig(instance, info);
-    }
-
-    if (state < S_BOOTSTRAPPED) {
-        state = S_BOOTSTRAPPED;
-        lcb_aspend_del(&instance->pendops, LCB_PENDTYPE_COUNTER, NULL);
-
-        if (instance->type == LCB_TYPE_BUCKET &&
-                LCBVB_DISTTYPE(LCBT_VBCONFIG(instance)) == LCBVB_DIST_KETAMA &&
-                instance->cur_configinfo->get_origin() != CLCONFIG_MCRAW) {
-
-            lcb_log(LOGARGS(instance, INFO), "Reverting to HTTP Config for memcached buckets");
-            instance->settings->bc_http_stream_time = -1;
-            instance->confmon->set_active(CLCONFIG_HTTP, true);
-            instance->confmon->set_active(CLCONFIG_CCCP, false);
-        }
-        instance->callbacks.bootstrap(instance, LCB_SUCCESS);
-    }
-
-    lcb_maybe_breakout(instance);
-}
-
-void Bootstrap::clconfig_lsn(EventType e, ConfigInfo *i) {
-    if (state == S_INITIAL_PRE) {
-        config_callback(e, i);
-    } else if (e == clconfig::CLCONFIG_EVENT_GOT_NEW_CONFIG) {
-        lcb_log(LOGARGS(parent, INFO), "Got new config. Will refresh asynchronously");
-        tm.signal();
-    }
-}
-
-/**
- * This it the initial bootstrap timeout handler. This timeout pins down the
- * instance. It is only scheduled during the initial bootstrap and is only
- * triggered if the initial bootstrap fails to configure in time.
- */
-void Bootstrap::timer_dispatch() {
-    if (state > S_INITIAL_PRE) {
-        config_callback(clconfig::CLCONFIG_EVENT_GOT_NEW_CONFIG,
-            parent->confmon->get_config());
-    } else {
-        // Not yet bootstrapped!
-        initial_error(LCB_ETIMEDOUT, "Failed to bootstrap in time");
-    }
-}
-
-
-void Bootstrap::initial_error(lcb_error_t err, const char *errinfo) {
-    parent->last_error = parent->confmon->get_last_error();
-    if (parent->last_error == LCB_SUCCESS) {
-        parent->last_error = err;
-    }
-    parent->callbacks.error(parent, parent->last_error, errinfo);
-    lcb_log(LOGARGS(parent, ERR), "Failed to bootstrap client=%p. Error=%s, Message=%s", (void *)parent, lcb_strerror_short(parent->last_error), errinfo);
-    tm.cancel();
-
-    parent->callbacks.bootstrap(parent, parent->last_error);
-
-    lcb_aspend_del(&parent->pendops, LCB_PENDTYPE_COUNTER, NULL);
-    lcb_maybe_breakout(parent);
-}
-
-Bootstrap::Bootstrap(lcb_t instance)
-    : parent(instance),
-      tm(parent->iotable, this),
-      last_refresh(0),
-      errcounter(0),
-      state(S_INITIAL_PRE) {
-    parent->confmon->add_listener(this);
-}
-
-lcb_error_t Bootstrap::bootstrap(unsigned options) {
-    hrtime_t now = gethrtime();
-    if (parent->confmon->is_refreshing()) {
-        return LCB_SUCCESS;
-    }
-
-    if (options & BS_REFRESH_THROTTLE) {
-        /* Refresh throttle requested. This is not true if options == ALWAYS */
-        hrtime_t next_ts;
-        unsigned errthresh = LCBT_SETTING(parent, weird_things_threshold);
-
-        if (options & BS_REFRESH_INCRERR) {
-            errcounter++;
-        }
-        next_ts = last_refresh;
-        next_ts += LCB_US2NS(LCBT_SETTING(parent, weird_things_delay));
-        if (now < next_ts && errcounter < errthresh) {
-            lcb_log(LOGARGS(parent, INFO),
-                "Not requesting a config refresh because of throttling parameters. Next refresh possible in %ums or %u errors. "
-                "See LCB_CNTL_CONFDELAY_THRESH and LCB_CNTL_CONFERRTHRESH to modify the throttling settings",
-                LCB_NS2US(next_ts-now)/1000, (unsigned)errthresh-errcounter);
-            return LCB_SUCCESS;
-        }
-    }
-
-    if (options == BS_REFRESH_INITIAL) {
-        state = S_INITIAL_PRE;
-        parent->confmon->prepare();
-        tm.rearm(LCBT_SETTING(parent, config_timeout));
-        lcb_aspend_add(&parent->pendops, LCB_PENDTYPE_COUNTER, NULL);
-    }
-
-    /* Reset the counters */
-    errcounter = 0;
-    if (options != BS_REFRESH_INITIAL) {
-        last_refresh = now;
-    }
-    parent->confmon->start();
-    return LCB_SUCCESS;
-}
-
-Bootstrap::~Bootstrap() {
-    tm.release();
-    parent->confmon->remove_listener(this);
-}
-
-LIBCOUCHBASE_API
-lcb_error_t
-lcb_get_bootstrap_status(lcb_t instance)
-{
-    if (instance->cur_configinfo) {
-        return LCB_SUCCESS;
-    }
-    if (instance->last_error != LCB_SUCCESS) {
-        return instance->last_error;
-    }
-    if (instance->type == LCB_TYPE_CLUSTER) {
-        if (lcb::clconfig::http_get_conn(instance->confmon) != NULL) {
-            return LCB_SUCCESS;
-        }
-    }
-    return LCB_ERROR;
-}
-
-LIBCOUCHBASE_API
-void
-lcb_refresh_config(lcb_t instance)
-{
-    instance->bootstrap(BS_REFRESH_ALWAYS);
-}

data/ext/libcouchbase/src/bucketconfig/bc_file.cc

@@ -1,281 +0,0 @@
-/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/*
- *     Copyright 2013 Couchbase, Inc.
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- */
-
-#include "internal.h"
-#include "clconfig.h"
-#include <lcbio/lcbio.h>
-#include <lcbio/timer-ng.h>
-#include <lcbio/timer-cxx.h>
-#include <fstream>
-#include <iostream>
-#include <istream>
-
-#define CONFIG_CACHE_MAGIC "{{{fb85b563d0a8f65fa8d3d58f1b3a0708}}}"
-
-#define LOGARGS(pb, lvl) static_cast<Provider*>(pb)->parent->settings, "bc_file", LCB_LOG_##lvl, __FILE__, __LINE__
-#define LOGFMT "(cache=%s) "
-#define LOGID(fb) fb->filename.c_str()
-
-using namespace lcb::clconfig;
-
-struct FileProvider : Provider, Listener {
-    FileProvider(Confmon* confmon);
-    ~FileProvider();
-
-    enum Status { CACHE_ERROR, NO_CHANGES, UPDATED };
-    Status load_cache();
-    void reload_cache();
-    void maybe_remove_file() {
-        if (!is_readonly && !filename.empty()) {
-            remove(filename.c_str());
-        }
-    }
-    void write_cache(lcbvb_CONFIG *vbc);
-
-    /* Overrides */
-    ConfigInfo *get_cached();
-    lcb_error_t refresh();
-    void dump(FILE *) const;
-    void clconfig_lsn(EventType, ConfigInfo*);
-
-    std::string filename;
-    ConfigInfo *config;
-    time_t last_mtime;
-    int last_errno;
-    bool is_readonly; /* Whether the config cache should _not_ overwrite the file */
-    lcb::io::Timer<FileProvider, &FileProvider::reload_cache> timer;
-};
-
-FileProvider::Status FileProvider::load_cache()
-{
-    if (filename.empty()) {
-        return CACHE_ERROR;
-    }
-
-    std::ifstream ifs(filename.c_str(),
-                      std::ios::in | std::ios::binary | std::ios::ate);
-
-    if (!ifs.is_open() || !ifs.good()) {
-        int save_errno = last_errno = errno;
-        lcb_log(LOGARGS(this, ERROR), LOGFMT "Couldn't open for reading: %s", LOGID(this), strerror(save_errno));
-        return CACHE_ERROR;
-    }
-
-    struct stat st;
-    if (stat(filename.c_str(), &st)) {
-        last_errno = errno;
-        return CACHE_ERROR;
-    }
-
-    if (last_mtime == st.st_mtime) {
-        lcb_log(LOGARGS(this, WARN), LOGFMT "Modification time too old", LOGID(this));
-        return NO_CHANGES;
-    }
-
-    size_t fsize = ifs.tellg();
-    if (!fsize) {
-        lcb_log(LOGARGS(this, WARN), LOGFMT "File '%s' is empty", LOGID(this), filename.c_str());
-        return CACHE_ERROR;
-    }
-    ifs.seekg(0, std::ios::beg);
-    std::vector<char> buf(fsize);
-    ifs.read(&buf[0], fsize);
-    buf.push_back(0); // NUL termination
-
-    char *end = std::strstr(&buf[0], CONFIG_CACHE_MAGIC);
-    if (end == NULL) {
-        lcb_log(LOGARGS(this, ERROR), LOGFMT "Couldn't find magic", LOGID(this));
-        maybe_remove_file();
-        return CACHE_ERROR;
-    }
-    *end = '\0'; // Stop parsing at MAGIC
-
-    lcbvb_CONFIG *vbc = lcbvb_create();
-    if (vbc == NULL) {
-        return CACHE_ERROR;
-    }
-
-    Status status = CACHE_ERROR;
-
-    if (lcbvb_load_json(vbc, &buf[0]) != 0) {
-        lcb_log(LOGARGS(this, ERROR), LOGFMT "Couldn't parse configuration", LOGID(this));
-        lcb_log_badconfig(LOGARGS(this, ERROR), vbc, &buf[0]);
-        maybe_remove_file();
-        goto GT_DONE;
-    }
-
-    if (lcbvb_get_distmode(vbc) != LCBVB_DIST_VBUCKET) {
-        lcb_log(LOGARGS(this, ERROR), LOGFMT "Not applying cached memcached config", LOGID(this));
-        goto GT_DONE;
-    }
-
-    if (strcmp(vbc->bname, settings().bucket) != 0) {
-        lcb_log(LOGARGS(this, ERROR), LOGFMT "Bucket name in file is different from the one requested", LOGID(this));
-        goto GT_DONE;
-    }
-
-    if (config) {
-        config->decref();
-    }
-
-    config = ConfigInfo::create(vbc, CLCONFIG_FILE);
-    last_mtime = st.st_mtime;
-
-    status = UPDATED;
-    vbc = NULL;
-
-    GT_DONE:
-    if (vbc != NULL) {
-        lcbvb_destroy(vbc);
-    }
-    return status;
-}
-
-void FileProvider::write_cache(lcbvb_CONFIG *cfg)
-{
-    if (filename.empty() || is_readonly) {
-        return;
-    }
-
-    std::ofstream ofs(filename.c_str(), std::ios::trunc);
-    if (ofs.good()) {
-        lcb_log(LOGARGS(this, INFO), LOGFMT "Writing configuration to file", LOGID(this));
-        char *json = lcbvb_save_json(cfg);
-        ofs << json;
-        ofs << CONFIG_CACHE_MAGIC;
-        free(json);
-    } else {
-        int save_errno = errno;
-        lcb_log(LOGARGS(this, ERROR), LOGFMT "Couldn't open file for writing: %s", LOGID(this), strerror(save_errno));
-    }
-}
-
-ConfigInfo* FileProvider::get_cached() {
-    return filename.empty() ? NULL : config;
-}
-
-void FileProvider::reload_cache() {
-    if (load_cache() == UPDATED) {
-        parent->provider_got_config(this, config);
-    } else {
-        parent->provider_failed(this, LCB_ERROR);
-    }
-}
-
-lcb_error_t FileProvider::refresh() {
-    if (!timer.is_armed()) {
-        timer.signal();
-    }
-    return LCB_SUCCESS;
-}
-
-FileProvider::~FileProvider() {
-    timer.release();
-    if (config) {
-        config->decref();
-    }
-}
-
-void FileProvider::clconfig_lsn(EventType event, ConfigInfo *info) {
-    if (event != CLCONFIG_EVENT_GOT_NEW_CONFIG) {
-        return;
-    }
-    if (!enabled) {
-        return;
-    }
-
-    if (info->get_origin() == CLCONFIG_PHONY ||
-            info->get_origin() == CLCONFIG_FILE) {
-        lcb_log(LOGARGS(this, TRACE), "Not writing configuration originating from PHONY or FILE to cache");
-        return;
-    }
-
-    write_cache(info->vbc);
-}
-
-void FileProvider::dump(FILE *fp) const {
-    fprintf(fp, "## BEGIN FILE PROVIEDER DUMP ##\n");
-    if (!filename.empty()) {
-        fprintf(fp, "FILENAME: %s\n", filename.c_str());
-    }
-    fprintf(fp, "LAST SYSTEM ERRNO: %d\n", last_errno);
-    fprintf(fp, "LAST MTIME: %lu\n", (unsigned long)last_mtime);
-    fprintf(fp, "## END FILE PROVIDER DUMP ##\n");
-
-}
-
-FileProvider::FileProvider(Confmon *parent_)
-    : Provider(parent_, CLCONFIG_FILE),
-      config(NULL), last_mtime(0), last_errno(0), is_readonly(false),
-      timer(parent_->iot, this) {
-    parent->add_listener(this);
-}
-
-static std::string mkcachefile(const char *name, const char *bucket)
-{
-    if (name != NULL) {
-        return std::string(name);
-    } else {
-        std::string buffer(lcb_get_tmpdir());
-        if (buffer.empty()) {
-            buffer += ".";
-        }
-        buffer += "/";
-        buffer += bucket;
-        return buffer;
-    }
-}
-
-bool lcb::clconfig::file_set_filename(Provider *p, const char *f, bool ro)
-{
-    FileProvider *provider = static_cast<FileProvider*>(p);
-    provider->enabled = 1;
-    provider->filename = mkcachefile(f, p->parent->settings->bucket);
-    provider->is_readonly = bool(ro);
-
-    if (ro) {
-        FILE *fp_tmp = fopen(provider->filename.c_str(), "r");
-        if (!fp_tmp) {
-            lcb_log(LOGARGS(provider, ERROR), LOGFMT "Couldn't open for reading: %s", LOGID(provider), strerror(errno));
-            return false;
-        } else {
-            fclose(fp_tmp);
-        }
-    }
-    return true;
-}
-
-const char *
-lcb::clconfig::file_get_filename(Provider *p)
-{
-    FileProvider *fp = static_cast<FileProvider*>(p);
-    if (fp->filename.empty()) {
-        return NULL;
-    } else {
-        return fp->filename.c_str();
-    }
-}
-
-void
-lcb::clconfig::file_set_readonly(Provider *p, bool val)
-{
-    static_cast<FileProvider*>(p)->is_readonly = val;
-}
-
-Provider* lcb::clconfig::new_file_provider(Confmon *mon) {
-    return new FileProvider(mon);
-}