paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 18:09:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 3907 via svnmerge from

Browse Source 
svn+ssh://svn.freepascal.org/FPC/svn/fpc/trunk

........
  r3907 | micha | 2006-06-21 11:26:17 +0200 (wo, 21 jun 2006) | 1 line
  
  read timezone file optimization
........

git-svn-id: branches/fixes_2_0@3923 -
This commit is contained in:
micha 2006-06-22 20:21:13 +00:00
parent d69d4d5826
commit 3389823c87
1 changed files with 56 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
rtl/unix/timezone.inc
View File

@ -139,13 +139,55 @@ procedure ReadTimezoneFile(fn:shortstring);
l:=k; l:=k;
end; end;
const
bufsize = 2048;
var var
buf : array[0..bufsize-1] of byte;
bufptr : pbyte;
f : longint; f : longint;
procedure readfilebuf;
begin
bufptr := @buf[0];
fpread(f, buf, bufsize);
end;
function readbufbyte: byte;
begin
if bufptr >= @buf[bufsize] then
readfilebuf;
readbufbyte := bufptr^;
inc(bufptr);
end;
function readbuf(var dest; count: integer): integer;
var
numbytes: integer;
begin
readbuf := 0;
repeat
numbytes := @buf[bufsize] - bufptr;
if numbytes > count then
numbytes := count;
if numbytes > 0 then
begin
move(bufptr^, dest, numbytes);
inc(bufptr, numbytes);
dec(count, numbytes);
inc(readbuf, numbytes);
end;
if count > 0 then
readfilebuf
else
break;
until false;
end;
var
tzdir : shortstring; tzdir : shortstring;
tzhead : ttzhead; tzhead : ttzhead;
i : longint; i : longint;
chars : longint; chars : longint;
buf : pbyte;
begin begin
if fn='' then if fn='' then
fn:='localtime'; fn:='localtime';
@ -161,7 +203,8 @@ begin
f:=fpopen(fn,Open_RdOnly); f:=fpopen(fn,Open_RdOnly);
if f<0 then if f<0 then
exit; exit;
i:=fpread(f,tzhead,sizeof(tzhead)); bufptr := @buf[bufsize];
i:=readbuf(tzhead,sizeof(tzhead));
if i<>sizeof(tzhead) then if i<>sizeof(tzhead) then
exit; exit;
decode(tzhead.tzh_timecnt); decode(tzhead.tzh_timecnt);
@ -181,43 +224,38 @@ begin
reallocmem(zone_names,chars); reallocmem(zone_names,chars);
reallocmem(leaps,num_leaps*sizeof(tleap)); reallocmem(leaps,num_leaps*sizeof(tleap));
fpread(f,transitions^,num_transitions*4); readbuf(transitions^,num_transitions*4);
fpread(f,type_idxs^,num_transitions); readbuf(type_idxs^,num_transitions);
for i:=0 to num_transitions-1 do for i:=0 to num_transitions-1 do
decode(transitions[i]); decode(transitions[i]);
for i:=0 to num_types-1 do for i:=0 to num_types-1 do
begin begin
fpread(f,types[i].offset,4); readbuf(types[i].offset,4);
fpread(f,types[i].isdst,1); readbuf(types[i].isdst,1);
fpread(f,types[i].idx,1); readbuf(types[i].idx,1);
decode(types[i].offset); decode(types[i].offset);
types[i].isstd:=0; types[i].isstd:=0;
types[i].isgmt:=0; types[i].isgmt:=0;
end; end;
fpread(f,zone_names^,chars); readbuf(zone_names^,chars);
for i:=0 to num_leaps-1 do for i:=0 to num_leaps-1 do
begin begin
fpread(f,leaps[i].transition,4); readbuf(leaps[i].transition,4);
fpread(f,leaps[i].change,4); readbuf(leaps[i].change,4);
decode(leaps[i].transition); decode(leaps[i].transition);
decode(leaps[i].change); decode(leaps[i].change);
end; end;
getmem(buf,tzhead.tzh_ttisstdcnt);
fpread(f,buf^,tzhead.tzh_ttisstdcnt);
for i:=0 to tzhead.tzh_ttisstdcnt-1 do for i:=0 to tzhead.tzh_ttisstdcnt-1 do
types[i].isstd:=byte(buf[i]<>0); types[i].isstd:=byte(readbufbyte<>0);
freemem(buf);
getmem(buf,tzhead.tzh_ttisgmtcnt);
fpread(f,buf^,tzhead.tzh_ttisgmtcnt);
for i:=0 to tzhead.tzh_ttisgmtcnt-1 do for i:=0 to tzhead.tzh_ttisgmtcnt-1 do
types[i].isgmt:=byte(buf[i]<>0); types[i].isgmt:=byte(readbufbyte<>0);
freemem(buf);
fpclose(f); fpclose(f);
end; end;