Skip to content

Prefer XXHash instead of CRC for IP10 #2500

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

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Prefer XXHash instead of CRC for IP10 #2500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ef77c84
Add hash functions for strings, numbers and waves
t-b Sep 5, 2025
c31f977
AB_LoadSweepFromNWBgeneric: Prefer HashWave over WaveCRC
t-b Sep 5, 2025
7fb5654
WB_GetStimsetChecksum: Prefer WB_GetWaveNoteEntryAsNumber
t-b Sep 5, 2025
21ba0d0
WB_CalculateStimsetChecksum: Switch from CRC to WaveHash
t-b Sep 5, 2025
fefd456
tools/check-code.sh: Check for StringCRC/WaveCRC
t-b Sep 5, 2025
a0f2acf
GetNotebookCRC: Prefer HashString and rename
t-b Sep 5, 2025
f2c14d4
DC_GenerateStimsetFingerprint: Move from StringCRC to HashString
t-b Sep 5, 2025
636da49
WIP: Cache
t-b Sep 5, 2025
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
2 changes: 1 addition & 1 deletion Packages/MIES/MIES_AnalysisBrowser.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2174,7 +2174,7 @@ static Function AB_LoadSweepFromNWBgeneric(variable h5_groupID, variable nwbVers

WAVE/Z/SDFR=sweepDFR targetName = $channelName
// nwb files created prior to 901428b might have duplicated datasets
if(WaveExists(targetName) && WaveCRC(0, targetName) != WaveCRC(0, loaded))
if(WaveExists(targetName) && cmpstr(HashWave("", targetName), HashWave("", loaded)))
KillOrMoveToTrash(dfr = sweepDFR)
FATAL_ERROR("wave with same name, but different content, already exists: " + channelName)
endif
Expand Down
17 changes: 9 additions & 8 deletions Packages/MIES/MIES_BrowserSettingsPanel.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ static StrConstant BROWSERSETTINGS_AXES_SCALING_CHECKBOXES = "check_Display_Visi
static StrConstant SWEEPCONTROL_CONTROLS_DATABROWSER = "check_SweepControl_AutoUpdate;setvar_SweepControl_SweepNo;"
static StrConstant SWEEPCONTROL_CONTROLS_SWEEPBROWSER = "popup_SweepControl_Selector;"

static StrConstant BSP_USER_DATA_SF_CONTENT_CRC = "SweepFormulaContentCRC"
static StrConstant BSP_USER_DATA_SF_CONTENT_HASH = "SweepFormulaContentHash"

static Constant BSP_EPOCH_LEVELS = 5

Expand Down Expand Up @@ -1744,7 +1744,8 @@ End
Function BSP_SFHelpWindowHook(STRUCT WMWinHookStruct &s)

string mainWin, sfWin, bspPanel, cmdStr
variable modMask, refContentCRC, contentCRC
variable modMask
string refContentHash, contentHash

switch(s.eventCode)
case EVENT_WINDOW_HOOK_MOUSEDOWN:
Expand Down Expand Up @@ -1778,13 +1779,13 @@ Function BSP_SFHelpWindowHook(STRUCT WMWinHookStruct &s)
break
case EVENT_WINDOW_HOOK_ACTIVATE: // fallthrough
case EVENT_WINDOW_HOOK_DEACTIVATE:
mainWin = GetMainWindow(s.winName)
sfWin = BSP_GetSFFormula(mainWin)
refContentCRC = str2num(GetUserData(mainWin, "", BSP_USER_DATA_SF_CONTENT_CRC))
contentCRC = GetNotebookCRC(sfWin)
if(!CmpStr(sfWin, s.winName) && refContentCRC != contentCRC)
mainWin = GetMainWindow(s.winName)
sfWin = BSP_GetSFFormula(mainWin)
refContentHash = GetUserData(mainWin, "", BSP_USER_DATA_SF_CONTENT_HASH)
contentHash = GetNotebookHash(sfWin)
if(!CmpStr(sfWin, s.winName) && cmpstr(refContentHash, contentHash))
BSP_SFFormulaColoring(sfWin)
SetWindow $mainWin, userData($BSP_USER_DATA_SF_CONTENT_CRC)=num2istr(contentCRC)
SetWindow $mainWin, userData($BSP_USER_DATA_SF_CONTENT_HASH)=contentHash
endif
break
default:
Expand Down
Loading
Loading