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.

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

Symbol command-line tests #2

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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: 2 additions & 0 deletions scripts/clear_config.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
REM Clear the saved config options (in the registry)
REG DELETE "HKCU\SOFTWARE\codersnotes.com\Very Sleepy" /F
13 changes: 13 additions & 0 deletions scripts/get_config.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@SETLOCAL ENABLEDELAYEDEXPANSION
@ECHO OFF

REM Retrieve a config value from the registry and store it in the specified environment variable.
REM Usage: get_config.cmd <option_name> <target_envvar>

SET "VALUE_NAME=%~1"
SET "VAR_NAME=%~2"

FOR /F "usebackq tokens=*" %%v IN (`PowerShell.exe -NoProfile -ExecutionPolicy Bypass -Command "Get-ItemPropertyValue -Path 'Registry::HKEY_CURRENT_USER\SOFTWARE\codersnotes.com\Very Sleepy' -Name '!VALUE_NAME!' -ErrorAction:SilentlyContinue" ^<NUL`) DO SET "VALUE=%%~v"

ENDLOCAL & SET "%VAR_NAME%=%VALUE%"

27 changes: 27 additions & 0 deletions scripts/get_stat.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
@setlocal enabledelayedexpansion
@echo off

rem usage: test_stat.cmd <sleepy_file_basename> <stat_descr> <target_envvar>
mojomojomojo marked this conversation as resolved.
Show resolved Hide resolved
rem Get <stat_descr> from Stats.txt and save its value in <target_envvar>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GitHub doesn't like these, and looking here:

https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/rem

You can't use a redirection character (< or >) or pipe (|) in a batch file comment.

seems to imply there might be a problem.

Copy link
Author

@mojomojomojo mojomojomojo Jun 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't mind conforming to the docs, but in my experience, this has never caused a problem.

On my Win10 system, running a batch file with this produces no output files, errors, I can pipe text into it, redirect stdout/stdin without issue.

REM  usage: t1 <t1_arg1>
REM         t1 | t2_pipe
REM  usage  t1 <t1_in
REM  usage  t1 >t1_out

echo ABCD EFGH

set /p myvar=What is your name?
echo Hello, %myvar%

I'm curious about the circumstances under which including these chars in a REM comment would do something. Has this ever failed for you?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it's some legacy from some old DOS version when rem wasn't a builtin.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated the scripts to avoid using <>|


set "SLEEPY_BASE=%~1"
set "STAT_DESCR=%~2"
set "TARGET_ENVVAR=%~3"

if exist "!SLEEPY_BASE!" rmdir /S /Q "!SLEEPY_BASE!"
call %~dp0\unpack_to "!SLEEPY_BASE!.sleepy" "!SLEEPY_BASE!" > nul
if errorlevel 1 exit 1

set FOUND=0
set STAT_VALUE=_NOT_FOUND_
if exist "!SLEEPY_BASE!\Stats.txt" (
for /f "tokens=1,2* delims=: " %%a in (!SLEEPY_BASE!\Stats.txt) do (
if "%%~a"=="!STAT_DESCR!" (
set FOUND=1
set "STAT_VALUE=%%~b"
)
)
)
if %FOUND% == 0 exit /b 1

ENDLOCAL & set "%TARGET_ENVVAR%=%STAT_VALUE%"
11 changes: 11 additions & 0 deletions scripts/set_config_dword.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@setlocal enabledelayedexpansion
@echo off

rem Set a config value (that's a DWORD) in the registry.
rem Usage: set_config_dword.cmd <option_name> <new_value>

set "VALUE_NAME=%~1"
set "VALUE_DATA=%~2"

reg add "HKCU\SOFTWARE\codersnotes.com\Very Sleepy" /v "!VALUE_NAME!" /t REG_DWORD /d !VALUE_DATA! /f
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not make the type a parameter instead of having two batch files?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I did it for readability and to hide the fact that the data was in the registry. The calling scripts care about "config data" not registry stuff.
I can change it if you'd prefer.


12 changes: 12 additions & 0 deletions scripts/test_minidump.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@echo off

rem usage: test_minidump.cmd <sleepy_file_basename>

if exist %1 rmdir /S /Q %1
call %~dp0\unpack_to %1.sleepy %1 > nul
if errorlevel 1 exit 1

set FOUND=0
if exist "%~1\minidump.dmp" set FOUND=1

if %FOUND% == 0 exit /b 1
2 changes: 2 additions & 0 deletions tests/cmdline/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.ilk
*.pdb
9 changes: 9 additions & 0 deletions tests/cmdline/ReadMe.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Command Line Parameter Testing

These command line parameters are tested

* minidump
* samplerate

The tests are not so much tests of functionality related to the parameters, but rather tests that the parameters are correctly honored when specified on the command line.

16 changes: 16 additions & 0 deletions tests/cmdline/build.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@setlocal
@echo off
cd /d "%~dp0"
call ..\..\scripts\clear_env.cmd

rem https://github.com/VerySleepy/verysleepy/issues/28

SETLOCAL
call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
cl /MD /Z7 program.c /Fe:program32.exe /link /DEBUG:FASTLINK
ENDLOCAL

SETLOCAL
call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
cl /MD /Z7 program.c /Fe:program64.exe /link /DEBUG:FASTLINK
ENDLOCAL
13 changes: 13 additions & 0 deletions tests/cmdline/program.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
int vs_test_fun()
{
unsigned int i, n = 17;
// This is 4x longer than the other ones because we need more time to gather samples.
for (i=0; i<4000000000u; i++)
n = n * 17 + i;
return n;
}

int main()
{
return vs_test_fun();
}
Binary file added tests/cmdline/program32.exe
Binary file not shown.
Binary file added tests/cmdline/program64.exe
Binary file not shown.
24 changes: 24 additions & 0 deletions tests/cmdline/test.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
@echo off
setlocal enabledelayedexpansion
if not exist program32.exe call build
if not exist program64.exe call build

rem https://github.com/VerySleepy/verysleepy/issues/28

rem Verify that command-line options are honored and do not override saved configuration settings.

set SLEEPY_SILENT_CRASH=1

for %%b in (32 64) do (
echo Testing %%b

FOR %%o in (minidump samplerate) do (
mojomojomojo marked this conversation as resolved.
Show resolved Hide resolved
rem Discard any saved config options.
call ..\..\scripts\clear_config

call test_cmdline_%%o.cmd %%b
if !ERRORLEVEL! neq 0 exit /b 1
)
)

echo %~dp0 OK
30 changes: 30 additions & 0 deletions tests/cmdline/test_cmdline_minidump.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
@echo off
setlocal enabledelayedexpansion

set "PGMARCH=%~1"

call ..\..\scripts\get_config SaveMinidump START_MINIDUMP_VALUE
IF NOT "!START_MINIDUMP_VALUE!"=="" (IF "START_MINIDUMP_VALUE"=="429496729" (SET /A START_MINIDUMP_VALUE=-1) ELSE (SET /A START_MINIDUMP_VALUE=START_MINIDUMP_VALUE))

SET TEST_MINIDUMP_VALUE=2

IF "!START_MINIDUMP_VALUE!"=="!TEST_MINIDUMP_VALUE!" (SET /A TEST_MINIDUMP_VALUE=TEST_MINIDUMP_VALUE+1)
@echo Test MiniDump value: !TEST_MINIDUMP_VALUE!

if exist program-!PGMARCH!.sleepy del program-!PGMARCH!.sleepy
rem Ensure that we profile a matching-architecture executable so that the "mismatch" warning doesn't halt the test.
call ..\..\scripts\sleepy!pgmarch! /r:program!pgmarch!.exe /o:program-!pgmarch!.sleepy /minidump:!TEST_MINIDUMP_VALUE!
if !ERRORLEVEL! neq 0 exit /b 1

rem Verify the capture has a dump.
call ..\..\scripts\test_minidump program-!pgmarch!
if !ERRORLEVEL! neq 0 echo Minidump not taken & exit /b 1

rem Verify that the config value didn't change to what we specified.
rem It will change if it wasn't set, but not to what we specified.
call ..\..\scripts\get_config SaveMinidump FINAL_MINIDUMP_VALUE

IF "!FINAL_MINIDUMP_VALUE!"=="!TEST_MINIDUMP_VALUE!" (
echo ERROR: SaveMinidump value was changed to the cmdline override value.
exit /b 1
)
85 changes: 85 additions & 0 deletions tests/cmdline/test_cmdline_samplerate.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
@echo off
setlocal enabledelayedexpansion

rem Testing Parameter: samplerate (speed throttle)
rem The test for this involves counting the number of samples taken during captures whose durations are identical.
rem Test with a number different sample rates, and verify that the number of samples decreases when the sample rate decreases.
rem Because sample rate is only a fudge-y way of reducing induced load due to sampling, choose
rem values for sample rate that _should_ clearly indicate that the rate was higher.
rem I have also observed that sample rates above 60 or so will not always effect taking more samples.


set "PGMARCH=%~1"
set CONFIG_PARAM=SpeedThrottle

set PREVIOUS_SAMPLES=
for /L %%r in (1, 40, 100) DO (
@echo Testing Sample Rate: %%r
call :TEST_SAMPLE_RATE %%r OBSERVED_SAMPLE_COUNT
if ERRORLEVEL 1 exit /b 1
@echo Observed samples: !OBSERVED_SAMPLE_COUNT!
if not "!PREVIOUS_SAMPLES!"=="" (
if !PREVIOUS_SAMPLES! gtr !OBSERVED_SAMPLE_COUNT! (
@echo ERROR: Sample count did not decrease as the sample rate increased.
exit /b 1
)
)
set /a PREVIOUS_SAMPLES = OBSERVED_SAMPLE_COUNT
)

exit /b




:TEST_SAMPLE_RATE
setlocal enabledelayedexpansion

rem Set the parameter to a different value than what's being tested with.
rem Perform the profiling capture.
rem Expand the archive.
rem Get the number of samples taken from Stats.txt.
rem Assign that value to the passed-in environment variable name.

SET "TEST_SAMPLERATE_VALUE=%~1"
SET "OUTPUT_VAR=%~2"


set /a START_SAMPLERATE_VALUE=101-!TEST_SAMPLERATE_VALUE!
call ..\..\scripts\set_config_dword "!CONFIG_PARAM!" !START_SAMPLERATE_VALUE!
call ..\..\scripts\get_config "!CONFIG_PARAM!" CHECK_START_SAMPLERATE_VALUE
if not "!CHECK_START_SAMPLERATE_VALUE!"=="!START_SAMPLERATE_VALUE!" (
@echo PRECONDITION ERROR: failed to set the saved config value for !CONFIG_PARAM!
exit /b 1
)

@echo Test SampleRate value: !TEST_SAMPLERATE_VALUE!

if exist "program-!PGMARCH!.sleepy" del "program-!PGMARCH!.sleepy"
if exist "program-!PGMARCH!" rmdir /s /q "program-!PGMARCH!"

call ..\..\scripts\sleepy!pgmarch! /r:program!pgmarch!.exe /o:program-!pgmarch!.sleepy /samplerate:!TEST_SAMPLERATE_VALUE!
if !ERRORLEVEL! neq 0 (
@echo ERROR: Very Sleepy reports failure: !ERRORLEVEL!
exit /b 1
)

rem Get the number of samples.
call ..\..\scripts\get_stat "program-!pgmarch!" Samples OBSERVED_SAMPLES
if !ERRORLEVEL! neq 0 exit /b 1
if "!OBSERVED_SAMPLES!"=="" (
@echo Unable to find sample count in profile stats.
exit /b 1
)

rem Verify that the config value didn't change to what we specified.
rem It will change if it wasn't set, but not to what we specified.
call ..\..\scripts\get_config "!CONFIG_PARAM!" FINAL_SAMPLERATE_VALUE

IF "!FINAL_SAMPLERATE_VALUE!"=="!TEST_SAMPLERATE_VALUE!" (
echo ERROR: !CONFIG_PARAM! value was changed to the cmdline override value.
exit /b 1
)

endlocal & set /a %OUTPUT_VAR% = %OBSERVED_SAMPLES%
exit /b