Weak table implementation.
This commit is contained in:
James Roseborough
53
src/test/java/org/luaj/vm/LWeakTableTest.java
Normal file
53
src/test/java/org/luaj/vm/LWeakTableTest.java
Normal file
@@ -0,0 +1,53 @@
|
||||
package org.luaj.vm;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
public class LWeakTableTest extends TestCase {
|
||||
|
||||
Random random = new Random(0);
|
||||
Runtime rt = Runtime.getRuntime();
|
||||
|
||||
private void runTest(int n,int i0,int i1,int di) {
|
||||
System.out.println("------- testing "+n+" keys up to "+i1+" bytes each ("+(n*i1)+" bytes total)");
|
||||
LTable t = new LWeakTable();
|
||||
for ( int i=0; i<n; i++ )
|
||||
t.put(i, new LString(new byte[1]));
|
||||
for ( int i=i0; i<=i1; i+=di ) {
|
||||
int hits = 0;
|
||||
for ( int j=0; j<100; j++ ) {
|
||||
int k = random.nextInt(n);
|
||||
LValue v = t.get(k);
|
||||
if ( v != LNil.NIL )
|
||||
hits++;
|
||||
t.put(i, new LString(new byte[i]));
|
||||
}
|
||||
long total = rt.totalMemory() / 1000;
|
||||
long free = rt.freeMemory() / 1000;
|
||||
long used = (rt.totalMemory() - rt.freeMemory()) / 1000;
|
||||
System.out.println("keys="+n+" bytes="+i+" mem u(f,t)="+used+"("+free+"/"+total+") hits="+hits+"/100");
|
||||
}
|
||||
}
|
||||
|
||||
public void testWeakTable5000() {
|
||||
runTest(100,0,5000,500);
|
||||
}
|
||||
|
||||
public void testWeakTable10000() {
|
||||
runTest(100,0,10000,1000);
|
||||
}
|
||||
|
||||
public void testWeakTable100() {
|
||||
runTest(100,0,100,10);
|
||||
}
|
||||
|
||||
public void testWeakTable1000() {
|
||||
runTest(100,0,1000,100);
|
||||
}
|
||||
|
||||
public void testWeakTable2000() {
|
||||
runTest(100,0,2000,200);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -18,69 +18,70 @@ tryconcat( { a='aaa', b='bbb', c='ccc', d='ddd', e='eee' } )
|
||||
tryconcat( { [501]="one", [502]="two", [503]="three", [504]="four", [505]="five" } )
|
||||
tryconcat( {} )
|
||||
|
||||
-- print the elements of a table in a platform-independent way
|
||||
function eles(t,f)
|
||||
f = f or pairs
|
||||
all = {}
|
||||
for k,v in f(t) do
|
||||
table.insert( all, "["..tostring(k).."]="..tostring(v) )
|
||||
end
|
||||
table.sort( all )
|
||||
return "{"..table.concat(all,',').."}"
|
||||
end
|
||||
|
||||
-- insert, maxn
|
||||
print( '-- insert, maxn tests' )
|
||||
local t = { "one", "two", "three", a='aaa', b='bbb', c='ccc' }
|
||||
print( table.concat(t,'-'), table.maxn(t), #t, table.getn(t) )
|
||||
table.insert(t,'six')
|
||||
print( table.concat(t,'-'), table.maxn(t), #t, table.getn(t) )
|
||||
table.insert(t,1,'seven')
|
||||
print( table.concat(t,'-'), table.maxn(t), #t, table.getn(t) )
|
||||
table.insert(t,4,'eight')
|
||||
print( table.concat(t,'-'), table.maxn(t), #t, table.getn(t) )
|
||||
table.insert(t,7,'nine')
|
||||
print( table.concat(t,'-'), table.maxn(t), #t, table.getn(t) )
|
||||
table.insert(t,10,'ten')
|
||||
print( table.concat(t,'-'), table.maxn(t), #t, table.getn(t) )
|
||||
print( t[10] )
|
||||
print( table.maxn({}), #{} )
|
||||
print( eles(t) )
|
||||
table.insert(t,'six'); print( eles(t) )
|
||||
table.insert(t,1,'seven'); print( eles(t) )
|
||||
table.insert(t,4,'eight'); print( eles(t) )
|
||||
table.insert(t,7,'nine'); print( eles(t) )
|
||||
table.insert(t,10,'ten'); print( eles(t) )
|
||||
|
||||
-- remove
|
||||
print( '-- remove tests' )
|
||||
t = { "one", "two", "three", "four", "five", "six", "seven", [10]="ten", a='aaa', b='bbb', c='ccc' }
|
||||
print( table.concat(t,'-'), table.maxn(t), #t )
|
||||
print( table.remove(t) )
|
||||
print( table.concat(t,'-'), table.maxn(t) )
|
||||
print( table.remove(t,1) )
|
||||
print( table.concat(t,'-'), table.maxn(t) )
|
||||
print( table.remove(t,3) )
|
||||
print( table.concat(t,'-'), table.maxn(t) )
|
||||
print( table.remove(t,5) )
|
||||
print( table.concat(t,'-'), table.maxn(t), t[10] )
|
||||
print( table.remove(t,10) )
|
||||
print( table.concat(t,'-'), table.maxn(t), t[10] )
|
||||
print( table.remove(t,-1) )
|
||||
print( table.concat(t,'-'), table.maxn(t), t[10] )
|
||||
print( table.remove(t,-1) )
|
||||
print( table.concat(t,'-'), table.maxn(t), t[10] )
|
||||
print( eles(t) )
|
||||
print( 'table.remove(t)', table.remove(t) ); print( eles(t) )
|
||||
print( 'table.remove(t,1)', table.remove(t,1) ); print( eles(t) )
|
||||
print( 'table.remove(t,3)', table.remove(t,3) ); print( eles(t) )
|
||||
print( 'table.remove(t,5)', table.remove(t,5) ); print( eles(t) )
|
||||
print( 'table.remove(t,10)', table.remove(t,10) ); print( eles(t) )
|
||||
print( 'table.remove(t,-1)', table.remove(t,-1) ); print( eles(t) )
|
||||
print( 'table.remove(t,-1)', table.remove(t,-1) ) ; print( eles(t) )
|
||||
|
||||
-- sort
|
||||
print( '-- sort tests' )
|
||||
t = { "one", "two", "three", a='aaa', b='bbb', c='ccc' }
|
||||
print( table.concat(t,'-'), table.maxn(t), #t )
|
||||
table.sort(t)
|
||||
print( table.concat(t,'-'), table.maxn(t), #t )
|
||||
t = { "zzz", "yyy", "xxx", "www", "vvv", "uuu", "ttt", "sss" }
|
||||
print( table.concat(t,'-'), table.maxn(t), #t )
|
||||
table.sort(t)
|
||||
print( table.concat(t,'-'), table.maxn(t), #t )
|
||||
table.sort(t,function(a,b) return b<a end)
|
||||
print( table.concat(t,'-'), table.maxn(t), #t )
|
||||
function sorttest(t,f)
|
||||
t = (t)
|
||||
print( table.concat(t,'-') )
|
||||
if f then
|
||||
table.sort(t,f)
|
||||
else
|
||||
table.sort(t)
|
||||
end
|
||||
print( table.concat(t,'-') )
|
||||
end
|
||||
sorttest{ "one", "two", "three" }
|
||||
sorttest{ "www", "vvv", "uuu", "ttt", "sss", "zzz", "yyy", "xxx" }
|
||||
sorttest( { "www", "vvv", "uuu", "ttt", "sss", "zzz", "yyy", "xxx" }, function(a,b) return b<a end)
|
||||
|
||||
-- getn
|
||||
t0 = {}
|
||||
t1 = { 'one', 'two', 'three' }
|
||||
t2 = { a='aa', b='bb', c='cc' }
|
||||
t3 = { 'one', 'two', 'three', a='aa', b='bb', c='cc' }
|
||||
print( 'getn(t0)', pcall( table.getn, t0 ) )
|
||||
print( 'getn(t0)', pcall( table.getn, t1 ) )
|
||||
print( 'getn(t0)', pcall( table.getn, t2 ) )
|
||||
print( 'getn(t0)', pcall( table.getn, t3 ) )
|
||||
print( 'getn('..eles(t0)..')', pcall( table.getn, t0 ) )
|
||||
print( 'getn('..eles(t1)..')', pcall( table.getn, t1 ) )
|
||||
print( 'getn('..eles(t2)..')', pcall( table.getn, t2 ) )
|
||||
print( 'getn('..eles(t3)..')', pcall( table.getn, t3 ) )
|
||||
|
||||
-- foreach
|
||||
function test( f, t, result, name )
|
||||
status, value = pcall( f, t, function(...)
|
||||
print(name,...)
|
||||
print(' -- ',...)
|
||||
print(' next',next(t,(...)))
|
||||
return result
|
||||
end )
|
||||
print( name, 's,v', status, value )
|
||||
@@ -90,12 +91,32 @@ function testall( f, t, name )
|
||||
test( f, t, false, name..'fls' )
|
||||
test( f, t, 100, name..'100' )
|
||||
end
|
||||
testall( table.foreach, t0, 'table.foreach(t0)' )
|
||||
testall( table.foreach, t1, 'table.foreach(t1)' )
|
||||
testall( table.foreach, t2, 'table.foreach(t2)' )
|
||||
testall( table.foreach, t3, 'table.foreach(t3)' )
|
||||
testall( table.foreachi, t0, 'table.foreachi(t0)' )
|
||||
testall( table.foreachi, t1, 'table.foreachi(t1)' )
|
||||
testall( table.foreachi, t2, 'table.foreachi(t2)' )
|
||||
testall( table.foreachi, t3, 'table.foreachi(t3)' )
|
||||
testall( table.foreach, t0, 'table.foreach('..eles(t0)..')' )
|
||||
testall( table.foreach, t1, 'table.foreach('..eles(t1)..')' )
|
||||
testall( table.foreach, t2, 'table.foreach('..eles(t2)..')' )
|
||||
testall( table.foreach, t3, 'table.foreach('..eles(t3)..')' )
|
||||
testall( table.foreachi, t0, 'table.foreachi('..eles(t0)..')' )
|
||||
testall( table.foreachi, t1, 'table.foreachi('..eles(t1)..')' )
|
||||
testall( table.foreachi, t2, 'table.foreachi('..eles(t2)..')' )
|
||||
testall( table.foreachi, t3, 'table.foreachi('..eles(t3)..')' )
|
||||
|
||||
-- pairs, ipairs
|
||||
function testpairs(f, t, name)
|
||||
print( name )
|
||||
for a,b in f(t) do
|
||||
print( ' ', a, b )
|
||||
end
|
||||
end
|
||||
function testbothpairs(t)
|
||||
testpairs( pairs, t, 'pairs( '..eles(t)..' )' )
|
||||
testpairs( ipairs, t, 'ipairs( '..eles(t)..' )' )
|
||||
end
|
||||
for i,t in ipairs({t0,t1,t2,t3}) do
|
||||
testbothpairs(t)
|
||||
end
|
||||
t = { 'one', 'two', 'three', 'four', 'five' }
|
||||
testbothpairs(t)
|
||||
t[6] = 'six'
|
||||
testbothpairs(t)
|
||||
t[4] = nil
|
||||
testbothpairs(t)
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
-- concat
|
||||
print( '-- weak table tests' )
|
||||
|
||||
-- construct new weak table
|
||||
function newweak(t)
|
||||
return setmetatable(t,{__mode="v"})
|
||||
|
||||
function newtable(t)
|
||||
n = setmetatable(t,{__mode="v"})
|
||||
for k,v in pairs(t) do
|
||||
n[k] = v
|
||||
end
|
||||
return n;
|
||||
end
|
||||
|
||||
-- print the elements of a table in a platform-independent way
|
||||
-- normalized printing
|
||||
function eles(t,f)
|
||||
f = f or pairs
|
||||
all = {}
|
||||
@@ -14,12 +16,47 @@ function eles(t,f)
|
||||
table.insert( all, "["..tostring(k).."]="..tostring(v) )
|
||||
end
|
||||
table.sort( all )
|
||||
return "{"..table.concat(all,',').."}"
|
||||
return tostring(t).."{"..table.concat(all,',').."}"
|
||||
end
|
||||
|
||||
|
||||
-- basic weak-reference table test
|
||||
local src = "return { 'one', 'two', 'three', 'four', a='aaa', b='bbb', c='ccc', d='ddd'}"
|
||||
local weak = newtable( loadstring(src)() )
|
||||
local strong = { weak[1], weak[3], a=weak.a, c=weak.c }
|
||||
print( 'before, weak:', eles(weak) )
|
||||
print( 'before, strong:', eles(strong) )
|
||||
print( 'gc', pcall( collectgarbage, "collect" ) )
|
||||
print( 'after, weak:', eles(weak) )
|
||||
print( 'after, strong:', eles(strong) )
|
||||
print( 'gc', pcall( collectgarbage, "collect" ) )
|
||||
print( 'after, weak:', eles(weak) )
|
||||
print( 'after, strong:', eles(strong) )
|
||||
|
||||
|
||||
|
||||
print( '-- concat tests' )
|
||||
function tryconcat(t)
|
||||
print( table.concat(t) )
|
||||
print( table.concat(t,'--') )
|
||||
print( table.concat(t,',',2) )
|
||||
print( table.concat(t,',',2,2) )
|
||||
print( table.concat(t,',',5,2) )
|
||||
end
|
||||
tryconcat( newtable{ "one", "two", "three", a='aaa', b='bbb', c='ccc' } )
|
||||
tryconcat( newtable{ "one", "two", "three", "four", "five" } )
|
||||
function tryconcat(t)
|
||||
print( table.concat(t) )
|
||||
print( table.concat(t,'--') )
|
||||
print( table.concat(t,',',2) )
|
||||
end
|
||||
tryconcat( newtable{ a='aaa', b='bbb', c='ccc', d='ddd', e='eee' } )
|
||||
tryconcat( newtable{ [501]="one", [502]="two", [503]="three", [504]="four", [505]="five" } )
|
||||
tryconcat( newtable{} )
|
||||
|
||||
-- insert, maxn
|
||||
print( '-- insert, maxn tests' )
|
||||
local t = newweak{ "one", "two", "three", a='aaa', b='bbb', c='ccc' }
|
||||
local t = newtable{ "one", "two", "three", a='aaa', b='bbb', c='ccc' }
|
||||
print( eles(t) )
|
||||
table.insert(t,'six'); print( eles(t) )
|
||||
table.insert(t,1,'seven'); print( eles(t) )
|
||||
@@ -29,20 +66,20 @@ table.insert(t,10,'ten'); print( eles(t) )
|
||||
|
||||
-- remove
|
||||
print( '-- remove tests' )
|
||||
t = newweak{ "one", "two", "three", "four", "five", "six", "seven", [10]="ten", a='aaa', b='bbb', c='ccc' }
|
||||
t = newtable{ "one", "two", "three", "four", "five", "six", "seven", [10]="ten", a='aaa', b='bbb', c='ccc' }
|
||||
print( eles(t) )
|
||||
print( table.remove(t) ); print( eles(t) )
|
||||
print( table.remove(t,1) ); print( eles(t) )
|
||||
print( table.remove(t,3) ); print( eles(t) )
|
||||
print( table.remove(t,5) ); print( eles(t) )
|
||||
print( table.remove(t,10) ); print( eles(t) )
|
||||
print( table.remove(t,-1) ); print( eles(t) )
|
||||
print( table.remove(t,-1) ) ; print( eles(t) )
|
||||
print( 'table.remove(t)', table.remove(t) ); print( eles(t) )
|
||||
print( 'table.remove(t,1)', table.remove(t,1) ); print( eles(t) )
|
||||
print( 'table.remove(t,3)', table.remove(t,3) ); print( eles(t) )
|
||||
print( 'table.remove(t,5)', table.remove(t,5) ); print( eles(t) )
|
||||
print( 'table.remove(t,10)', table.remove(t,10) ); print( eles(t) )
|
||||
print( 'table.remove(t,-1)', table.remove(t,-1) ); print( eles(t) )
|
||||
print( 'table.remove(t,-1)', table.remove(t,-1) ) ; print( eles(t) )
|
||||
|
||||
-- sort
|
||||
print( '-- sort tests' )
|
||||
function sorttest(t,f)
|
||||
t = newweak(t)
|
||||
t = (t)
|
||||
print( table.concat(t,'-') )
|
||||
if f then
|
||||
table.sort(t,f)
|
||||
@@ -50,25 +87,28 @@ function sorttest(t,f)
|
||||
table.sort(t)
|
||||
end
|
||||
print( table.concat(t,'-') )
|
||||
end
|
||||
sorttest{ "one", "two", "three" }
|
||||
sorttest{ "www", "vvv", "uuu", "ttt", "sss", "zzz", "yyy", "xxx" }
|
||||
sorttest( { "www", "vvv", "uuu", "ttt", "sss", "zzz", "yyy", "xxx" }, function(a,b) return b<a end)
|
||||
end
|
||||
--[[
|
||||
sorttest( newtable{ "one", "two", "three" } )
|
||||
sorttest( newtable{ "www", "vvv", "uuu", "ttt", "sss", "zzz", "yyy", "xxx" } )
|
||||
sorttest( newtable{ "www", "vvv", "uuu", "ttt", "sss", "zzz", "yyy", "xxx" }, function(a,b) return b<a end)
|
||||
--]]
|
||||
|
||||
-- getn
|
||||
t0 = newweak{}
|
||||
t1 = newweak{ 'one', 'two', 'three' }
|
||||
t2 = newweak{ a='aa', b='bb', c='cc' }
|
||||
t3 = newweak{ 'one', 'two', 'three', a='aa', b='bb', c='cc' }
|
||||
print( 'getn(t0)', pcall( table.getn, t0 ) )
|
||||
print( 'getn(t1)', pcall( table.getn, t1 ) )
|
||||
print( 'getn(t2)', pcall( table.getn, t2 ) )
|
||||
print( 'getn(t3)', pcall( table.getn, t3 ) )
|
||||
t0 = newtable{}
|
||||
t1 = newtable{ 'one', 'two', 'three' }
|
||||
t2 = newtable{ a='aa', b='bb', c='cc' }
|
||||
t3 = newtable{ 'one', 'two', 'three', a='aa', b='bb', c='cc' }
|
||||
print( 'getn('..eles(t0)..')', pcall( table.getn, t0 ) )
|
||||
print( 'getn('..eles(t1)..')', pcall( table.getn, t1 ) )
|
||||
print( 'getn('..eles(t2)..')', pcall( table.getn, t2 ) )
|
||||
print( 'getn('..eles(t3)..')', pcall( table.getn, t3 ) )
|
||||
|
||||
-- foreach
|
||||
function test( f, t, result, name )
|
||||
status, value = pcall( f, t, function(...)
|
||||
print(name,...)
|
||||
print(' -- ',...)
|
||||
print(' next',next(t,(...)))
|
||||
return result
|
||||
end )
|
||||
print( name, 's,v', status, value )
|
||||
@@ -78,29 +118,32 @@ function testall( f, t, name )
|
||||
test( f, t, false, name..'fls' )
|
||||
test( f, t, 100, name..'100' )
|
||||
end
|
||||
testall( table.foreach, t0, 'table.foreach(t0)' )
|
||||
testall( table.foreach, t1, 'table.foreach(t1)' )
|
||||
testall( table.foreach, t2, 'table.foreach(t2)' )
|
||||
testall( table.foreach, t3, 'table.foreach(t3)' )
|
||||
testall( table.foreachi, t0, 'table.foreachi(t0)' )
|
||||
testall( table.foreachi, t1, 'table.foreachi(t1)' )
|
||||
testall( table.foreachi, t2, 'table.foreachi(t2)' )
|
||||
testall( table.foreachi, t3, 'table.foreachi(t3)' )
|
||||
testall( table.foreach, t0, 'table.foreach('..eles(t0)..')' )
|
||||
testall( table.foreach, t1, 'table.foreach('..eles(t1)..')' )
|
||||
testall( table.foreach, t2, 'table.foreach('..eles(t2)..')' )
|
||||
testall( table.foreach, t3, 'table.foreach('..eles(t3)..')' )
|
||||
testall( table.foreachi, t0, 'table.foreachi('..eles(t0)..')' )
|
||||
testall( table.foreachi, t1, 'table.foreachi('..eles(t1)..')' )
|
||||
testall( table.foreachi, t2, 'table.foreachi('..eles(t2)..')' )
|
||||
testall( table.foreachi, t3, 'table.foreachi('..eles(t3)..')' )
|
||||
|
||||
-- pairs, ipairs
|
||||
function testpairs(f, t, name)
|
||||
print( name, unpack(t) )
|
||||
print( name )
|
||||
for a,b in f(t) do
|
||||
print( a, b )
|
||||
print( ' ', a, b )
|
||||
end
|
||||
end
|
||||
testpairs( pairs, t0, 'pairs(t0)' )
|
||||
testpairs( pairs, t1, 'pairs(t1)' )
|
||||
testpairs( pairs, t2, 'pairs(t2)' )
|
||||
testpairs( pairs, t3, 'pairs(t3)' )
|
||||
testpairs( ipairs, t0, 'ipairs(t0)' )
|
||||
testpairs( ipairs, t1, 'ipairs(t1)' )
|
||||
testpairs( ipairs, t2, 'ipairs(t2)' )
|
||||
testpairs( ipairs, t3, 'ipairs(t3)' )
|
||||
|
||||
|
||||
function testbothpairs(t)
|
||||
testpairs( pairs, t, 'pairs( '..eles(t)..' )' )
|
||||
testpairs( ipairs, t, 'ipairs( '..eles(t)..' )' )
|
||||
end
|
||||
for i,t in ipairs({t0,t1,t2,t3}) do
|
||||
testbothpairs(t)
|
||||
end
|
||||
t = newtable{ 'one', 'two', 'three', 'four', 'five' }
|
||||
testbothpairs(t)
|
||||
t[6] = 'six'
|
||||
testbothpairs(t)
|
||||
t[4] = nil
|
||||
testbothpairs(t)
|
||||
|
||||
Reference in New Issue
Block a user