From e197d66d2dde80980c04ce2ac310a6378b02602c Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Tue, 12 Jan 2016 19:26:52 +0300
Subject: [PATCH] Update libsmall to the latest version
Needed to prepare a fix for #1185
Actually s/_ex_cb/_xc_cb/g.
---
src/box/lua/call.cc | 4 ++--
src/box/lua/net_box.cc | 2 +-
src/box/lua/tuple.cc | 12 ++++++------
src/box/memtx_engine.cc | 4 ++--
src/box/sophia_engine.cc | 2 +-
src/lib/small | 2 +-
src/lua/msgpack.cc | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/box/lua/call.cc b/src/box/lua/call.cc
index 5abecd1128..b91d966990 100644
--- a/src/box/lua/call.cc
+++ b/src/box/lua/call.cc
@@ -542,7 +542,7 @@ execute_lua_call(lua_State *L, struct func *func, struct request *request,
uint32_t count = 0;
struct obuf_svp svp = iproto_prepare_select(out);
struct mpstream stream;
- mpstream_init(&stream, out, obuf_reserve_ex_cb, obuf_alloc_ex_cb);
+ mpstream_init(&stream, out, obuf_reserve_xc_cb, obuf_alloc_xc_cb);
try {
/** Check if we deal with a table of tables. */
@@ -638,7 +638,7 @@ execute_eval(lua_State *L, struct request *request, struct obuf *out)
/* Send results of the called procedure to the client. */
struct obuf_svp svp = iproto_prepare_select(out);
struct mpstream stream;
- mpstream_init(&stream, out, obuf_reserve_ex_cb, obuf_alloc_ex_cb);
+ mpstream_init(&stream, out, obuf_reserve_xc_cb, obuf_alloc_xc_cb);
int nrets = lua_gettop(L);
try {
for (int k = 1; k <= nrets; ++k) {
diff --git a/src/box/lua/net_box.cc b/src/box/lua/net_box.cc
index 63f8b74338..3b024cafe3 100644
--- a/src/box/lua/net_box.cc
+++ b/src/box/lua/net_box.cc
@@ -50,7 +50,7 @@ netbox_prepare_request(lua_State *L, struct mpstream *stream, uint32_t r_type)
struct ibuf *ibuf = (struct ibuf *) lua_topointer(L, 1);
uint64_t sync = luaL_touint64(L, 2);
- mpstream_init(stream, ibuf, ibuf_reserve_ex_cb, ibuf_alloc_ex_cb);
+ mpstream_init(stream, ibuf, ibuf_reserve_xc_cb, ibuf_alloc_xc_cb);
/* Remember initial size of ibuf (see netbox_encode_request()) */
size_t used = ibuf_used(ibuf);
diff --git a/src/box/lua/tuple.cc b/src/box/lua/tuple.cc
index c3463a81ba..6951fad696 100644
--- a/src/box/lua/tuple.cc
+++ b/src/box/lua/tuple.cc
@@ -102,7 +102,7 @@ lbox_tuple_new(lua_State *L)
struct region *gc = &fiber()->gc;
RegionGuard guard(gc);
struct mpstream stream;
- mpstream_init(&stream, gc, region_reserve_ex_cb, region_alloc_ex_cb);
+ mpstream_init(&stream, gc, region_reserve_xc_cb, region_alloc_xc_cb);
if (argc == 1 && (lua_istable(L, 1) || lua_istuple(L, 1))) {
/* New format: box.tuple.new({1, 2, 3}) */
@@ -242,7 +242,7 @@ lbox_encode_tuple_on_gc(lua_State *L, int idx, size_t *p_len)
struct region *gc = &fiber()->gc;
size_t used = region_used(gc);
struct mpstream stream;
- mpstream_init(&stream, gc, region_reserve_ex_cb, region_alloc_ex_cb);
+ mpstream_init(&stream, gc, region_reserve_xc_cb, region_alloc_xc_cb);
luamp_encode_tuple(L, luaL_msgpack_default, &stream, idx);
mpstream_flush(&stream);
*p_len = region_used(gc) - used;
@@ -308,7 +308,7 @@ lbox_tuple_transform(struct lua_State *L)
struct region *gc = &fiber()->gc;
RegionGuard guard(gc);
struct mpstream stream;
- mpstream_init(&stream, gc, region_reserve_ex_cb, region_alloc_ex_cb);
+ mpstream_init(&stream, gc, region_reserve_xc_cb, region_alloc_xc_cb);
/*
* Prepare UPDATE expression
*/
@@ -332,7 +332,7 @@ lbox_tuple_transform(struct lua_State *L)
size_t expr_len = region_used(gc) - guard.used;
const char *expr = (char *) region_join_xc(gc, expr_len);
struct tuple *new_tuple = tuple_update(tuple_format_ber,
- region_alloc_ex_cb,
+ region_alloc_xc_cb,
gc, tuple, expr,
expr + expr_len, 0);
lbox_pushtuple(L, new_tuple);
@@ -402,7 +402,7 @@ boxffi_tuple_update(struct tuple *tuple, const char *expr, const char *expr_end)
RegionGuard region_guard(&fiber()->gc);
try {
struct tuple *new_tuple = tuple_update(tuple_format_ber,
- region_alloc_ex_cb, &fiber()->gc, tuple,
+ region_alloc_xc_cb, &fiber()->gc, tuple,
expr, expr_end, 1);
tuple_ref(new_tuple); /* must not throw in this case */
return new_tuple;
@@ -417,7 +417,7 @@ boxffi_tuple_upsert(struct tuple *tuple, const char *expr, const char *expr_end)
RegionGuard region_guard(&fiber()->gc);
try {
struct tuple *new_tuple = tuple_upsert(tuple_format_ber,
- region_alloc_ex_cb, &fiber()->gc, tuple,
+ region_alloc_xc_cb, &fiber()->gc, tuple,
expr, expr_end, 1);
tuple_ref(new_tuple); /* must not throw in this case */
return new_tuple;
diff --git a/src/box/memtx_engine.cc b/src/box/memtx_engine.cc
index e0b6587691..13108eb731 100644
--- a/src/box/memtx_engine.cc
+++ b/src/box/memtx_engine.cc
@@ -273,7 +273,7 @@ MemtxSpace::executeUpdate(struct txn *txn, struct space *space,
/* Update the tuple; legacy, request ops are in request->tuple */
struct tuple *new_tuple = tuple_update(space->format,
- region_alloc_ex_cb,
+ region_alloc_xc_cb,
&fiber()->gc,
old_tuple, request->tuple,
request->tuple_end,
@@ -336,7 +336,7 @@ MemtxSpace::executeUpsert(struct txn *txn, struct space *space,
} else {
/* Update the tuple. */
struct tuple *new_tuple =
- tuple_upsert(space->format, region_alloc_ex_cb,
+ tuple_upsert(space->format, region_alloc_xc_cb,
&fiber()->gc, old_tuple,
request->ops, request->ops_end,
request->index_base);
diff --git a/src/box/sophia_engine.cc b/src/box/sophia_engine.cc
index eab35f1996..c4c211067d 100644
--- a/src/box/sophia_engine.cc
+++ b/src/box/sophia_engine.cc
@@ -171,7 +171,7 @@ SophiaSpace::executeUpdate(struct txn *txn, struct space *space,
/* Do tuple update */
struct tuple *new_tuple =
tuple_update(space->format,
- region_alloc_ex_cb,
+ region_alloc_xc_cb,
&fiber()->gc,
old_tuple, request->tuple,
request->tuple_end,
diff --git a/src/lib/small b/src/lib/small
index ce3992322f..93e3e56114 160000
--- a/src/lib/small
+++ b/src/lib/small
@@ -1 +1 @@
-Subproject commit ce3992322feef32e7667b10424923d3542f0e272
+Subproject commit 93e3e56114800ff71510e5d637b94fb8f6a31d26
diff --git a/src/lua/msgpack.cc b/src/lua/msgpack.cc
index bd56496b24..1988a0df53 100644
--- a/src/lua/msgpack.cc
+++ b/src/lua/msgpack.cc
@@ -383,7 +383,7 @@ lua_msgpack_encode(lua_State *L)
struct region *gc= &fiber()->gc;
RegionGuard guard(gc);
struct mpstream stream;
- mpstream_init(&stream, gc, region_reserve_ex_cb, region_alloc_ex_cb);
+ mpstream_init(&stream, gc, region_reserve_xc_cb, region_alloc_xc_cb);
luamp_encode_r(L, cfg, &stream, 0);
mpstream_flush(&stream);
--
GitLab