Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
tarantool
Commits
655713fa
Commit
655713fa
authored
9 years ago
by
Roman Tsisyk
Browse files
Options
Downloads
Patches
Plain Diff
Fix cyclic dependency between libserver.a and libbox.a
Spent couple hours to figure it out.
parent
feba8f63
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/box/lua/call.h
+3
-0
3 additions, 0 deletions
src/box/lua/call.h
src/lua/init.c
+0
-10
0 additions, 10 deletions
src/lua/init.c
src/lua/init.h
+2
-0
2 additions, 0 deletions
src/lua/init.h
src/main.cc
+2
-0
2 additions, 0 deletions
src/main.cc
with
7 additions
and
10 deletions
src/box/lua/call.h
+
3
−
0
View file @
655713fa
...
...
@@ -49,6 +49,9 @@ boxffi_select(struct port *port, uint32_t space_id, uint32_t index_id,
char
*
lbox_encode_tuple_on_gc
(
struct
lua_State
*
L
,
int
idx
,
size_t
*
p_len
);
void
box_lua_init
(
struct
lua_State
*
L
);
#if defined(__cplusplus)
}
/* extern "C" */
...
...
This diff is collapsed.
Click to expand it.
src/lua/init.c
+
0
−
10
View file @
655713fa
...
...
@@ -58,14 +58,6 @@
#include
<readline/readline.h>
#include
<readline/history.h>
/**
* This is a callback used by tarantool_lua_init() to open
* module-specific libraries into given Lua state.
*
* No return value, panics if error.
*/
extern
void
box_lua_init
(
struct
lua_State
*
L
);
/**
* The single Lua state of the transaction processor (tx) thread.
*/
...
...
@@ -430,8 +422,6 @@ tarantool_lua_init(const char *tarantool_bin, int argc, char **argv)
luaopen_tarantool
(
L
);
lua_pop
(
L
,
1
);
box_lua_init
(
L
);
lua_newtable
(
L
);
lua_pushinteger
(
L
,
-
1
);
lua_pushstring
(
L
,
tarantool_bin
);
...
...
This diff is collapsed.
Click to expand it.
src/lua/init.h
+
2
−
0
View file @
655713fa
...
...
@@ -41,6 +41,8 @@ struct lua_State;
struct
luaL_Reg
;
extern
bool
start_loop
;
extern
struct
lua_State
*
tarantool_L
;
/**
* Create an instance of Lua interpreter and load it with
* Tarantool modules. Creates a Lua state, imports global
...
...
This diff is collapsed.
Click to expand it.
src/main.cc
+
2
−
0
View file @
655713fa
...
...
@@ -71,6 +71,7 @@
#include
<readline/history.h>
#include
"title.h"
#include
<libutil.h>
#include
"box/lua/call.h"
/* box_lua_init() */
static
pid_t
master_pid
=
getpid
();
static
struct
pidfh
*
pid_file_handle
;
...
...
@@ -630,6 +631,7 @@ main(int argc, char **argv)
coeio_init
();
signal_init
();
tarantool_lua_init
(
tarantool_bin
,
main_argc
,
main_argv
);
box_lua_init
(
tarantool_L
);
/* main core cleanup routine */
atexit
(
tarantool_free
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment