From 139c7ffdc785b19297e8c3b2d2586dfa284f97a5 Mon Sep 17 00:00:00 2001
From: Thiago de Arruda <tpadilha84@gmail.com>
Date: Mon, 26 May 2014 13:39:08 -0300
Subject: API: Events: Return channel id from the API discover request

This refactors msgapck_rpc_{dipatch,call} to receive the channel id as
argument. Now the discovery request returns the [id, metadata] array.
---
 scripts/msgpack-gen.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/msgpack-gen.lua b/scripts/msgpack-gen.lua
index d303fde2fc..3cc1558fd7 100644
--- a/scripts/msgpack-gen.lua
+++ b/scripts/msgpack-gen.lua
@@ -111,7 +111,7 @@ end
 output:write([[
 };
 
-void msgpack_rpc_dispatch(msgpack_object *req, msgpack_packer *res)
+void msgpack_rpc_dispatch(uint64_t id, msgpack_object *req, msgpack_packer *res)
 {
   Error error = { .set = false };
   uint64_t method_id = (uint32_t)req->via.array.ptr[2].via.u64;
@@ -119,7 +119,9 @@ void msgpack_rpc_dispatch(msgpack_object *req, msgpack_packer *res)
   switch (method_id) {
     case 0:
       msgpack_pack_nil(res);
-      // The result is the `msgpack_metadata` byte array
+      // The result is the [channel_id, metadata] array
+      msgpack_pack_array(res, 2);
+      msgpack_pack_uint64(res, id);
       msgpack_pack_raw(res, sizeof(msgpack_metadata));
       msgpack_pack_raw_body(res, msgpack_metadata, sizeof(msgpack_metadata));
       return;
-- 
cgit 


From a80a68c92747144f0094368ae01c0cb23095433c Mon Sep 17 00:00:00 2001
From: Thiago de Arruda <tpadilha84@gmail.com>
Date: Mon, 26 May 2014 13:39:17 -0300
Subject: Build: Enable valgrind's --leak-check when testing the API

---
 scripts/travis.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/travis.sh b/scripts/travis.sh
index 3daa2652e5..2b97773b22 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -3,6 +3,7 @@
 tmpdir="$(pwd)/tmp"
 rm -rf "$tmpdir"
 mkdir -p "$tmpdir"
+suppressions="$(pwd)/.valgrind.supp"
 
 valgrind_check() {
 	(
@@ -171,7 +172,7 @@ elif [ "$TRAVIS_BUILD_TYPE" = "api/python" ]; then
   sudo pip install .
   sudo pip install nose
 	test_cmd="nosetests --verbosity=2"
-	nvim_cmd="valgrind -q --track-origins=yes --log-file=$tmpdir/valgrind-%p.log ../build/bin/nvim -u NONE"
+	nvim_cmd="valgrind -q --track-origins=yes --leak-check=yes --suppressions=$suppressions --log-file=$tmpdir/valgrind-%p.log ../build/bin/nvim -u NONE"
 	if ! ../scripts/run-api-tests.exp "$test_cmd" "$nvim_cmd"; then
 		valgrind_check "$tmpdir"
 		exit 1
-- 
cgit