lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 12:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

disable code cache by default and always register skynet.codecache

Browse Source
This commit is contained in:
Cloud Wu
2014-03-21 10:36:54 +08:00
parent 84ec9c4123
commit 55f60ab002
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service-src/luacode_cache.h
View File

@@ -4,8 +4,6 @@
#include <lua.h> #include <lua.h>
#include <stddef.h> #include <stddef.h>
const char * luacode_load(const char * key, const char * code, size_t *sz);
int luacode_loadfile(lua_State *L, const char *filename); int luacode_loadfile(lua_State *L, const char *filename);
int luacode_lib(lua_State *); int luacode_lib(lua_State *);

36
service-src/service_lua.c
View File

@@ -7,6 +7,7 @@
#include "luacompat52.h" #include "luacompat52.h"
#include "service_lua.h" #include "service_lua.h"
#include "luaalloc.h" #include "luaalloc.h"
#include "luacode_cache.h"
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
@@ -17,10 +18,28 @@
//#define PREALLOCMEM (1024 * 1024) //#define PREALLOCMEM (1024 * 1024)
// define NOCODECACHE to disable lua code cache // define NOCODECACHE to disable lua code cache
//#define NOCODECACHE #define NOCODECACHE
#ifdef NOCODECACHE
#define loadfile(L, name) luaL_loadfile(L,name)
#else
// luacode_loadfile is the same with luaL_loadfile except cache.
#define loadfile(L, name) luacode_loadfile(L,name)
#endif
// LUA_CACHELIB may defined in patched lua for shared proto
#ifdef LUA_CACHELIB
#define codecache luaopen_cache
#else
#define codecache luacode_lib
#ifndef NOCODECACHE
#include "luacode_cache.h"
#endif #endif
// time // time
@@ -77,12 +96,7 @@ _try_load(lua_State *L, const char * path, int pathlen, const char * name) {
exit(1); exit(1);
} }
tmp[namelen+pathlen-1] = '\0'; tmp[namelen+pathlen-1] = '\0';
// luacode_loadfile is the same with luaL_loadfile except cache. int r = loadfile(L,tmp);
#ifdef NOCODECACHE
int r = luaL_loadfile(L,tmp);
#else
int r = luacode_loadfile(L,tmp);
#endif
if (r == LUA_OK) { if (r == LUA_OK) {
int i; int i;
for (i=namelen+pathlen-2;i>=0;i--) { for (i=namelen+pathlen-2;i>=0;i--) {
@@ -181,10 +195,8 @@ _init(struct snlua *l, struct skynet_context *ctx, const char * args) {
luaL_openlibs(L); luaL_openlibs(L);
lua_pushlightuserdata(L, l); lua_pushlightuserdata(L, l);
lua_setfield(L, LUA_REGISTRYINDEX, "skynet_lua"); lua_setfield(L, LUA_REGISTRYINDEX, "skynet_lua");
#ifndef NOCODECACHE luaL_requiref(L, "skynet.codecache", codecache , 0);
luaL_requiref(L, "skynet.codecache", luacode_lib , 0);
lua_pop(L,1); lua_pop(L,1);
#endif
lua_gc(L, LUA_GCRESTART, 0); lua_gc(L, LUA_GCRESTART, 0);
char tmp[strlen(args)+1]; char tmp[strlen(args)+1];