Skip to content
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

src/opers.c: tweak and cleanup code; add tests #2296

Merged
merged 11 commits into from
Mar 27, 2018
Merged

src/opers.c: tweak and cleanup code; add tests #2296

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
108c16f
kernel: validate second argument to ELM_FLAGS
fingolfin Mar 25, 2018
d96cf68
kernel: allow comparing flag lists via '='
fingolfin Mar 25, 2018
053f159
kernel: remove unused DoTestAndFilter
fingolfin Mar 25, 2018
dcf51aa
kernel: simplify FuncAND_FLAGS
fingolfin Mar 25, 2018
6a166dc
kernel: remove redundant arg to NewGlobalFunction
fingolfin Mar 25, 2018
007c0a2
kernel: fix a comment
fingolfin Mar 25, 2018
6945e90
kernel: use IS_OPERATION in Func(UN)TRACE_METHODS
fingolfin Mar 25, 2018
2ec9863
kernel: perform FuncWITH_(HIDDEN)_IMPS_FLAGS checks earlier
fingolfin Mar 25, 2018
f823372
Fix UntraceMethods error message
fingolfin Mar 25, 2018
ba2db38
kernel: remove some dead code
fingolfin Mar 25, 2018
891619a
Add tests for function in src/opers.c
fingolfin Mar 25, 2018
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
Prev Previous commit
Next Next commit
kernel: simplify FuncAND_FLAGS
  • Loading branch information
@fingolfin
fingolfin committed Mar 27, 2018
commit dcf51aae64da7bf57e02eb8b59148f3145560d79
55 changes: 21 additions & 34 deletions src/opers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,6 @@ Obj FuncAND_FLAGS (
Int i;

#ifdef AND_FLAGS_HASH_SIZE
Obj flagsX;
Obj cache;
Obj entry;
#ifdef HPCGAP
Expand All @@ -658,53 +657,41 @@ Obj FuncAND_FLAGS (
"you can replace <flags2> via 'return <flags2>;'" );
}

if (flags1 == flags2)
return flags1;

// check the cache
# ifdef AND_FLAGS_HASH_SIZE
// We want to ensure if we calculate 'flags1 and flags2', then
// later do 'flags2 and flags1', we will get the value from the cache.
// Therefore we just compare the location of the Bag masterpointers
// for both flags (which doesn't change), and use the cache of the
// smaller.
if ( flags1 < flags2 ) {
flagsX = flags2;
# ifdef HPCGAP
if (!PreThreadCreation) {
locked = flags1;
HashLock(locked);
}
# endif
cache = AND_CACHE_FLAGS(flags1);
if ( cache == 0 ) {
cache = NEW_PLIST( T_PLIST, 2*AND_FLAGS_HASH_SIZE );
MakeBagPublic(cache);
SET_AND_CACHE_FLAGS( flags1, cache );
CHANGED_BAG(flags1);
}
// smaller. To this end, ensure flags1 is the smaller one.
if ( flags1 > flags2 ) {
SWAP(Obj, flags1, flags2);
}
else {
flagsX = flags1;
# ifdef HPCGAP
if (!PreThreadCreation) {
locked = flags2;
HashLock(locked);
}
# endif
cache = AND_CACHE_FLAGS(flags2);
if ( cache == 0 ) {
cache = NEW_PLIST( T_PLIST, 2*AND_FLAGS_HASH_SIZE );
MakeBagPublic(cache);
SET_AND_CACHE_FLAGS( flags2, cache );
CHANGED_BAG(flags2);

# ifdef HPCGAP
if (!PreThreadCreation) {
locked = flags1;
HashLock(locked);
}
# endif
cache = AND_CACHE_FLAGS(flags1);
if ( cache == 0 ) {
cache = NEW_PLIST( T_PLIST, 2*AND_FLAGS_HASH_SIZE );
MakeBagPublic(cache);
SET_AND_CACHE_FLAGS( flags1, cache );
CHANGED_BAG(flags1);
}
hash = (UInt)flagsX;
hash = (UInt)flags2;
for ( i = 0; i < 24; i++ ) {
hash2 = (hash + 97*i) % AND_FLAGS_HASH_SIZE;
entry = ELM_PLIST( cache, 2*hash2+1 );
if ( entry == 0 ) {
break;
}
if ( entry == flagsX ) {
if ( entry == flags2 ) {
# ifdef COUNT_OPERS
AndFlagsCacheHit++;
# endif
Expand Down Expand Up @@ -777,7 +764,7 @@ Obj FuncAND_FLAGS (
AndFlagsCacheLost++;
}
# endif
SET_ELM_PLIST( cache, 2*hash+1, flagsX );
SET_ELM_PLIST( cache, 2*hash+1, flags2 );
SET_ELM_PLIST( cache, 2*hash+2, flags );
CHANGED_BAG(cache);
# ifdef HPCGAP
Expand Down