diff --git a/src/shared/mempool.pas b/src/shared/mempool.pas
index ae67f034aa60363ec362b8b04b4a6ff2f4bec870..a521626e051439be0cb5bc75417bbdaa036b17fd 100644 (file)
--- a/src/shared/mempool.pas
+++ b/src/shared/mempool.pas
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
type
PoolMark = Integer;
type
PoolMark = Integer;
+ PPoolMarkRelease = ^TPoolMarkRelease;
TPoolMarkRelease = record
private
mMemory: Pointer;
TPoolMarkRelease = record
private
mMemory: Pointer;
type MyType = specialize PoolIter<T>;
private
type MyType = specialize PoolIter<T>;
private
+ mPool: PPoolMarkRelease;
mMark: PoolMark;
mCount: Integer;
mCurrent: Integer;
mFinished: Boolean;
public
mMark: PoolMark;
mCount: Integer;
mCurrent: Integer;
mFinished: Boolean;
public
- constructor Create (dummy: Boolean); // idiotic FPC doesn't support arg-less ctors for rectord
- procedure startIt (); inline; // automatically called by ctor; does NO checks!
+ constructor Create (var apool: TPoolMarkRelease); // idiotic FPC doesn't support arg-less ctors for rectord
procedure finishIt (); inline; // sets count
procedure rewind (); inline;
procedure finishIt (); inline; // sets count
procedure rewind (); inline;
// ////////////////////////////////////////////////////////////////////////// //
// ////////////////////////////////////////////////////////////////////////// //
-constructor PoolIter.Create (dummy: Boolean);
+constructor PoolIter.Create (var apool: TPoolMarkRelease);
begin
begin
- startIt();
-end;
-
-
-procedure PoolIter.startIt (); inline; // automatically called by ctor; does NO checks!
-begin
- mMark := framePool.mark();
+ mPool := @apool;
+ mMark := mPool^.mark();
mCount := 0;
mCurrent := -1;
mFinished := false;
mCount := 0;
mCurrent := -1;
mFinished := false;
procedure PoolIter.finishIt (); inline; // sets count
begin
if (mFinished) then raise Exception.Create('double fatality');
procedure PoolIter.finishIt (); inline; // sets count
begin
if (mFinished) then raise Exception.Create('double fatality');
- if (mMark = -1) then raise Exception.Create('void fatality');
+ if (mPool = nil) then raise Exception.Create('void fatality');
mFinished := true;
mFinished := true;
- mCount := Integer(PtrUInt(framePool.curPtr)-PtrUInt(framePool.getPtr(mMark))) div Integer(sizeof(T));
+ mCount := Integer(PtrUInt(mPool^.curPtr)-PtrUInt(mPool^.getPtr(mMark))) div Integer(sizeof(T));
if (mCount < 0) then raise Exception.Create('wutafu?');
end;
procedure PoolIter.rewind (); inline;
begin
if (mCount < 0) then raise Exception.Create('wutafu?');
end;
procedure PoolIter.rewind (); inline;
begin
- if (mMark = -1) then raise Exception.Create('void rewind');
+ if (mPool = nil) then raise Exception.Create('void rewind');
mCurrent := -1;
end;
mCurrent := -1;
end;
procedure PoolIter.release (); inline; // reset pool
begin
procedure PoolIter.release (); inline; // reset pool
begin
- if (mMark = -1) then raise Exception.Create('double release');
- framePool.release(mMark);
- mMark := -1;
+ if (mPool = nil) then raise Exception.Create('double release');
+ mPool^.release(mMark);
+ mPool := nil;
mCount := 0;
mCurrent := -1;
mFinished := false;
mCount := 0;
mCurrent := -1;
mFinished := false;
function PoolIter.moveNext (): Boolean; inline;
begin
function PoolIter.moveNext (): Boolean; inline;
begin
- if (mMark = -1) then raise Exception.Create('void moveNext()');
+ if (mPool = nil) then raise Exception.Create('void moveNext()');
if (not mFinished) then raise Exception.Create('moveNext() on unfinished');
Inc(mCurrent);
result := (mCurrent < mCount);
if (not mFinished) then raise Exception.Create('moveNext() on unfinished');
Inc(mCurrent);
result := (mCurrent < mCount);
function PoolIter.getCurrent (): Ptr; inline;
begin
function PoolIter.getCurrent (): Ptr; inline;
begin
+ if (mPool = nil) then raise Exception.Create('getCurrent() on nothing');
if (mCurrent < 0) or (mCurrent >= mCount) then raise Exception.Create('getCurrent() range error');
if (mCurrent < 0) or (mCurrent >= mCount) then raise Exception.Create('getCurrent() range error');
- result := Ptr(framePool.getPtr(mMark+mCurrent*Integer(sizeof(T))));
+ result := Ptr(mPool^.getPtr(mMark+mCurrent*Integer(sizeof(T))));
end;
end;
function PoolIter.first (): Ptr; inline;
begin
function PoolIter.first (): Ptr; inline;
begin
- if (mMark = -1) then raise Exception.Create('void moveNext()');
+ if (mPool = nil) then raise Exception.Create('void moveNext()');
if (not mFinished) then raise Exception.Create('moveNext() on unfinished');
if (not mFinished) then raise Exception.Create('moveNext() on unfinished');
- result := Ptr(framePool.getPtr(mMark));
+ result := Ptr(mPool^.getPtr(mMark));
end;
end;