annotate src/luan/modules/Thread.luan @ 1302:5345466fa61f

fix last commit and improve stringify
author Franklin Schmidt <fschmidt@gmail.com>
date Sun, 13 Jan 2019 17:28:57 -0700
parents a9cc35c71eb0
children 70eecde81820
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
321
7f7708e8fdd4 remove import statement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 320
diff changeset
1 java()
7f7708e8fdd4 remove import statement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 320
diff changeset
2 local ThreadLuan = require "java:luan.modules.ThreadLuan"
794
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
3 local Luan = require "luan:Luan.luan"
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
4 local error = Luan.error
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
5 local set_metatable = Luan.set_metatable or error()
1188
9f5edbef3f55 remove old web log files
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
6 local try = Luan.try or error()
1233
3fad7091b419 make Thread.safe implicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 1188
diff changeset
7 local Logging = require "luan:logging/Logging.luan"
3fad7091b419 make Thread.safe implicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 1188
diff changeset
8 local logger = Logging.logger "Thread"
794
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
9
301
a6bf8ff720f8 add java security
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
10
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 794
diff changeset
11 local Thread = {}
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
12
1104
772d16c89056 add Thread.sleep()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1099
diff changeset
13 Thread.sleep = ThreadLuan.sleep
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
14
1233
3fad7091b419 make Thread.safe implicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 1188
diff changeset
15 local function safe(fn)
1241
2b5046cd7963 fix Thread safe()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1233
diff changeset
16 return function(...)
2b5046cd7963 fix Thread safe()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1233
diff changeset
17 try( {
2b5046cd7963 fix Thread safe()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1233
diff changeset
18 fn
1188
9f5edbef3f55 remove old web log files
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
19 catch = function(e)
9f5edbef3f55 remove old web log files
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
20 logger.error(e)
9f5edbef3f55 remove old web log files
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
21 end
1241
2b5046cd7963 fix Thread safe()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1233
diff changeset
22 }, ... )
1188
9f5edbef3f55 remove old web log files
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
23 end
9f5edbef3f55 remove old web log files
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
24 end
9f5edbef3f55 remove old web log files
Franklin Schmidt <fschmidt@gmail.com>
parents: 1166
diff changeset
25
1233
3fad7091b419 make Thread.safe implicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 1188
diff changeset
26 function Thread.fork(fn,...)
3fad7091b419 make Thread.safe implicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 1188
diff changeset
27 fn = safe(fn)
3fad7091b419 make Thread.safe implicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 1188
diff changeset
28 ThreadLuan.fork(fn,...)
3fad7091b419 make Thread.safe implicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 1188
diff changeset
29 end
3fad7091b419 make Thread.safe implicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 1188
diff changeset
30
1301
a9cc35c71eb0 go back to Thread.schedule
Franklin Schmidt <fschmidt@gmail.com>
parents: 1255
diff changeset
31 function Thread.schedule(delay,fn,repeating)
1233
3fad7091b419 make Thread.safe implicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 1188
diff changeset
32 fn = safe(fn)
1302
5345466fa61f fix last commit and improve stringify
Franklin Schmidt <fschmidt@gmail.com>
parents: 1301
diff changeset
33 ThreadLuan.schedule(delay,fn,repeating)
1233
3fad7091b419 make Thread.safe implicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 1188
diff changeset
34 end
3fad7091b419 make Thread.safe implicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 1188
diff changeset
35
3fad7091b419 make Thread.safe implicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 1188
diff changeset
36
1159
3ef883468fd0 remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1157
diff changeset
37 --[[
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 794
diff changeset
38 Thread.global = {} -- shared across threads
1099
a5406f076726 improve Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
39 local map = ThreadLuan.GlobalMap.new()
794
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
40 local global_mt = {}
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 794
diff changeset
41 set_metatable(Thread.global,global_mt)
794
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
42
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
43 function global_mt.__index(_,key)
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
44 return map.get(key)
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
45 end
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
46
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
47 function global_mt.__new_index(_,key,value)
1099
a5406f076726 improve Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
48 map.put(key,value)
794
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
49 end
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
50
1099
a5406f076726 improve Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
51 function Thread.get_global_timeout()
794
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
52 return map.timeout
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
53 end
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
54
1099
a5406f076726 improve Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
55 function Thread.set_global_timeout(timeout)
794
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
56 map.timeout = timeout
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
57 end
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
58
1099
a5406f076726 improve Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
59 function Thread.global_put(key,value)
a5406f076726 improve Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
60 return map.put(key,value)
a5406f076726 improve Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
61 end
1159
3ef883468fd0 remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1157
diff changeset
62 ]]
794
f16c77ef0f4f add Parsers.json_string and Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 788
diff changeset
63
1157
50879022f49d failed attempt to remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1104
diff changeset
64 function Thread.global_callable(name,timeout,fns)
50879022f49d failed attempt to remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1104
diff changeset
65 local callable = ThreadLuan.globalCallable(name,timeout,fns)
50879022f49d failed attempt to remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1104
diff changeset
66 local mt = {}
50879022f49d failed attempt to remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1104
diff changeset
67 function mt.__index(_,key)
50879022f49d failed attempt to remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1104
diff changeset
68 return function(...)
1159
3ef883468fd0 remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1157
diff changeset
69 return callable.call(key,...)
1157
50879022f49d failed attempt to remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1104
diff changeset
70 end
50879022f49d failed attempt to remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1104
diff changeset
71 end
50879022f49d failed attempt to remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1104
diff changeset
72 local tbl = {}
50879022f49d failed attempt to remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1104
diff changeset
73 set_metatable(tbl,mt)
50879022f49d failed attempt to remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1104
diff changeset
74 return tbl
50879022f49d failed attempt to remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1104
diff changeset
75 end
1159
3ef883468fd0 remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1157
diff changeset
76
3ef883468fd0 remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1157
diff changeset
77 Thread.remove_global_callable = ThreadLuan.removeGlobalCallable
1157
50879022f49d failed attempt to remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents: 1104
diff changeset
78
1166
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
79
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
80 local map = {}
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
81 local fns = {}
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
82
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
83 function fns.get(key)
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
84 return map[key]
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
85 end
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
86
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
87 function fns.put(key,value)
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
88 map[key] = value
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
89 end
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
90
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
91 Thread.global = {} -- shared across threads
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
92 local global_mt = {}
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
93 set_metatable(Thread.global,global_mt)
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
94
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
95 function global_mt.__index(_,key)
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
96 return global_mt.fns.get(key)
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
97 end
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
98
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
99 function global_mt.__new_index(_,key,value)
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
100 global_mt.fns.put(key,value)
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
101 end
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
102
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
103 function Thread.set_global_timeout(timeout)
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
104 global_mt.fns = Thread.global_callable("Thread.global",timeout,fns)
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
105 end
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
106
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
107 Thread.set_global_timeout(60000) -- one minute
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
108
7ef40e1923b7 add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
109
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 794
diff changeset
110 return Thread