Skip to content

perf: tablebase addto: avoid re-writing INDEXBLOCK for every added el… #907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jodavies merged 1 commit into from
Sep 15, 2026
Merged

perf: tablebase addto: avoid re-writing INDEXBLOCK for every added el… #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions check/features.frm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3190,6 +3190,27 @@ assert stdout =~ exact_pattern(<<'EOF')
~~~
EOF
*--#] ZeroUnchanged :
*--#[ tablebase_dirty_blocks :
CTable,sparse f(1);
#do i = 1,1030
Fill f(`i') = `i';
#enddo
.sort
TableBase "dirty-blocks.tbl" create;
TableBase "dirty-blocks.tbl" addto f;
.end
CTable,sparse f(1);
TableBase "dirty-blocks.tbl" open;
TableBase "dirty-blocks.tbl" enter;
.sort
Local F = f(1)+f(1024)+f(1025)+f(1030);
Apply;
Print;
.end
#pend_if mpi?
assert succeeded?
assert result("F") =~ expr("3080")
*--#] tablebase_dirty_blocks :
*--#[ tablebase_ro_1 :
Table,sparse,no1fill(1);
Fill no1fill(1) = 1;
Expand Down
1 change: 1 addition & 0 deletions sources/declare.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,6 +1379,7 @@ extern void convertnamesblock(NAMESBLOCK *,NAMESBLOCK *,int);
extern void convertiniinfo(INIINFO *,INIINFO *,int);
extern int ReadIndex(DBASE *);
extern int WriteIndexBlock(DBASE *,MLONG);
extern int FlushDirtyIndexBlocks(DBASE *);
extern int WriteNamesBlock(DBASE *,MLONG);
extern int WriteIndex(DBASE *);
extern int WriteIniInfo(DBASE *);
Expand Down
24 changes: 22 additions & 2 deletions sources/minos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,11 @@ int WriteIndexBlock(DBASE *d,MLONG num)
/* INTERNAL_ERROR_EXCL_STOP */
}
fseek(d->handle,d->iblocks[num]->position,SEEK_SET);
d->iblocks[num]->flags &= MCLEANFLAG;
convertblock(d->iblocks[num],&scratchblock,TODISK);
if ( minoswrite(d->handle,(char *)(&scratchblock),sizeof(INDEXBLOCK)) ) {
/* INTERNAL_ERROR_EXCL_START */
d->iblocks[num]->flags |= MDIRTYFLAG;
MesPrint("!>Error while writing an index block in file %s\n",d->name);
MesPrint("File may be unreliable now\n");
return(-1);
Expand All @@ -428,6 +430,22 @@ int WriteIndexBlock(DBASE *d,MLONG num)

/*
#] WriteIndexBlock :
#[ FlushDirtyIndexBlocks :
*/

int FlushDirtyIndexBlocks(DBASE *d)
{
MLONG i;
for ( i = 0; i < d->info.numberofindexblocks; i++ ) {
if ( ( d->iblocks[i]->flags & MDIRTYFLAG ) != 0 ) {
if ( WriteIndexBlock(d,i) ) return(-1);
}
}
return(0);
}

/*
#] FlushDirtyIndexBlocks :
#[ WriteNamesBlock :
*/

Expand Down Expand Up @@ -715,7 +733,7 @@ DBASE *NewDbase(char *name,MLONG number)
else d->iblocks[i]->previousblock = -1;
d->iblocks[i]->position = ftell(f);
// Initialise, to keep valgrind happy
d->iblocks[i]->flags = -1;
d->iblocks[i]->flags = 0;
/*----------change 10-feb-2003 */
/*
Zero things properly. We don't want garbage in the file.
Expand Down Expand Up @@ -1153,6 +1171,7 @@ int AddToIndex(DBASE *d,MLONG number)
}
if ( i > 0 ) ib[i]->previousblock = ib[i-1]->position;
else ib[i]->previousblock = -1;
ib[i]->flags = 0;
/*
Zero things properly. We don't want garbage in the file.
*/
Expand Down Expand Up @@ -1337,7 +1356,8 @@ int WriteObject(DBASE *d,MLONG tablenumber,char *arguments,char *rhs,MLONG numbe
#else
obj->uncompressed = 0;
#endif
return(WriteIndexBlock(d,j));
d->iblocks[j]->flags |= MDIRTYFLAG;
return(0);
}

/*
Expand Down
17 changes: 9 additions & 8 deletions sources/tables.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ int CoTBaddto(UBYTE *s)
TABLES T = 0;
MLONG basenumber;
LONG x;
int i, j, error = 0, sum;
int i, j, error = 0, sum, writeini = 0;
if ( ( d = FindTB(tablebasename) ) == 0 ) {
MesPrint("&No open tablebase with the name %s",tablebasename);
return(-1);
Expand Down Expand Up @@ -854,7 +854,7 @@ int CoTBaddto(UBYTE *s)
ParseSignedNumber(x,s);
if ( FG.cTable[s[-1]] != 1 || ( *s != ',' && *s != ')' ) ) {
MesPrint("&Table arguments in TableBase addto statement should be numbers");
return(1);
goto tableabort;
}
*w++ = x;
if ( *s == ')' ) break;
Expand Down Expand Up @@ -956,17 +956,18 @@ int CoTBaddto(UBYTE *s)
}
while ( *s == ',' || *s == ' ' || *s == '\t' ) s++;
}
if ( WriteIniInfo(d) ) goto tableabort;
writeini = 1;
tablefinish:;
if ( FlushDirtyIndexBlocks(d) ) error = 1;
if ( writeini && WriteIniInfo(d) ) error = 1;
M_free(AO.DollarOutBuffer,"DollarOutBuffer");
AO.DollarOutBuffer = 0;
AO.DollarOutSizeBuffer = 0;
AO.OutInBuffer = 0;
return(error);
tableabort:;
M_free(AO.DollarOutBuffer,"DollarOutBuffer");
AO.DollarOutBuffer = 0;
AO.DollarOutSizeBuffer = 0;
AO.OutInBuffer = 0;
return(1);
error = 1;
goto tablefinish;
}

/*
Expand Down
Loading