aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES1
-rw-r--r--docs/index.html9
-rw-r--r--src/lanes.h2
3 files changed, 7 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index 2aca378..f356c26 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
1CHANGES: 1CHANGES:
2 2
3CHANGE 151: BGe 7-Feb-22 3CHANGE 151: BGe 7-Feb-22
4 * bumped version to 3.15.2
4 * Lanes no longer relies on malloc/free for internal allocations, but uses the primary alloc function from the master Lua state 5 * Lanes no longer relies on malloc/free for internal allocations, but uses the primary alloc function from the master Lua state
5 6
6CHANGE 150: BGe 22-Sep-21 7CHANGE 150: BGe 22-Sep-21
diff --git a/docs/index.html b/docs/index.html
index 82b1f24..290383e 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -64,13 +64,13 @@
64 <font size="-1"> 64 <font size="-1">
65 <p> 65 <p>
66 <br/> 66 <br/>
67 <i>Copyright &copy; 2007-21 Asko Kauppi, Benoit Germain. All rights reserved.</i> 67 <i>Copyright &copy; 2007-22 Asko Kauppi, Benoit Germain. All rights reserved.</i>
68 <br/> 68 <br/>
69 Lua Lanes is published under the same <a href="http://en.wikipedia.org/wiki/MIT_License">MIT license</a> as Lua 5.1, 5.2, 5.3 and 5.4. 69 Lua Lanes is published under the same <a href="http://en.wikipedia.org/wiki/MIT_License">MIT license</a> as Lua 5.1, 5.2, 5.3 and 5.4.
70 </p> 70 </p>
71 71
72 <p> 72 <p>
73 This document was revised on 8-Jul-21, and applies to version <tt>3.15.1</tt>. 73 This document was revised on 8-Feb-22, and applies to version <tt>3.15.2</tt>.
74 </p> 74 </p>
75 </font> 75 </font>
76 </center> 76 </center>
@@ -339,8 +339,8 @@
339 </td> 339 </td>
340 <td> 340 <td>
341 (Since v3.13.0)<br/> 341 (Since v3.13.0)<br/>
342 If <tt>nil</tt>, Lua states are created with <tt>luaL_newstate()</tt> and use the default allocator.<br/> 342 If <tt>nil</tt>, Lua states are created with <tt>lua_newstate()</tt> and reuse the allocator from the master state.<br/>
343 If <tt>"protected"</tt>, The default allocator obtained from <tt>lua_getallocf()</tt> in the state that initializes Lanes is wrapped inside a critical section and used in all newly created states.<br/> 343 If <tt>"protected"</tt>, The default allocator obtained from <tt>lua_getallocf()</tt> in the master state is wrapped inside a critical section and used in all newly created states.<br/>
344 If a <tt>function</tt>, this function is called prior to creating the state. It should return a full userdata containing the following structure: 344 If a <tt>function</tt>, this function is called prior to creating the state. It should return a full userdata containing the following structure:
345 <table border="1" bgcolor="#E0E0FF" cellpadding="10" style="width:50%"> 345 <table border="1" bgcolor="#E0E0FF" cellpadding="10" style="width:50%">
346 <tr> 346 <tr>
@@ -351,6 +351,7 @@
351 </table> 351 </table>
352 The contents will be used to create the state with <tt>lua_newstate( allocF, allocUD)</tt>. 352 The contents will be used to create the state with <tt>lua_newstate( allocF, allocUD)</tt>.
353 This option is mostly useful for embedders that want to provide different allocators to each lane, for example to have each one work in a different memory pool thus preventing the need for the allocator itself to be threadsafe. 353 This option is mostly useful for embedders that want to provide different allocators to each lane, for example to have each one work in a different memory pool thus preventing the need for the allocator itself to be threadsafe.
354 Note however that linda deep proxy are allocated with the allocator from the master state, because they are not tied to a particular state.
354 </td> 355 </td>
355 </tr> 356 </tr>
356 357
diff --git a/src/lanes.h b/src/lanes.h
index 41a6b73..4c7cc5b 100644
--- a/src/lanes.h
+++ b/src/lanes.h
@@ -12,7 +12,7 @@
12 12
13#define LANES_VERSION_MAJOR 3 13#define LANES_VERSION_MAJOR 3
14#define LANES_VERSION_MINOR 15 14#define LANES_VERSION_MINOR 15
15#define LANES_VERSION_PATCH 1 15#define LANES_VERSION_PATCH 2
16 16
17#define LANES_MIN_VERSION_REQUIRED(MAJOR, MINOR, PATCH) ((LANES_VERSION_MAJOR>MAJOR) || (LANES_VERSION_MAJOR==MAJOR && (LANES_VERSION_MINOR>MINOR || (LANES_VERSION_MINOR==MINOR && LANES_VERSION_PATCH>=PATCH)))) 17#define LANES_MIN_VERSION_REQUIRED(MAJOR, MINOR, PATCH) ((LANES_VERSION_MAJOR>MAJOR) || (LANES_VERSION_MAJOR==MAJOR && (LANES_VERSION_MINOR>MINOR || (LANES_VERSION_MINOR==MINOR && LANES_VERSION_PATCH>=PATCH))))
18#define LANES_VERSION_LESS_THAN(MAJOR, MINOR, PATCH) ((LANES_VERSION_MAJOR<MAJOR) || (LANES_VERSION_MAJOR==MAJOR && (LANES_VERSION_MINOR<MINOR || (LANES_VERSION_MINOR==MINOR && LANES_VERSION_PATCH<PATCH)))) 18#define LANES_VERSION_LESS_THAN(MAJOR, MINOR, PATCH) ((LANES_VERSION_MAJOR<MAJOR) || (LANES_VERSION_MAJOR==MAJOR && (LANES_VERSION_MINOR<MINOR || (LANES_VERSION_MINOR==MINOR && LANES_VERSION_PATCH<PATCH))))