Renamed multi-state to multiple-vm and made small improvements

Author: Miqueas

src/12-multi-state.c

@@ -0,0 +1,93 @@
+#include <stdio.h>
+#include <pthread.h>
+
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
+
+#include "constants.h"
+
+/* Using multiple Lua VM's in the same program */
+
+void *luaThread1(void *_) {
+  lua_State *L = luaL_newstate();
+  luaL_openlibs(L);
+  int error = luaL_dofile(L, THREADED_PATH);
+
+  if (error) {
+    fprintf(stderr, "Thread 3: Error. Code: %d\n", error);
+    lua_close(L);
+    return NULL;
+  }
+
+  lua_getglobal(L, "thread1");
+  lua_call(L, 0, 0);
+  lua_getglobal(L, "print");
+  lua_pushstring(L, "\n\n");
+  lua_call(L, 1, 0);
+  lua_close(L);
+
+  return NULL;
+}
+
+void *luaThread2(void *_) {
+  lua_State *L = luaL_newstate();
+  luaL_openlibs(L);
+  int error = luaL_dofile(L, THREADED_PATH);
+
+  if (error) {
+    fprintf(stderr, "Thread 3: Error. Code: %d\n", error);
+    lua_close(L);
+    return NULL;
+  }
+
+  lua_getglobal(L, "thread2");
+  lua_call(L, 0, 0);
+  lua_getglobal(L, "print");
+  lua_pushstring(L, "\n\n");
+  lua_call(L, 1, 0);
+  lua_close(L);
+
+  return NULL;
+}
+
+void *luaThread3(void *_) {
+  lua_State *L = luaL_newstate();
+  luaL_openlibs(L);
+  int error = luaL_dofile(L, THREADED_PATH);
+
+  if (error) {
+    fprintf(stderr, "Thread 3: Error. Code: %d\n", error);
+    lua_close(L);
+    return NULL;
+  }
+
+  lua_getglobal(L, "thread3");
+  lua_pushinteger(L, (lua_Integer) 29);
+  lua_pushinteger(L, (lua_Integer) 69);
+  lua_call(L, 2, 1);
+  lua_Integer result = luaL_checkinteger(L, 1);
+  lua_getglobal(L, "print");
+  lua_pushstring(L, "Thread 3 result: ");
+  lua_pushinteger(L, result);
+  lua_pushstring(L, "\n\n");
+  lua_call(L, 3, 0);
+  lua_close(L);
+
+  return NULL;
+}
+
+int main(void) {
+  pthread_t thread1;
+  pthread_t thread2;
+  pthread_t thread3;
+
+  pthread_create(&thread1, NULL, luaThread1, NULL);
+  pthread_join(thread1, NULL);
+  pthread_create(&thread2, NULL, luaThread2, NULL);
+  pthread_join(thread2, NULL);
+  pthread_create(&thread3, NULL, luaThread3, NULL);
+  pthread_join(thread3, NULL);
+
+  return 0;
+}

src/12-multiple-vm.c

@@ -0,0 +1,13 @@
+function thread1()
+  print("Hello from thread 1!")
+end
+
+function thread2()
+  for k, v in pairs(_G) do
+    print(k, v)
+  end
+end
+
+function thread3(a, b)
+  return a * b
+end

src/12-multiple-vm.lua

@@ -1,3 +1,4 @@
 #define TABLE_PATH     "@table@"
 #define METATABLE_PATH "@metatable@"
-#define HOOKS_PATH     "@hooks@"
+#define HOOKS_PATH     "@hooks@"
+#define THREADED_PATH  "@threaded@"

src/constants.h.in

@@ -14,13 +14,14 @@ else
 endif
 
 # ==== Constants header used by some examples (04, 05 & 11) ==== #
-configure_file(
+constants_h = configure_file(
   input: 'constants.h.in',
   output: 'constants.h',
   configuration: {
     'table':     meson.current_source_dir() / '04-table.lua',
     'metatable': meson.current_source_dir() / '05-metatable.lua',
-    'hooks':     meson.current_source_dir() / '11-hooks.lua'
+    'hooks':     meson.current_source_dir() / '11-hooks.lua',
+    'threaded':  meson.current_source_dir() / '12-multiple-vm.lua',
   }
 )
 # ==== Example 01: hello world ==== #
@@ -53,10 +54,10 @@ basic_lib_lua = configure_file(
 )
 
 # ==== Example 04: table ==== #
-table_exe = executable('04-table', '04-table.c', dependencies: lua51_dep)
+table_exe = executable('04-table', [ constants_h, '04-table.c' ], dependencies: lua51_dep)
 
 # ==== Example 05: metatable ==== #
-metatable_exe = executable('05-metatable', '05-metatable.c', dependencies: lua51_dep)
+metatable_exe = executable('05-metatable', [ constants_h, '05-metatable.c'], dependencies: lua51_dep)
 
 # ==== Example 06: userdata ==== #
 library('userdata', '06-userdata.c',
@@ -107,10 +108,10 @@ addfn_lua = configure_file(
 )
 
 # ==== Example 11: hooks ==== #
-hooks_exe = executable('11-hooks', '11-hooks.c', dependencies: lua51_dep)
+hooks_exe = executable('11-hooks', [ constants_h, '11-hooks.c' ], dependencies: lua51_dep)
 
-# ==== Example 12: multiple states ==== #
-multi_state_exe = executable('12-multi-state', '12-multi-state.c', dependencies: lua51_dep)
+# ==== Example 12: multiple vm's ==== #
+multiple_vm_exe = executable('12-multiple-vm', [ constants_h, '12-multiple-vm.c' ], dependencies: lua51_dep, link_args: [ '-lpthread' ])
 
 if tests
   test('01 hello world', hello_world_exe)
@@ -130,5 +131,5 @@ if tests
   test('09 newlib (5.2+)', lua52_bin, args: [ newlib_lua ], env: { 'LUA_CPATH': meson.current_build_dir() / '?.so' })
   test('10 functions', lua51_bin, args: [ addfn_lua ], env: { 'LUA_CPATH': meson.current_build_dir() / '?.so' })
   test('11 hooks', hooks_exe)
-  test('12 multi state', multi_state_exe)
+  test('12 multi state', multiple_vm_exe)
 endif