From 78cd2a767cad0a7645b169d971f66e4894397fab Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tarantool.org>
Date: Fri, 14 Jul 2017 10:56:06 +0300
Subject: [PATCH] Rename ipc.hc => fiber_channel.hc

No semantic changes.

Needed for #1451
---
 src/CMakeLists.txt                                       | 8 ++++----
 src/box/applier.h                                        | 9 +++++----
 src/box/replication.cc                                   | 2 +-
 src/{ipc.c => fiber_channel.c}                           | 8 ++++----
 src/{ipc.h => fiber_channel.h}                           | 6 +++---
 src/lua/{ipc.c => fiber_channel.c}                       | 8 ++++----
 src/lua/{ipc.h => fiber_channel.h}                       | 8 ++++----
 src/lua/init.c                                           | 4 ++--
 test/app/{ipc.result => fiber_channel.result}            | 0
 test/app/{ipc.test.lua => fiber_channel.test.lua}        | 0
 test/unit/CMakeLists.txt                                 | 8 ++++----
 test/unit/{ipc.cc => fiber_channel.cc}                   | 2 +-
 test/unit/{ipc.result => fiber_channel.result}           | 0
 test/unit/{ipc_stress.cc => fiber_channel_stress.cc}     | 2 +-
 .../{ipc_stress.result => fiber_channel_stress.result}   | 0
 15 files changed, 33 insertions(+), 32 deletions(-)
 rename src/{ipc.c => fiber_channel.c} (99%)
 rename src/{ipc.h => fiber_channel.h} (98%)
 rename src/lua/{ipc.c => fiber_channel.c} (98%)
 rename src/lua/{ipc.h => fiber_channel.h} (88%)
 rename test/app/{ipc.result => fiber_channel.result} (100%)
 rename test/app/{ipc.test.lua => fiber_channel.test.lua} (100%)
 rename test/unit/{ipc.cc => fiber_channel.cc} (98%)
 rename test/unit/{ipc.result => fiber_channel.result} (100%)
 rename test/unit/{ipc_stress.cc => fiber_channel_stress.cc} (97%)
 rename test/unit/{ipc_stress.result => fiber_channel_stress.result} (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c5f32aed79..e56025c288 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -71,8 +71,10 @@ set (core_sources
      say.c
      memory.c
      fiber.c
-     cbus.c
      fiber_pool.c
+     fiber_cond.c
+     fiber_channel.c
+     cbus.c
      exception.cc
      reflection.c
      assoc.c
@@ -115,8 +117,6 @@ set (server_sources
      httpc.c
      coio_buf.cc
      pickle.c
-     ipc.c
-     fiber_cond.c
      latch.c
      errinj.c
      fio.c
@@ -138,8 +138,8 @@ set (server_sources
      lua/init.c
      lua/fiber.c
      lua/fiber_cond.c
+     lua/fiber_channel.c
      lua/trigger.c
-     lua/ipc.c
      lua/msgpack.c
      lua/utils.c
      lua/errno.c
diff --git a/src/box/applier.h b/src/box/applier.h
index 94d4007772..6012b505bc 100644
--- a/src/box/applier.h
+++ b/src/box/applier.h
@@ -33,14 +33,15 @@
 
 #include <netinet/in.h>
 #include <sys/socket.h>
+#include <tarantool_ev.h>
 
+#include "fiber_channel.h"
+#include "trigger.h"
 #include "trivia/util.h"
-#include "uri.h"
 #include "tt_uuid.h"
-#include "trigger.h"
-#include "third_party/tarantool_ev.h"
+#include "uri.h"
+
 #include "vclock.h"
-#include "ipc.h"
 
 struct xstream;
 
diff --git a/src/box/replication.cc b/src/box/replication.cc
index aab847e1bb..30aa6fad3d 100644
--- a/src/box/replication.cc
+++ b/src/box/replication.cc
@@ -31,8 +31,8 @@
 
 #include "replication.h"
 
-#include <ipc.h>
 #include <fiber.h> /* &cord->slabc */
+#include <fiber_channel.h>
 #include <scoped_guard.h>
 #include <small/mempool.h>
 
diff --git a/src/ipc.c b/src/fiber_channel.c
similarity index 99%
rename from src/ipc.c
rename to src/fiber_channel.c
index 18b511eec8..43312de8a0 100644
--- a/src/ipc.c
+++ b/src/fiber_channel.c
@@ -28,10 +28,12 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include "ipc.h"
-#include "fiber.h"
+#include "fiber_channel.h"
+
 #include <stdlib.h>
 
+#include "fiber.h"
+
 enum ipc_wait_status {
 	IPC_WAIT_READER, /* A reader is waiting for writer */
 	IPC_WAIT_WRITER, /* A writer waiting for reader. */
@@ -482,5 +484,3 @@ ipc_channel_get_msg_timeout(struct ipc_channel *ch,
 		timeout -= ev_now(loop()) - start_time;
 	}
 }
-
-
diff --git a/src/ipc.h b/src/fiber_channel.h
similarity index 98%
rename from src/ipc.h
rename to src/fiber_channel.h
index e2b622a6fd..90438042c2 100644
--- a/src/ipc.h
+++ b/src/fiber_channel.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_IPC_H_INCLUDED
-#define TARANTOOL_IPC_H_INCLUDED
+#ifndef TARANTOOL_FIBER_CHANNEL_H_INCLUDED
+#define TARANTOOL_FIBER_CHANNEL_H_INCLUDED 1
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -403,4 +403,4 @@ ipc_channel_put_xc(struct ipc_channel *ch, void *data)
 
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_IPC_H_INCLUDED */
+#endif /* TARANTOOL_FIBER_CHANNEL_H_INCLUDED */
diff --git a/src/lua/ipc.c b/src/lua/fiber_channel.c
similarity index 98%
rename from src/lua/ipc.c
rename to src/lua/fiber_channel.c
index d9b29ff388..68b79affad 100644
--- a/src/lua/ipc.c
+++ b/src/lua/fiber_channel.c
@@ -28,10 +28,10 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include <trivia/util.h>
+#include "lua/fiber_channel.h"
 
-#include "lua/ipc.h"
 #include "lua/fiber.h"
+#include <trivia/util.h>
 
 #include <lua.h>
 #include <lauxlib.h>
@@ -42,9 +42,9 @@
 NORETURN int
 luaL_error(lua_State *L, const char *fmt, ...);
 
-#include <ipc.h>
 #include "lua/utils.h"
 #include <fiber.h>
+#include <fiber_channel.h>
 
 static const char channel_typename[] = "fiber.channel";
 
@@ -272,7 +272,7 @@ lbox_ipc_channel_to_string(struct lua_State *L)
 }
 
 void
-tarantool_lua_ipc_init(struct lua_State *L)
+tarantool_lua_fiber_channel_init(struct lua_State *L)
 {
 	static const struct luaL_Reg channel_meta[] = {
 		{"__gc",	lbox_ipc_channel_gc},
diff --git a/src/lua/ipc.h b/src/lua/fiber_channel.h
similarity index 88%
rename from src/lua/ipc.h
rename to src/lua/fiber_channel.h
index 37247dc669..15d62a5fd4 100644
--- a/src/lua/ipc.h
+++ b/src/lua/fiber_channel.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_LUA_IPC_H_INCLUDED
-#define TARANTOOL_LUA_IPC_H_INCLUDED
+#ifndef TARANTOOL_LUA_FIBER_CHANNEL_H_INCLUDED
+#define TARANTOOL_LUA_FIBER_CHANNEL_H_INCLUDED
 /*
  * Copyright 2010-2015, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -35,10 +35,10 @@ extern "C" {
 #endif /* defined(__cplusplus) */
 
 struct lua_State;
-void tarantool_lua_ipc_init(struct lua_State *L);
+void tarantool_lua_fiber_channel_init(struct lua_State *L);
 
 #if defined(__cplusplus)
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_LUA_IPC_H_INCLUDED */
+#endif /* TARANTOOL_LUA_FIBER_CHANNEL_H_INCLUDED */
diff --git a/src/lua/init.c b/src/lua/init.c
index 44dcdf6157..53507eb59b 100644
--- a/src/lua/init.c
+++ b/src/lua/init.c
@@ -46,7 +46,7 @@
 #include "coio.h"
 #include "lua/fiber.h"
 #include "lua/fiber_cond.h"
-#include "lua/ipc.h"
+#include "lua/fiber_channel.h"
 #include "lua/errno.h"
 #include "lua/socket.h"
 #include "lua/utils.h"
@@ -382,7 +382,7 @@ tarantool_lua_init(const char *tarantool_bin, int argc, char **argv)
 	tarantool_lua_utils_init(L);
 	tarantool_lua_fiber_init(L);
 	tarantool_lua_fiber_cond_init(L);
-	tarantool_lua_ipc_init(L);
+	tarantool_lua_fiber_channel_init(L);
 	tarantool_lua_errno_init(L);
 	tarantool_lua_fio_init(L);
 	tarantool_lua_socket_init(L);
diff --git a/test/app/ipc.result b/test/app/fiber_channel.result
similarity index 100%
rename from test/app/ipc.result
rename to test/app/fiber_channel.result
diff --git a/test/app/ipc.test.lua b/test/app/fiber_channel.test.lua
similarity index 100%
rename from test/app/ipc.test.lua
rename to test/app/fiber_channel.test.lua
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index f56ec18997..30718fe5c1 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -80,11 +80,11 @@ endif ()
 add_executable(fiber_stress.test fiber_stress.cc)
 target_link_libraries(fiber_stress.test core)
 
-add_executable(ipc.test ipc.cc unit.c ${CMAKE_SOURCE_DIR}/src/ipc.c)
-target_link_libraries(ipc.test core)
+add_executable(fiber_channel.test fiber_channel.cc unit.c)
+target_link_libraries(fiber_channel.test core)
 
-add_executable(ipc_stress.test ipc_stress.cc ${CMAKE_SOURCE_DIR}/src/ipc.c)
-target_link_libraries(ipc_stress.test core)
+add_executable(fiber_channel_stress.test fiber_channel_stress.cc)
+target_link_libraries(fiber_channel_stress.test core)
 
 add_executable(coio.test coio.cc unit.c
         ${CMAKE_SOURCE_DIR}/src/sio.cc
diff --git a/test/unit/ipc.cc b/test/unit/fiber_channel.cc
similarity index 98%
rename from test/unit/ipc.cc
rename to test/unit/fiber_channel.cc
index 66e8ee9893..936014b172 100644
--- a/test/unit/ipc.cc
+++ b/test/unit/fiber_channel.cc
@@ -1,6 +1,6 @@
 #include "memory.h"
 #include "fiber.h"
-#include "ipc.h"
+#include "fiber_channel.h"
 #include "unit.h"
 
 int status;
diff --git a/test/unit/ipc.result b/test/unit/fiber_channel.result
similarity index 100%
rename from test/unit/ipc.result
rename to test/unit/fiber_channel.result
diff --git a/test/unit/ipc_stress.cc b/test/unit/fiber_channel_stress.cc
similarity index 97%
rename from test/unit/ipc_stress.cc
rename to test/unit/fiber_channel_stress.cc
index f9a845492d..b487c7d3aa 100644
--- a/test/unit/ipc_stress.cc
+++ b/test/unit/fiber_channel_stress.cc
@@ -1,6 +1,6 @@
 #include "memory.h"
 #include "fiber.h"
-#include "ipc.h"
+#include "fiber_channel.h"
 #include "unit.h"
 
 enum {
diff --git a/test/unit/ipc_stress.result b/test/unit/fiber_channel_stress.result
similarity index 100%
rename from test/unit/ipc_stress.result
rename to test/unit/fiber_channel_stress.result
-- 
GitLab