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

Jump to bottom

Better kernel module checking #1032

Merged
merged 6 commits into from
Aug 26, 2024
Merged

Better kernel module checking #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3df71a1
Better kernel module checking
Joseph-Edwards Aug 26, 2024
79d5d48
fix linting
Joseph-Edwards Aug 26, 2024
468cc71
better error messages
Joseph-Edwards Aug 26, 2024
885d495
fix linting
Joseph-Edwards Aug 26, 2024
c463374
fix linting again
Joseph-Edwards Aug 26, 2024
30c9992
Change Semigroups -> semigroups
Joseph-Edwards Aug 26, 2024
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
11 changes: 4 additions & 7 deletions PackageInfo.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ PackageDoc := rec(
),

Dependencies := rec(
GAP := ">=4.12.0",
GAP := ">=4.12.1",
NeededOtherPackages := [["datastructures", ">=0.2.5"],
["digraphs", ">=1.6.2"],
["genss", ">=1.6.5"],
Expand Down Expand Up @@ -406,13 +406,10 @@ BannerString := Concatenation(
"------\n"),

AvailabilityTest := function()
local semigroups_so;
semigroups_so := Filename(DirectoriesPackagePrograms("semigroups"),
"semigroups.so");
if (not "semigroups" in SHOW_STAT()) and semigroups_so = fail then
if not IsKernelExtensionAvailable("semigroups") then
LogPackageLoadingMessage(PACKAGE_WARNING,
"the kernel module is not compiled, ",
"the package cannot be loaded.");
["the kernel module is not compiled, ",
"the package cannot be loaded."]);
return fail;
fi;
return true;
Expand Down
10 changes: 2 additions & 8 deletions init.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,9 @@ if not IsBound(ORBC) then
BindGlobal("HTValue_TreeHash_C", fail);
fi;

# the kernel module makes use of the c functions HTAdd_TreeHash_C and
# HTValue_TreeHash_C and so we should only use the part of the kernel module
# using these functions if Orb is compiled.
_SEMIGROUPS_SO := Filename(DirectoriesPackagePrograms("semigroups"),
"semigroups.so");
if _SEMIGROUPS_SO <> fail then
LoadDynamicModule(_SEMIGROUPS_SO);
if LoadKernelExtension("semigroups") = false then
Error("failed to load Semigroups kernel extension");
fi;
Unbind(_SEMIGROUPS_SO);

if not IsBound(UserHomeExpand) then
BindGlobal("UserHomeExpand", USER_HOME_EXPAND);
Expand Down
Loading