Merge branch '1.6' of github.com:tarantool/tarantool into 1.6

src/box/errcode.h

@@ -150,8 +150,8 @@ struct errcode_record {
 	/* 96 */_(ER_GUEST_USER_PASSWORD,       2, "Setting password for guest user has no effect") \
 	/* 97 */_(ER_TRANSACTION_CONFLICT,      2, "Transaction has been aborted by conflict") \
 	/* 98 */_(ER_UNSUPPORTED_ROLE_PRIV,     2, "Unsupported role privilege '%s'") \
-	/* 98 */_(ER_LOAD_FUNCTION,		2, "Failed to dynamically load function '%s': %s") \
-	/* 98 */_(ER_FUNCTION_LANGUAGE,		2, "Unsupported language '%s' specified for function '%s'") \
+	/* 99 */_(ER_LOAD_FUNCTION,		2, "Failed to dynamically load function '%s': %s") \
+	/*100 */_(ER_FUNCTION_LANGUAGE,		2, "Unsupported language '%s' specified for function '%s'") \
 
 /*
  * !IMPORTANT! Please follow instructions at start of the file

src/fiber.cc

@@ -66,6 +66,7 @@ fiber_call(struct fiber *callee)
 
 	assert(cord->call_stack_depth < FIBER_CALL_STACK);
 	assert(caller);
+	assert(caller != callee);
 
 	cord->call_stack_depth++;
 	cord->fiber = callee;

src/lua/log.lua

@@ -19,9 +19,14 @@ ffi.cdef[[
     };
 
     pid_t logger_pid;
+    extern int log_level;
 ]]
 
 local function say(level, fmt, ...)
+    if ffi.C.log_level < level then
+-- don't waste cycles on debug.getinfo()
+        return
+    end
     local debug = require('debug')
     local str = string.format(tostring(fmt), ...)
     local frame = debug.getinfo(3, "Sl")

src/say.cc

@@ -48,8 +48,7 @@ pid_t logger_pid;
 static bool booting = true;
 static bool logger_background = true;
 static const char *binary_filename;
-static int log_level_default = S_INFO;
-static int *log_level = &log_level_default;
+int log_level = S_INFO;
 
 static void
 sayf(int level, const char *filename, int line, const char *error,
@@ -89,7 +88,7 @@ say_init(const char *argv0)
 void
 say_set_log_level(int new_level)
 {
-	*log_level = new_level;
+	log_level = new_level;
 }
 
 /**
@@ -216,7 +215,7 @@ say_init_file()
 void
 say_logger_init(const char *path, int level, int nonblock, int background)
 {
-	*log_level = level;
+	log_level = level;
 	logger_nonblock = nonblock;
 	logger_background = background;
 	setvbuf(stderr, NULL, _IONBF, 0);
@@ -307,7 +306,7 @@ static void
 sayf(int level, const char *filename, int line, const char *error, const char *format, ...)
 {
 	int errsv = errno; /* Preserve the errno. */
-	if (*log_level < level)
+	if (log_level < level)
 		return;
 	va_list ap;
 	va_start(ap, format);

src/say.h

@@ -52,6 +52,7 @@ enum say_level {
 /** \endcond public */
 
 extern int log_fd;
+extern int log_level;
 extern pid_t logger_pid;
 
 void