Ros-diffs October 2006

ros-diffs@reactos.org

17 participants
357 discussions

[janderwald] 24593: - add an option to store emulators pidfile in txt - destroy emulator process when sysreg exits (windows only currently) - the tool now works in windows
by janderwald＠svn.reactos.org 21 Oct '06

21 Oct '06

Author: janderwald Date: Sat Oct 21 20:12:42 2006 New Revision: 24593 URL: http://svn.reactos.org/svn/reactos?rev=24593&view=rev Log: - add an option to store emulators pidfile in txt - destroy emulator process when sysreg exits (windows only currently) - the tool now works in windows Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/sample.cfg Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Sat Oct 21 20:12:42 2006 @@ -22,6 +22,10 @@ #include <assert.h> +#ifndef __LINUX__ +#include <windows.h> +#endif + namespace Sysreg_ { @@ -48,6 +52,7 @@ string RosBootTest::DEBUG_PORT = _T("ROSBOOT_DEBUG_PORT"); string RosBootTest::DEBUG_FILE = _T("ROSBOOT_DEBUG_FILE"); string RosBootTest::TIME_OUT = _T("ROSBOOT_TIME_OUT"); + string RosBootTest::PID_FILE= _T("ROSBOOT_PID_FILE"); //--------------------------------------------------------------------------------------- RosBootTest::RosBootTest() : RegressionTest(RosBootTest::CLASS_NAME), m_Timeout(60.0) @@ -90,6 +95,9 @@ m_Timeout = 60.0; } } + + conf_parser.getStringValue (RosBootTest::PID_FILE, m_PidFile); + if (!_tcscmp(debug_port.c_str(), _T("pipe"))) { @@ -118,11 +126,6 @@ //--------------------------------------------------------------------------------------- bool RosBootTest::checkDebugData(vector<string> & debug_data) { - /// - /// FIXME - /// - /// parse debug_data and output STOP errors, UM exception - /// as well as important stages i.e. ntoskrnl loaded /// TBD the information needs to be written into an provided log object /// which writes the info into HTML/log / sends etc .... @@ -131,6 +134,8 @@ for(size_t i = 0; i < debug_data.size();i++) { string line = debug_data[i]; + + cerr << line << endl; if (line.find (_T("*** Fatal System Error")) != string::npos) { @@ -186,7 +191,7 @@ } - if (clear) + if (clear && debug_data.size () > 5) { debug_data.clear (); } @@ -258,18 +263,33 @@ { PipeReader pipe_reader; -#if 0 _tremove(debug_log.c_str ()); + _tremove(m_PidFile.c_str ()); if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) { cerr << "Error: failed to open pipe with cmd: " << boot_cmd << endl; return false; } -#endif // FIXXME // give the emulator some time to load freeloadr _sleep( (clock_t)4 * CLOCKS_PER_SEC ); + int pid = 0; + + if (m_PidFile != _T("")) + { + FILE * pidfile = _tfopen(m_PidFile.c_str (), _T("rt")); + if (pidfile) + { + TCHAR szBuffer[20]; + if (_fgetts(szBuffer, sizeof(szBuffer) / sizeof(TCHAR), pidfile)) + { + pid = _ttoi(szBuffer); + } + + } + fclose(pidfile); + } FILE * file = _tfopen(debug_log.c_str (), _T("rt")); if (!file) @@ -279,19 +299,34 @@ return false; } - TCHAR szBuffer[150]; + TCHAR szBuffer[1000]; bool ret = true; vector<string> vect; -#if 0 + while(!pipe_reader.isEof ()) -#else - while(!feof(file)) -#endif { if (_fgetts(szBuffer, sizeof(szBuffer) / sizeof(TCHAR), file)) { + string line = szBuffer; - vect.push_back (line); + + while(line.find (_T("\x10")) != string::npos) + { + line.erase(line.find(_T("\x10")), 1); + } + + if (line[0] != _T('(') && vect.size() >=1) + { + string prev = vect[vect.size () -1]; + prev.insert (prev.length ()-1, line); + vect.pop_back (); + vect.push_back (prev); + + } + else + { + vect.push_back (line); + } if (!checkDebugData(vect)) { @@ -304,9 +339,21 @@ } } } -#if 0 - pipe_reader.closePipe (); + fclose(file); + if (pid) + { +#ifdef __LINUX__ + +#else + HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pid); + if (hProcess) + { + TerminateProcess(hProcess, 0); + } + CloseHandle(hProcess); #endif + } + pipe_reader.closePipe (); return ret; } Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Sat Oct 21 20:12:42 2006 @@ -33,6 +33,7 @@ static string DEBUG_PORT; static string DEBUG_FILE; static string TIME_OUT; + static string PID_FILE; //--------------------------------------------------------------------------------------- /// @@ -116,6 +117,7 @@ protected: double m_Timeout; + string m_PidFile; }; // end of class RosBootTest Modified: trunk/reactos/tools/sysreg/sample.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sample.cfg?re… ============================================================================== --- trunk/reactos/tools/sysreg/sample.cfg (original) +++ trunk/reactos/tools/sysreg/sample.cfg Sat Oct 21 20:12:42 2006 @@ -27,7 +27,15 @@ ; This value is the command which is executed to gain debugging data ; this value is mandatory -ROSBOOT_CMD=D:\sysreg\qemu\qemu.exe -serial file:debug.log -boot c -m 128 -L D:\sysreg\qemu\ D:\sysreg\qemu\RosVM.vmdk -cdrom D:\Reactos\ReactOS-RegTest.iso +ROSBOOT_CMD=D:\sysreg\qemu\qemu.exe -serial file:debug.log -boot c -m 128 -L D:\sysreg\qemu\ D:\sysreg\qemu\RosVM.vmdk -cdrom D:\Reactos\ReactOS-RegTest.iso -pidfile pid.txt + +; +; ROSBOOT_PIDFILE +; +; This option stores the pid of the emulator process in a text file. +; + +ROSBOOT_PID_FILE=pid.txt ; ; ROSBOOT_DEBUG_PORT @@ -49,7 +57,7 @@ ; ROSBOOT_DEBUG_PORT=file ;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\bsdebug.log -ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\umdebug.log +ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\debug.log ; ROSBOOT_TIME_OUT ;

1 0

[weiden] 24592: Remove the no longer used kjs library
by weiden＠svn.reactos.org 21 Oct '06

21 Oct '06

Author: weiden Date: Sat Oct 21 20:00:44 2006 New Revision: 24592 URL: http://svn.reactos.org/svn/reactos?rev=24592&view=rev Log: Remove the no longer used kjs library Removed: trunk/reactos/include/reactos/libs/libs/ trunk/reactos/lib/kjs/ Modified: trunk/reactos/lib/lib.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=24592&r… ============================================================================== --- trunk/reactos/lib/lib.rbuild (original) +++ trunk/reactos/lib/lib.rbuild Sat Oct 21 20:00:44 2006 @@ -27,9 +27,6 @@ </directory> <directory name="intrlck"> <xi:include href="intrlck/intrlck.rbuild" /> -</directory> -<directory name="kjs"> - <xi:include href="kjs/kjs.rbuild" /> </directory> <directory name="libwine"> <xi:include href="libwine/libwine.rbuild" /> Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sat Oct 21 20:00:44 2006 @@ -9,13 +9,11 @@ <define name="__NO_CTYPE_INLINES" /> <define name="__USE_W32API" /> <define name="WIN9X_COMPAT_SPINLOCK" /> - <include base="kjs">include</include> <include base="cmlib">.</include> <include base="ntoskrnl">include</include> <include base="ReactOS">include/reactos/drivers</include> <library>csq</library> <library>hal</library> - <library>kjs</library> <library>pseh</library> <library>cmlib</library> <library>rtl</library>

1 0

[janderwald] 24591: - set svn-eol:style property
by janderwald＠svn.reactos.org 21 Oct '06

21 Oct '06

Author: janderwald Date: Sat Oct 21 12:56:23 2006 New Revision: 24591 URL: http://svn.reactos.org/svn/reactos?rev=24591&view=rev Log: - set svn-eol:style property Modified: trunk/reactos/tools/sysreg/sample.cfg (contents, props changed) Modified: trunk/reactos/tools/sysreg/sample.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sample.cfg?re… ============================================================================== --- trunk/reactos/tools/sysreg/sample.cfg (original) +++ trunk/reactos/tools/sysreg/sample.cfg Sat Oct 21 12:56:23 2006 @@ -1,62 +1,62 @@ -; ROS_OUTPUT -; -; This variable sets the location where to search symbol files for modules -; This is required when tracing usermode exceptions, bsod etc... -; -; If this value is not defined, sysreg looks for the environment variable -; ROS_OUTPUT. If this is also not set, it uses the default output-i386 - -ROS_OUTPUT=D:\reactos\output-i386 - -; ROS_ADDR2LINE -; -; This value is used by the symbol resolver to convert an module address into -; an source file + line number; -; -; Note: The symbol resolver appends the modulename and the module address seperated by an space - -ROS_ADDR2LINE=addr2line.exe --exe= - -;----------------------------------------------------------------------------------------- -; RosBoot specific settings -; - -; -; ROSBOOT_CMD -; -; This value is the command which is executed to gain debugging data -; this value is mandatory - -ROSBOOT_CMD=D:\sysreg\qemu\qemu.exe -serial file:debug.log -boot c -m 128 -L D:\sysreg\qemu\ D:\sysreg\qemu\RosVM.vmdk -cdrom D:\Reactos\ReactOS-RegTest.iso - -; -; ROSBOOT_DEBUG_PORT -; -; This variable controls on where to look for debugging data. If the -; value is set to file, then sysreg will execute ROSBOOT_CMD and also -; open the file specified in ROSBOOT_DEBUG_FILE and read the debugging info from the file -; -; If the value is set to pipe, then sysreg will read from pipe created by the -; ROSBOOT_CMD -; -;ROSBOOT_DEBUG_PORT=pipe -ROSBOOT_DEBUG_PORT=file - -; -; ROSBOOT_DEBUG_FILE -; -; This value specifies the debug file. This variable must be set when using -; ROSBOOT_DEBUG_PORT=file - -;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\bsdebug.log -ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\umdebug.log - -; ROSBOOT_TIME_OUT -; -; This variable is the maximum runtime of the ROSBOOT_CMD. If the command -; runs longer than this value, sysreg exits with success mode; -; -; If the variable is not set, the default timeout is 1 minute -; -ROSBOOT_TIME_OUT=180.0 - +; ROS_OUTPUT +; +; This variable sets the location where to search symbol files for modules +; This is required when tracing usermode exceptions, bsod etc... +; +; If this value is not defined, sysreg looks for the environment variable +; ROS_OUTPUT. If this is also not set, it uses the default output-i386 + +ROS_OUTPUT=D:\reactos\output-i386 + +; ROS_ADDR2LINE +; +; This value is used by the symbol resolver to convert an module address into +; an source file + line number; +; +; Note: The symbol resolver appends the modulename and the module address seperated by an space + +ROS_ADDR2LINE=addr2line.exe --exe= + +;----------------------------------------------------------------------------------------- +; RosBoot specific settings +; + +; +; ROSBOOT_CMD +; +; This value is the command which is executed to gain debugging data +; this value is mandatory + +ROSBOOT_CMD=D:\sysreg\qemu\qemu.exe -serial file:debug.log -boot c -m 128 -L D:\sysreg\qemu\ D:\sysreg\qemu\RosVM.vmdk -cdrom D:\Reactos\ReactOS-RegTest.iso + +; +; ROSBOOT_DEBUG_PORT +; +; This variable controls on where to look for debugging data. If the +; value is set to file, then sysreg will execute ROSBOOT_CMD and also +; open the file specified in ROSBOOT_DEBUG_FILE and read the debugging info from the file +; +; If the value is set to pipe, then sysreg will read from pipe created by the +; ROSBOOT_CMD +; +;ROSBOOT_DEBUG_PORT=pipe +ROSBOOT_DEBUG_PORT=file + +; +; ROSBOOT_DEBUG_FILE +; +; This value specifies the debug file. This variable must be set when using +; ROSBOOT_DEBUG_PORT=file + +;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\bsdebug.log +ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\umdebug.log + +; ROSBOOT_TIME_OUT +; +; This variable is the maximum runtime of the ROSBOOT_CMD. If the command +; runs longer than this value, sysreg exits with success mode; +; +; If the variable is not set, the default timeout is 1 minute +; +ROSBOOT_TIME_OUT=180.0 + Propchange: trunk/reactos/tools/sysreg/sample.cfg ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 24590: - provide a sample configuration file - allow other address line resolver than addr2line
by janderwald＠svn.reactos.org 21 Oct '06

21 Oct '06

Author: janderwald Date: Sat Oct 21 12:55:34 2006 New Revision: 24590 URL: http://svn.reactos.org/svn/reactos?rev=24590&view=rev Log: - provide a sample configuration file - allow other address line resolver than addr2line Added: trunk/reactos/tools/sysreg/sample.cfg Modified: trunk/reactos/tools/sysreg/sym_file.cpp Added: trunk/reactos/tools/sysreg/sample.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sample.cfg?re… ============================================================================== --- trunk/reactos/tools/sysreg/sample.cfg (added) +++ trunk/reactos/tools/sysreg/sample.cfg Sat Oct 21 12:55:34 2006 @@ -1,0 +1,62 @@ +; ROS_OUTPUT +; +; This variable sets the location where to search symbol files for modules +; This is required when tracing usermode exceptions, bsod etc... +; +; If this value is not defined, sysreg looks for the environment variable +; ROS_OUTPUT. If this is also not set, it uses the default output-i386 + +ROS_OUTPUT=D:\reactos\output-i386 + +; ROS_ADDR2LINE +; +; This value is used by the symbol resolver to convert an module address into +; an source file + line number; +; +; Note: The symbol resolver appends the modulename and the module address seperated by an space + +ROS_ADDR2LINE=addr2line.exe --exe= + +;----------------------------------------------------------------------------------------- +; RosBoot specific settings +; + +; +; ROSBOOT_CMD +; +; This value is the command which is executed to gain debugging data +; this value is mandatory + +ROSBOOT_CMD=D:\sysreg\qemu\qemu.exe -serial file:debug.log -boot c -m 128 -L D:\sysreg\qemu\ D:\sysreg\qemu\RosVM.vmdk -cdrom D:\Reactos\ReactOS-RegTest.iso + +; +; ROSBOOT_DEBUG_PORT +; +; This variable controls on where to look for debugging data. If the +; value is set to file, then sysreg will execute ROSBOOT_CMD and also +; open the file specified in ROSBOOT_DEBUG_FILE and read the debugging info from the file +; +; If the value is set to pipe, then sysreg will read from pipe created by the +; ROSBOOT_CMD +; +;ROSBOOT_DEBUG_PORT=pipe +ROSBOOT_DEBUG_PORT=file + +; +; ROSBOOT_DEBUG_FILE +; +; This value specifies the debug file. This variable must be set when using +; ROSBOOT_DEBUG_PORT=file + +;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\bsdebug.log +ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\umdebug.log + +; ROSBOOT_TIME_OUT +; +; This variable is the maximum runtime of the ROSBOOT_CMD. If the command +; runs longer than this value, sysreg exits with success mode; +; +; If the variable is not set, the default timeout is 1 minute +; +ROSBOOT_TIME_OUT=180.0 + Modified: trunk/reactos/tools/sysreg/sym_file.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sym_file.cpp?… ============================================================================== --- trunk/reactos/tools/sysreg/sym_file.cpp (original) +++ trunk/reactos/tools/sysreg/sym_file.cpp Sat Oct 21 12:55:34 2006 @@ -172,7 +172,7 @@ TCHAR szCmd[300]; - _stprintf(szCmd, _T("%s --exe=%s %s"), m_SymResolver.c_str (), it->second.c_str (), module_address.c_str()); + _stprintf(szCmd, _T("%s %s %s"), m_SymResolver.c_str (), it->second.c_str (), module_address.c_str()); string pipe_cmd(szCmd); PipeReader pipe_reader;

1 0

[janderwald] 24589: - give sysreg a makefile - allow compilation with gcc 4.1.1 - temporary disable execution of emulator command - lets start testing :)
by janderwald＠svn.reactos.org 21 Oct '06

21 Oct '06

Author: janderwald Date: Sat Oct 21 12:34:00 2006 New Revision: 24589 URL: http://svn.reactos.org/svn/reactos?rev=24589&view=rev Log: - give sysreg a makefile - allow compilation with gcc 4.1.1 - temporary disable execution of emulator command - lets start testing :) Added: trunk/reactos/tools/sysreg/sysreg.mak (with props) Modified: trunk/reactos/tools/sysreg/comp_factory.h trunk/reactos/tools/sysreg/pipe_reader.cpp trunk/reactos/tools/sysreg/reg_test.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/sym_file.cpp trunk/reactos/tools/sysreg/sysreg.cpp trunk/reactos/tools/tools.mak Modified: trunk/reactos/tools/sysreg/comp_factory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/comp_factory.… ============================================================================== --- trunk/reactos/tools/sysreg/comp_factory.h (original) +++ trunk/reactos/tools/sysreg/comp_factory.h Sat Oct 21 12:34:00 2006 @@ -18,7 +18,21 @@ { using std::map; using std::vector; - using std::endl; + +#ifdef UNICODE + + using std::wcout; + using std::endl; + +#define cout wcout; + +#else + + using std::cout; + using std::endl; + +#endif + //---------------------------------------------------------- /// /// ComponentFactoryTemplate Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/pipe_reader.cpp Sat Oct 21 12:34:00 2006 @@ -73,7 +73,7 @@ int res = _pclose(m_File); - if (res == UINT_MAX) + if (res == INT_MAX) { cerr << "Error: _pclose failed " <<endl; return false; Modified: trunk/reactos/tools/sysreg/reg_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/reg_test.h?re… ============================================================================== --- trunk/reactos/tools/sysreg/reg_test.h (original) +++ trunk/reactos/tools/sysreg/reg_test.h Sat Oct 21 12:34:00 2006 @@ -84,4 +84,4 @@ } // end of namespace Sysreg_ -#endif +#endif Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Sat Oct 21 12:34:00 2006 @@ -258,13 +258,14 @@ { PipeReader pipe_reader; +#if 0 _tremove(debug_log.c_str ()); if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) { cerr << "Error: failed to open pipe with cmd: " << boot_cmd << endl; return false; } - +#endif // FIXXME // give the emulator some time to load freeloadr _sleep( (clock_t)4 * CLOCKS_PER_SEC ); @@ -281,8 +282,11 @@ TCHAR szBuffer[150]; bool ret = true; vector<string> vect; - +#if 0 while(!pipe_reader.isEof ()) +#else + while(!feof(file)) +#endif { if (_fgetts(szBuffer, sizeof(szBuffer) / sizeof(TCHAR), file)) { @@ -300,9 +304,10 @@ } } } - +#if 0 pipe_reader.closePipe (); +#endif return ret; } -} // end of namespace Sysreg_ +} // end of namespace Sysreg_ Modified: trunk/reactos/tools/sysreg/sym_file.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sym_file.cpp?… ============================================================================== --- trunk/reactos/tools/sysreg/sym_file.cpp (original) +++ trunk/reactos/tools/sysreg/sym_file.cpp Sat Oct 21 12:34:00 2006 @@ -88,8 +88,8 @@ string val = current_dir; val.insert (val.length()-1, _T("\\*")); - struct _tfinddata64i32_t c_file; - intptr_t hFile = _tfindfirst64i32(val.c_str(), &c_file); + struct _tfinddatai64_t c_file; + intptr_t hFile = _tfindfirsti64(val.c_str(), &c_file); if (hFile == -1L) { @@ -130,7 +130,7 @@ } } - }while(_tfindnext(hFile, &c_file) == 0); + }while(_tfindnexti64(hFile, &c_file) == 0); _findclose(hFile); hFile = -1L; @@ -141,7 +141,7 @@ vect.erase (vect.begin()); val = current_dir; val.insert (val.length() -1, _T("\\*")); - hFile = _tfindfirst64i32(val.c_str(), &c_file); + hFile = _tfindfirsti64(val.c_str(), &c_file); if (hFile != -1L) { break; @@ -208,4 +208,4 @@ return true; } -} // end of namespace System_ +} // end of namespace System_ Modified: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (original) +++ trunk/reactos/tools/sysreg/sysreg.cpp Sat Oct 21 12:34:00 2006 @@ -23,6 +23,7 @@ #else using std::cerr; + using std::cout; using std::endl; #endif @@ -95,4 +96,4 @@ } return 0; -} +} Added: trunk/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.mak (added) +++ trunk/reactos/tools/sysreg/sysreg.mak Sat Oct 21 12:34:00 2006 @@ -1,0 +1,72 @@ +SYSREGBUILD_BASE = $(TOOLS_BASE)$(SEP)sysreg +SYSREGBUILD_BASE_ = $(SYSREGBUILD_BASE)$(SEP) +SYSREGBUILD_INT = $(INTERMEDIATE_)$(SYSREGBUILD_BASE) +SYSREGBUILD_INT_ = $(SYSREGBUILD_INT)$(SEP) +SYSREGBUILD_OUT = $(OUTPUT_)$(SYSREGBUILD_BASE) +SYSREGBUILD_OUT_ = $(SYSREGBUILD_OUT)$(SEP) + +$(SYSREGBUILD_INT): | $(TOOLS_INT) + $(ECHO_MKDIR) + ${mkdir} $@ + +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(SYSREGBUILD_OUT): | $(TOOLS_OUT) + $(ECHO_MKDIR) + ${mkdir} $@ +endif + +SYSREGBUILD_TARGET = \ + $(EXEPREFIX)$(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX) + +SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\ + conf_parser.cpp \ + env_var.cpp \ + pipe_reader.cpp \ + rosboot_test.cpp \ + sym_file.cpp \ + sysreg.cpp \ + ) + +SYSREGBUILD_OBJECTS = \ + $(addprefix $(INTERMEDIATE_), $(SYSREGBUILD_SOURCES:.cpp=.o)) + +SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__USE_W32API -Iinclude -Iinclude/reactos -Iinclude/psdk + +SYSREGBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) + +.PHONY: sysreg +sysreg: $(SYSREGBUILD_TARGET) +host_gpp += -g + +$(SYSREGBUILD_TARGET): $(SYSREGBUILD_OBJECTS) | $(SYSREGBUILD_OUT) + $(ECHO_LD) + ${host_gpp} $(SYSREGBUILD_OBJECTS) $(SYSREGBUILD_HOST_LFLAGS) -o $@ + +$(SYSREGBUILD_INT_)conf_parser.o: $(SYSREGBUILD_BASE_)conf_parser.cpp | $(SYSREGBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + +$(SYSREGBUILD_INT_)env_var.o: $(SYSREGBUILD_BASE_)env_var.cpp | $(SYSREGBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + +$(SYSREGBUILD_INT_)pipe_reader.o: $(SYSREGBUILD_BASE_)pipe_reader.cpp | $(SYSREGBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + +$(SYSREGBUILD_INT_)rosboot_test.o: $(SYSREGBUILD_BASE_)rosboot_test.cpp | $(SYSREGBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + +$(SYSREGBUILD_INT_)sym_file.o: $(SYSREGBUILD_BASE_)sym_file.cpp | $(SYSREGBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + +$(SYSREGBUILD_INT_)sysreg.o: $(SYSREGBUILD_BASE_)sysreg.cpp | $(SYSREGBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + +.PHONY: sysregbuild_clean +sysreg_clean: + -@$(rm) $(SYSREGBUILD_TARGET) $(SYSREGBUILD_OBJECTS) 2>$(NUL) +clean: sysreg_clean Propchange: trunk/reactos/tools/sysreg/sysreg.mak ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=24589&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Sat Oct 21 12:34:00 2006 @@ -58,3 +58,4 @@ include tools/wmc/wmc.mak include tools/wpp/wpp.mak include tools/wrc/wrc.mak +include tools/sysreg/sysreg.mak

1 0

[janderwald] 24588: - implement a basic boot detection algorithm - sysreg can now recognize some user mode detection and blue screen of deaths - a few timing issues have to be sorted out in order make deployment ready
by janderwald＠svn.reactos.org 21 Oct '06

21 Oct '06

Author: janderwald Date: Sat Oct 21 04:13:52 2006 New Revision: 24588 URL: http://svn.reactos.org/svn/reactos?rev=24588&view=rev Log: - implement a basic boot detection algorithm - sysreg can now recognize some user mode detection and blue screen of deaths - a few timing issues have to be sorted out in order make deployment ready Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/sym_file.cpp trunk/reactos/tools/sysreg/sysreg.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Sat Oct 21 04:13:52 2006 @@ -11,10 +11,17 @@ #include "rosboot_test.h" #include "pipe_reader.h" +#include "sym_file.h" #include <iostream> +#include <vector> #include <time.h> #include <float.h> +#include <stdio.h> +#include <stdlib.h> +#include <assert.h> + + namespace Sysreg_ { @@ -32,8 +39,9 @@ #endif - + using std::vector; using System_::PipeReader; + using System_::SymbolFile; string RosBootTest::VARIABLE_NAME = _T("ROSBOOT_CMD"); string RosBootTest::CLASS_NAME = _T("rosboot"); @@ -108,7 +116,7 @@ return ret; } //--------------------------------------------------------------------------------------- - bool RosBootTest::checkDebugData(string debug_data) + bool RosBootTest::checkDebugData(vector<string> & debug_data) { /// /// FIXME @@ -118,9 +126,71 @@ /// TBD the information needs to be written into an provided log object /// which writes the info into HTML/log / sends etc .... -// cerr << debug_data << endl; + bool clear = true; + + for(size_t i = 0; i < debug_data.size();i++) + { + string line = debug_data[i]; + + if (line.find (_T("*** Fatal System Error")) != string::npos) + { + cerr << "BSOD detected" <<endl; + return false; + } + else if (line.find (_T("Unhandled exception")) != string::npos) + { + if (i + 3 >= debug_data.size ()) + { + /// + /// missing information is cut off -> try reconstruct at next call + /// + clear = false; + break; + } + + cerr << "UM detected" <<endl; + + /// + /// extract address from next line + /// + + string address = debug_data[i+2]; + string::size_type pos = address.find_last_of (_T(" ")); + address = address.substr (pos, address.length () - 1 - pos); + + /// + /// extract module name + /// + string modulename = debug_data[i+3]; + pos = modulename.find_last_of (_T("\\")); + modulename = modulename.substr (pos + 1, modulename.length () - pos); + pos = modulename.find_last_of (_T(".")); + modulename = modulename.substr (0, pos); + + /// + /// resolve address + /// + string result; + result.reserve (200); + + SymbolFile::resolveAddress (modulename, address, result); + cerr << result << endl; + + /// + /// TODO + /// + /// resolve frame addresses + + return false; + } + + } + + if (clear) + { + debug_data.clear (); + } return true; - } //--------------------------------------------------------------------------------------- bool RosBootTest::isTimeout(double max_timeout) @@ -150,7 +220,6 @@ //--------------------------------------------------------------------------------------- bool RosBootTest::fetchDebugByPipe(string boot_cmd) { - struct timeval ts; PipeReader pipe_reader; if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) @@ -159,9 +228,10 @@ return false; } string Buffer; - Buffer.reserve (10000); + Buffer.reserve (500); bool ret = true; + vector<string> vect; while(!pipe_reader.isEof ()) { @@ -170,11 +240,11 @@ break; } - string::size_type size = pipe_reader.readPipe (Buffer); - cerr << "XXXsize_type " << size <<endl; - - - if (!checkDebugData(Buffer)) + pipe_reader.readPipe (Buffer); + vect.push_back (Buffer); + + + if (!checkDebugData(vect)) { ret = false; break; @@ -194,6 +264,12 @@ cerr << "Error: failed to open pipe with cmd: " << boot_cmd << endl; return false; } + + // FIXXME + // give the emulator some time to load freeloadr + _sleep( (clock_t)4 * CLOCKS_PER_SEC ); + + FILE * file = _tfopen(debug_log.c_str (), _T("rt")); if (!file) { @@ -202,15 +278,18 @@ return false; } - TCHAR szBuffer[500]; + TCHAR szBuffer[150]; bool ret = true; + vector<string> vect; while(!pipe_reader.isEof ()) { if (_fgetts(szBuffer, sizeof(szBuffer) / sizeof(TCHAR), file)) { - string buffer = szBuffer; - if (!checkDebugData(buffer)) + string line = szBuffer; + vect.push_back (line); + + if (!checkDebugData(vect)) { ret = false; break; Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Sat Oct 21 04:13:52 2006 @@ -12,10 +12,12 @@ #include "reg_test.h" -#include <winsock2.h> +#include <vector> namespace Sysreg_ { + using std::vector; + //--------------------------------------------------------------------------------------- /// /// class RosBootTest @@ -100,7 +102,7 @@ /// Note: the received debug information should be written to an internal log object /// to facilate post-processing of the results - bool checkDebugData(string debug_data); + bool checkDebugData(vector<string> & debug_data); //--------------------------------------------------------------------------------------- /// Modified: trunk/reactos/tools/sysreg/sym_file.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sym_file.cpp?… ============================================================================== --- trunk/reactos/tools/sysreg/sym_file.cpp (original) +++ trunk/reactos/tools/sysreg/sym_file.cpp Sat Oct 21 04:13:52 2006 @@ -170,14 +170,11 @@ return false; } - string pipe_cmd = m_SymResolver; - pipe_cmd += _T("--exe="); - pipe_cmd += it->second; - - pipe_cmd += _T(" "); - pipe_cmd += module_address; - - + TCHAR szCmd[300]; + + _stprintf(szCmd, _T("%s --exe=%s %s"), m_SymResolver.c_str (), it->second.c_str (), module_address.c_str()); + string pipe_cmd(szCmd); + PipeReader pipe_reader; if (!pipe_reader.openPipe (pipe_cmd)) Modified: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (original) +++ trunk/reactos/tools/sysreg/sysreg.cpp Sat Oct 21 04:13:52 2006 @@ -91,7 +91,7 @@ } else { - cout << "The regression test " << regtest->getName () << "failed" << endl; + cout << "The regression test " << regtest->getName () << " failed" << endl; } return 0;

1 0

[janderwald] 24587: - use timeout to define maximum runtime of emulator
by janderwald＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: janderwald Date: Sat Oct 21 01:14:08 2006 New Revision: 24587 URL: http://svn.reactos.org/svn/reactos?rev=24587&view=rev Log: - use timeout to define maximum runtime of emulator Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp trunk/reactos/tools/sysreg/pipe_reader.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/sym_file.cpp Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/pipe_reader.cpp Sat Oct 21 01:14:08 2006 @@ -85,7 +85,7 @@ //--------------------------------------------------------------------------------------- - bool PipeReader::isEof() const + bool PipeReader::isEof() { return feof(m_File); } Modified: trunk/reactos/tools/sysreg/pipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.h… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.h (original) +++ trunk/reactos/tools/sysreg/pipe_reader.h Sat Oct 21 01:14:08 2006 @@ -103,7 +103,7 @@ /// Description: returns true if the pipe has reached end of file. The caller should call /// closePipe if this function returns true - bool isEof() const; + bool isEof(); protected: FILE * m_File; Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Sat Oct 21 01:14:08 2006 @@ -13,6 +13,8 @@ #include "pipe_reader.h" #include <iostream> +#include <time.h> +#include <float.h> namespace Sysreg_ { @@ -37,8 +39,10 @@ string RosBootTest::CLASS_NAME = _T("rosboot"); string RosBootTest::DEBUG_PORT = _T("ROSBOOT_DEBUG_PORT"); string RosBootTest::DEBUG_FILE = _T("ROSBOOT_DEBUG_FILE"); -//--------------------------------------------------------------------------------------- - RosBootTest::RosBootTest() : RegressionTest(RosBootTest::CLASS_NAME) + string RosBootTest::TIME_OUT = _T("ROSBOOT_TIME_OUT"); + +//--------------------------------------------------------------------------------------- + RosBootTest::RosBootTest() : RegressionTest(RosBootTest::CLASS_NAME), m_Timeout(60.0) { } @@ -54,6 +58,7 @@ { string boot_cmd; string debug_port; + string timeout; bool ret; if (!conf_parser.getStringValue (RosBootTest::DEBUG_PORT, debug_port)) @@ -66,7 +71,18 @@ cerr << "Error: ROSBOOT_CMD is not set in configuration file" << endl; return false; } - + + if (conf_parser.getStringValue(RosBootTest::TIME_OUT, timeout)) + { + TCHAR * stop; + m_Timeout = _tcstod(timeout.c_str (), &stop); + if (_isnan(m_Timeout) || m_Timeout == 0.0) + { + cerr << "Warning: overriding timeout with default of 60 sec" << endl; + m_Timeout = 60.0; + } + } + if (!_tcscmp(debug_port.c_str(), _T("pipe"))) { ret = fetchDebugByPipe(boot_cmd); @@ -102,8 +118,33 @@ /// TBD the information needs to be written into an provided log object /// which writes the info into HTML/log / sends etc .... - cerr << debug_data << endl; +// cerr << debug_data << endl; return true; + + } +//--------------------------------------------------------------------------------------- + bool RosBootTest::isTimeout(double max_timeout) + { + static time_t start = 0; + + if (!start) + { + time(&start); + return false; + } + + time_t stop; + time(&stop); + + double elapsed = difftime(stop, start); + if (elapsed > max_timeout) + { + return true; + } + else + { + return false; + } } //--------------------------------------------------------------------------------------- @@ -120,26 +161,34 @@ string Buffer; Buffer.reserve (10000); -// gettimeofday(&ts, NULL); + bool ret = true; while(!pipe_reader.isEof ()) { - pipe_reader.readPipe (Buffer); + if (isTimeout(m_Timeout)) + { + break; + } + + string::size_type size = pipe_reader.readPipe (Buffer); + cerr << "XXXsize_type " << size <<endl; + + if (!checkDebugData(Buffer)) { + ret = false; break; } - //if (hasTimeout(&ts, 60000) - } pipe_reader.closePipe (); - return true; + return ret; } //--------------------------------------------------------------------------------------- bool RosBootTest::fetchDebugByFile(Sysreg_::string boot_cmd, Sysreg_::string debug_log) { PipeReader pipe_reader; + _tremove(debug_log.c_str ()); if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) { cerr << "Error: failed to open pipe with cmd: " << boot_cmd << endl; @@ -154,21 +203,27 @@ } TCHAR szBuffer[500]; - - do + bool ret = true; + + while(!pipe_reader.isEof ()) { if (_fgetts(szBuffer, sizeof(szBuffer) / sizeof(TCHAR), file)) { string buffer = szBuffer; if (!checkDebugData(buffer)) { + ret = false; break; } - } - }while(!pipe_reader.isEof ()); + if (isTimeout(m_Timeout)) + { + break; + } + } + } pipe_reader.closePipe (); - return true; + return ret; } } // end of namespace Sysreg_ Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Sat Oct 21 01:14:08 2006 @@ -30,6 +30,7 @@ static string CLASS_NAME; static string DEBUG_PORT; static string DEBUG_FILE; + static string TIME_OUT; //--------------------------------------------------------------------------------------- /// @@ -101,15 +102,20 @@ bool checkDebugData(string debug_data); - }; // end of class RosBootTest - //--------------------------------------------------------------------------------------- /// /// checkTimeOut /// -/// Description: this function checks if the the application has already hung +/// Description: this function checks if the ReactOS has run longer than the maximum available +/// time - bool checkTimeOut(struct timeval * ts, unsigned max_timeout); + bool isTimeout(double max_timeout); + +protected: + + double m_Timeout; + + }; // end of class RosBootTest } // end of namespace Sysreg_ Modified: trunk/reactos/tools/sysreg/sym_file.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sym_file.cpp?… ============================================================================== --- trunk/reactos/tools/sysreg/sym_file.cpp (original) +++ trunk/reactos/tools/sysreg/sym_file.cpp Sat Oct 21 01:14:08 2006 @@ -114,7 +114,7 @@ path.insert (path.length () -1, _T("\\")); path.insert (path.length () -1, filename); - cerr << "Module Name " << modulename << endl << "File Name " << filename << endl; + cerr << "Module Name " << modulename << endl << "File Name " << path << endl; m_Map.insert(std::make_pair<string, string>(modulename, path));

1 0

[janderwald] 24586: - avoid using _tprintf - use EnvironmentVariable as a singleton
by janderwald＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: janderwald Date: Sat Oct 21 00:09:29 2006 New Revision: 24586 URL: http://svn.reactos.org/svn/reactos?rev=24586&view=rev Log: - avoid using _tprintf - use EnvironmentVariable as a singleton Modified: trunk/reactos/tools/sysreg/conf_parser.cpp trunk/reactos/tools/sysreg/conf_parser.h trunk/reactos/tools/sysreg/env_var.cpp trunk/reactos/tools/sysreg/env_var.h trunk/reactos/tools/sysreg/pipe_reader.cpp trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/sym_file.cpp trunk/reactos/tools/sysreg/sysreg.cpp Modified: trunk/reactos/tools/sysreg/conf_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.c… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.cpp (original) +++ trunk/reactos/tools/sysreg/conf_parser.cpp Sat Oct 21 00:09:29 2006 @@ -14,9 +14,20 @@ namespace Sysreg_ { - using std::cout; +#ifdef UNICODE + + using std::wcerr; + using std::endl; + +#define cerr wcerr + +#else + using std::cerr; using std::endl; + +#endif + using std::ifstream; //--------------------------------------------------------------------------------------- ConfigParser::ConfigParser() @@ -84,9 +95,7 @@ ConfigMap::iterator it = m_Map.find (ConfVariable); if (it == m_Map.end ()) { -#ifdef NDEBUG cerr << "ConfigParser::getValue failed to find " << ConfVariable << endl; -#endif return false; } Modified: trunk/reactos/tools/sysreg/conf_parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.h… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.h (original) +++ trunk/reactos/tools/sysreg/conf_parser.h Sat Oct 21 00:09:29 2006 @@ -18,6 +18,7 @@ namespace Sysreg_ { using std::map; + using std::wstring; //--------------------------------------------------------------------------------------- /// /// class ConfigParser @@ -34,6 +35,7 @@ class ConfigParser { public: + typedef std::basic_string<TCHAR> string; typedef std::basic_istringstream<TCHAR> istringstream; typedef map<string, string> ConfigMap; Modified: trunk/reactos/tools/sysreg/env_var.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/env_var.cpp?r… ============================================================================== --- trunk/reactos/tools/sysreg/env_var.cpp (original) +++ trunk/reactos/tools/sysreg/env_var.cpp Sat Oct 21 00:09:29 2006 @@ -13,9 +13,22 @@ namespace System_ { - using std::cout; +#ifdef UNICODE + + using std::wcerr; using std::endl; + +#define cerr wcerr + +#else + using std::cerr; + using std::endl; + +#endif + + + EnvironmentVariable::EnvironmentMap EnvironmentVariable::m_Map; //--------------------------------------------------------------------------------------- EnvironmentVariable::EnvironmentVariable() @@ -44,17 +57,13 @@ if (!value) { -#ifdef NDEBUG cerr << "EnvironmentVariable::getValue found no value for " << EnvName << endl; -#endif return false; } if (!_tcslen(value)) { -#ifdef NDEBUG cerr << "EnvironmentVariable::getValue found no value for " << EnvName << endl; -#endif return false; } Modified: trunk/reactos/tools/sysreg/env_var.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/env_var.h?rev… ============================================================================== --- trunk/reactos/tools/sysreg/env_var.h (original) +++ trunk/reactos/tools/sysreg/env_var.h Sat Oct 21 00:09:29 2006 @@ -28,16 +28,8 @@ class EnvironmentVariable { - typedef map<string, string> EnvironmentMap; public: -//--------------------------------------------------------------------------------------- -/// -/// EnvironmentVariable -/// -/// Description: constructor of class EnvironmentVariable - - EnvironmentVariable(); - + typedef map<string, string> EnvironmentMap; //--------------------------------------------------------------------------------------- /// /// ~EnvironmentVariable @@ -58,11 +50,20 @@ /// @param EnvValue value of the environment variable /// @return bool - bool getValue(const string & EnvName, string & EnvValue); + static bool getValue(const string & EnvName, string & EnvValue); protected: - EnvironmentMap m_Map; + +//--------------------------------------------------------------------------------------- +/// +/// EnvironmentVariable +/// +/// Description: constructor of class EnvironmentVariable + + EnvironmentVariable(); + + static EnvironmentMap m_Map; }; // end of class EnvironmentVariable Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/pipe_reader.cpp Sat Oct 21 00:09:29 2006 @@ -14,9 +14,19 @@ namespace System_ { - using std::cout; +#ifdef UNICODE + + using std::wcerr; using std::endl; + +#define cerr wcerr + +#else + using std::cerr; + using std::endl; + +#endif //--------------------------------------------------------------------------------------- PipeReader::PipeReader() : m_File(NULL) @@ -36,24 +46,18 @@ { if (m_File != NULL) { -#ifdef NDEBUG cerr << "PipeReader::openPipe> pipe already open" << endl; -#endif return false; } // m_File = _tpopen(PipeCmd.c_str(), AccessMode.c_str()); if (m_File) { -#ifdef NDEBUG cerr << "PipeReader::openPipe> successfully opened pipe" << endl; -#endif return true; } -#ifdef NDEBUG cerr << "PipeReader::openPipe> failed to open pipe " << PipeCmd << endl; -#endif return false; } @@ -63,9 +67,7 @@ { if (!m_File) { -#ifdef NDEBUG cerr << "PipeReader::closePipe> pipe is not open" << endl; -#endif return false; } @@ -73,9 +75,7 @@ if (res == UINT_MAX) { -#ifdef NDEBUG cerr << "Error: _pclose failed " <<endl; -#endif return false; } @@ -105,16 +105,9 @@ TCHAR * res = _fgetts(buf, size, m_File); if (!res) { -#ifdef NDEBUG cerr << "Error: PipeReader::readPipe failed" << endl; -#endif return 0; } - -#ifdef NDEBUG - cerr << "PipeReader::readPipe> res: " << Buffer << endl; -#endif - return _tcslen(buf); } Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Sat Oct 21 00:09:29 2006 @@ -16,9 +16,20 @@ namespace Sysreg_ { - using std::cout; +#ifdef UNICODE + + using std::wcerr; using std::endl; + +#define cerr wcerr + +#else + using std::cerr; + using std::endl; + +#endif + using System_::PipeReader; @@ -72,7 +83,8 @@ } else { - _tprintf(_T("Error: unknown debug port %s Currently only file|pipe is supported\n"), debug_port); + cerr <<"Error: unknown debug port " << debug_port <<endl + <<" Currently only file|pipe is supported" <<endl; return false; } @@ -90,7 +102,7 @@ /// TBD the information needs to be written into an provided log object /// which writes the info into HTML/log / sends etc .... - _tprintf(debug_data.c_str ()); + cerr << debug_data << endl; return true; } @@ -102,7 +114,7 @@ if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) { - _tprintf(_T("Error: failed to open pipe with cmd: %s\n"), boot_cmd.c_str ()); + cerr << "Error: failed to open pipe with cmd: " << boot_cmd <<endl; return false; } string Buffer; @@ -130,13 +142,13 @@ if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) { - _tprintf(_T("Error: failed to open pipe with cmd: %s\n"), boot_cmd.c_str ()); + cerr << "Error: failed to open pipe with cmd: " << boot_cmd << endl; return false; } FILE * file = _tfopen(debug_log.c_str (), _T("rt")); if (!file) { - _tprintf(_T("Error: failed to open debug log %s\n", debug_log.c_str ())); + cerr << "Error: failed to open debug log " << debug_log << endl; pipe_reader.closePipe (); return false; } @@ -156,6 +168,7 @@ }while(!pipe_reader.isEof ()); pipe_reader.closePipe (); + return true; } } // end of namespace Sysreg_ Modified: trunk/reactos/tools/sysreg/sym_file.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sym_file.cpp?… ============================================================================== --- trunk/reactos/tools/sysreg/sym_file.cpp (original) +++ trunk/reactos/tools/sysreg/sym_file.cpp Sat Oct 21 00:09:29 2006 @@ -25,9 +25,22 @@ namespace System_ { - using std::cout; + +#ifdef UNICODE + + using std::wcerr; using std::endl; + +#define cerr wcerr + +#else + using std::cerr; + using std::endl; + +#endif + + using std::vector; string SymbolFile::VAR_ROS_OUTPUT = _T("ROS_OUTPUT"); @@ -52,13 +65,12 @@ bool SymbolFile::initialize(ConfigParser & conf_parser, const System_::string &Path) { vector<string> vect; - EnvironmentVariable envvar; string current_dir; if (Path == _T("")) { current_dir = _T("output-i386"); - envvar.getValue(SymbolFile::VAR_ROS_OUTPUT, current_dir); + EnvironmentVariable::getValue(SymbolFile::VAR_ROS_OUTPUT, current_dir); } else { @@ -101,6 +113,8 @@ string path = current_dir; path.insert (path.length () -1, _T("\\")); path.insert (path.length () -1, filename); + + cerr << "Module Name " << modulename << endl << "File Name " << filename << endl; m_Map.insert(std::make_pair<string, string>(modulename, path)); @@ -168,7 +182,7 @@ if (!pipe_reader.openPipe (pipe_cmd)) { - _tprintf(_T("SymbolFile::resolveAddress> failed to open pipe %s"), pipe_cmd); + cerr << "SymbolFile::resolveAddress> failed to open pipe" <<pipe_cmd <<endl; return false; } @@ -189,7 +203,7 @@ if (it == m_Map.end ()) { - _tprintf(_T("SymbolFile::resolveAddress> no symbol file found for module %s"), ModuleName.c_str()); + cerr << "SymbolFile::resolveAddress> no symbol file found for module " << ModuleName << endl; return false; } Modified: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (original) +++ trunk/reactos/tools/sysreg/sysreg.cpp Sat Oct 21 00:09:29 2006 @@ -11,12 +11,24 @@ #include "sysreg.h" +#ifdef UNICODE + + using std::wcerr; + using std::endl; + using std::wcout; + +#define cerr wcerr +#define cout wcout + +#else + + using std::cerr; + using std::endl; + +#endif + typedef std::basic_string<TCHAR> string; - -using std::cout; -using std::endl; -using std::cerr; using System_::EnvironmentVariable; @@ -63,7 +75,7 @@ RegressionTest * regtest = comp_factory.createComponent (argv[2]); if (!regtest) { - _tprintf(_T("Error: the requested regression test does not exist")); + cerr << "Error: the requested regression test does not exist" << endl; return -1; } @@ -75,11 +87,11 @@ if (regtest->execute (config)) { - _tprintf(_T("The regression test %s completed successfully\n"), regtest->getName ().c_str ()); + cout << "The regression test " << regtest->getName () << " completed successfully" << endl; } else { - _tprintf(_T("The regression test %s failed\n"), regtest->getName ().c_str ()); + cout << "The regression test " << regtest->getName () << "failed" << endl; } return 0;

1 0

[janderwald] 24585: - fix compilation - implement scanning of symbol directories
by janderwald＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: janderwald Date: Fri Oct 20 23:40:33 2006 New Revision: 24585 URL: http://svn.reactos.org/svn/reactos?rev=24585&view=rev Log: - fix compilation - implement scanning of symbol directories Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/sym_file.cpp trunk/reactos/tools/sysreg/sym_file.h trunk/reactos/tools/sysreg/sysreg.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Fri Oct 20 23:40:33 2006 @@ -117,7 +117,7 @@ { break; } - if (hasTimeout(&ts, 60000) + //if (hasTimeout(&ts, 60000) } pipe_reader.closePipe (); Modified: trunk/reactos/tools/sysreg/sym_file.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sym_file.cpp?… ============================================================================== --- trunk/reactos/tools/sysreg/sym_file.cpp (original) +++ trunk/reactos/tools/sysreg/sym_file.cpp Fri Oct 20 23:40:33 2006 @@ -12,10 +12,13 @@ #include "sym_file.h" #include "env_var.h" #include "pipe_reader.h" +#include "conf_parser.h" #include <iostream> +#include <vector> #include <stdio.h> #include <stdlib.h> +#define _FINDDATA_T_DEFINED #include <io.h> #include <time.h> @@ -25,8 +28,14 @@ using std::cout; using std::endl; using std::cerr; + using std::vector; string SymbolFile::VAR_ROS_OUTPUT = _T("ROS_OUTPUT"); + string SymbolFile::ROS_ADDR2LINE = _T("ROS_ADDR2LINE"); + string SymbolFile::m_SymbolPath= _T(""); + string SymbolFile::m_SymResolver= _T(""); + SymbolFile::SymbolMap SymbolFile::m_Map; + //--------------------------------------------------------------------------------------- SymbolFile::SymbolFile() { @@ -40,19 +49,35 @@ } //--------------------------------------------------------------------------------------- - bool SymbolFile::initialize(const System_::string &Path) - { - char szBuffer[260]; -// vector<string> vect; + bool SymbolFile::initialize(ConfigParser & conf_parser, const System_::string &Path) + { + vector<string> vect; EnvironmentVariable envvar; - - string val = _T("output-i386"); - - envvar.getValue(SymbolFile::VAR_ROS_OUTPUT, val); - - struct _finddata_t c_file; - strcpy(szBuffer, "D:\\reactos\\output-i386\\*"); - intptr_t hFile = _findfirst(szBuffer, &c_file); + string current_dir; + + if (Path == _T("")) + { + current_dir = _T("output-i386"); + envvar.getValue(SymbolFile::VAR_ROS_OUTPUT, current_dir); + } + else + { + current_dir = Path; + } + + m_SymbolPath = current_dir; + + if (!conf_parser.getStringValue (ROS_ADDR2LINE, m_SymResolver)) + { + cerr << "Warning: ROS_ADDR2LINE is not set in configuration file -> symbol lookup will fail" <<endl; + return false; + } + + string val = current_dir; + val.insert (val.length()-1, _T("\\*")); + + struct _tfinddata64i32_t c_file; + intptr_t hFile = _tfindfirst64i32(val.c_str(), &c_file); if (hFile == -1L) { @@ -62,49 +87,78 @@ do { - if (strstr(c_file.name, ".nostrip.")) + + do { - cerr << c_file.name << endl; + TCHAR * pos; + if ((pos = _tcsstr(c_file.name, _T(".nostrip.")))) + { + size_t len = _tcslen(pos); + string modulename = c_file.name; + string filename = modulename; + modulename.erase(modulename.length() - len, len); + + string path = current_dir; + path.insert (path.length () -1, _T("\\")); + path.insert (path.length () -1, filename); + + m_Map.insert(std::make_pair<string, string>(modulename, path)); + + } + if (c_file.attrib & _A_SUBDIR) + { + if (c_file.name[0] != _T('.')) + { + string path = current_dir; + path.insert (path.length ()-1, _T("\\")); + path.insert (path.length ()-1, c_file.name); + vect.push_back (path); + } + } + + }while(_tfindnext(hFile, &c_file) == 0); + + _findclose(hFile); + hFile = -1L; + + while(!vect.empty ()) + { + current_dir = vect.front (); + vect.erase (vect.begin()); + val = current_dir; + val.insert (val.length() -1, _T("\\*")); + hFile = _tfindfirst64i32(val.c_str(), &c_file); + if (hFile != -1L) + { + break; + } } - }while(_findnext(hFile, &c_file) == 0); - - - - - return false; + if (hFile == -1L) + { + break; + } + + }while(1); + + + return !m_Map.empty(); } //--------------------------------------------------------------------------------------- bool SymbolFile::resolveAddress(const string &module_name, const string &module_address, string &Buffer) { SymbolMap::const_iterator it = m_Map.find (module_name); -/* - if (it == m_Map.end ()) - { -#ifdef NDEBUG - cerr << "SymbolFile::resolveAddress> no symbol file found for module " << module_name << endl; -#endif - return false; - } -*/ - /// - /// fetch environment path - /// - EnvironmentVariable envvar; -#if 1 - string pipe_cmd = _T("");//D:\\reactos\\output-i386"); -#else - string path = _T("output-i386"); - envvar.getValue(SymbolFile::VAR_ROS_OUTPUT, path); -#endif - pipe_cmd += _T("addr2line.exe "); //FIXXME file extension + + if (it == m_Map.end () || m_SymResolver == _T("")) + { + cerr << "SymbolFile::resolveAddress> no symbol file or ROS_ADDR2LINE not set" << endl; + return false; + } + + string pipe_cmd = m_SymResolver; pipe_cmd += _T("--exe="); -#if 1 - pipe_cmd += _T("D:\\reactos\\output-i386\\dll\\win32\\kernel32\\kernel32.nostrip.dll"); -#else - path += it->second; -#endif + pipe_cmd += it->second; pipe_cmd += _T(" "); pipe_cmd += module_address; @@ -114,9 +168,7 @@ if (!pipe_reader.openPipe (pipe_cmd)) { -#ifdef NDEBUG _tprintf(_T("SymbolFile::resolveAddress> failed to open pipe %s"), pipe_cmd); -#endif return false; } @@ -125,20 +177,24 @@ Buffer.reserve (500); } - return pipe_reader.readPipe (Buffer); + bool ret = pipe_reader.readPipe (Buffer); + pipe_reader.closePipe (); + return ret; } //--------------------------------------------------------------------------------------- bool SymbolFile::getSymbolFilePath(const System_::string &ModuleName, System_::string &FilePath) { - cerr << "SymbolFile::getSymbolFilePath is not yet implemented" <<endl; - return false; - - } - - - - - + SymbolMap::const_iterator it = m_Map.find (ModuleName); + + if (it == m_Map.end ()) + { + _tprintf(_T("SymbolFile::resolveAddress> no symbol file found for module %s"), ModuleName.c_str()); + return false; + } + + FilePath = it->second; + return true; + } } // end of namespace System_ Modified: trunk/reactos/tools/sysreg/sym_file.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sym_file.h?re… ============================================================================== --- trunk/reactos/tools/sysreg/sym_file.h (original) +++ trunk/reactos/tools/sysreg/sym_file.h Fri Oct 20 23:40:33 2006 @@ -11,6 +11,8 @@ * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) */ +#include "conf_parser.h" + #include <string> #include <tchar.h> #include <map> @@ -19,6 +21,7 @@ { typedef std::basic_string<TCHAR> string; + using Sysreg_::ConfigParser; //--------------------------------------------------------------------------------------- /// @@ -33,17 +36,10 @@ class SymbolFile { - typedef std::map<string, string> SymbolMap; public: static string VAR_ROS_OUTPUT; -//--------------------------------------------------------------------------------------- -/// -/// SymbolFile -/// -/// Description: constructor of class SymbolFile - - SymbolFile(); - + static string ROS_ADDR2LINE; + typedef std::map<string, string> SymbolMap; //--------------------------------------------------------------------------------------- /// /// ~SymbolFile @@ -70,7 +66,7 @@ /// @param Path path to ROS_OUTPUT containing symbol files /// @return bool - bool initialize(const string & Path = _T("output-i386")); + static bool initialize(ConfigParser & conf_parser, const string & Path); //--------------------------------------------------------------------------------------- /// @@ -85,7 +81,7 @@ /// @param buffer receives information about the resolved location /// @return bool - bool resolveAddress(const string & module_name, const string & module_address, string & Buffer); + static bool resolveAddress(const string & module_name, const string & module_address, string & Buffer); //--------------------------------------------------------------------------------------- /// @@ -97,11 +93,21 @@ /// @param ModuleName name of the module to lookup /// @param FilePath buffer receiving the address of symbol file - bool getSymbolFilePath(const string & ModuleName, string & FilePath); + static bool getSymbolFilePath(const string & ModuleName, string & FilePath); protected: - SymbolMap m_Map; +//--------------------------------------------------------------------------------------- +/// +/// SymbolFile +/// +/// Description: constructor of class SymbolFile + + SymbolFile(); + + static SymbolMap m_Map; + static string m_SymbolPath; + static string m_SymResolver; }; } // end of namespace System_ Modified: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (original) +++ trunk/reactos/tools/sysreg/sysreg.cpp Fri Oct 20 23:40:33 2006 @@ -28,8 +28,6 @@ using Sysreg_::RegressionTest; using Sysreg_::RosBootTest; - -//test include using System_::SymbolFile; typedef ComponentFactoryTemplate<RegressionTest, string> ComponentFactory; @@ -69,6 +67,12 @@ return -1; } + string envvar; + string ros = _T("ROS_OUTPUT"); + config.getStringValue (ros, envvar); + + SymbolFile::initialize (config, envvar); + if (regtest->execute (config)) { _tprintf(_T("The regression test %s completed successfully\n"), regtest->getName ().c_str ());

1 0

[janderwald] 24584: * beginning of a system regression tools
by janderwald＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: janderwald Date: Fri Oct 20 19:49:46 2006 New Revision: 24584 URL: http://svn.reactos.org/svn/reactos?rev=24584&view=rev Log: * beginning of a system regression tools Added: trunk/reactos/tools/sysreg/ (with props) trunk/reactos/tools/sysreg/comp_factory.h (with props) trunk/reactos/tools/sysreg/conf_parser.cpp (with props) trunk/reactos/tools/sysreg/conf_parser.h (with props) trunk/reactos/tools/sysreg/env_var.cpp (with props) trunk/reactos/tools/sysreg/env_var.h (with props) trunk/reactos/tools/sysreg/pipe_reader.cpp (with props) trunk/reactos/tools/sysreg/pipe_reader.h (with props) trunk/reactos/tools/sysreg/reg_test.h (with props) trunk/reactos/tools/sysreg/rosboot_test.cpp (with props) trunk/reactos/tools/sysreg/rosboot_test.h (with props) trunk/reactos/tools/sysreg/sym_file.cpp (with props) trunk/reactos/tools/sysreg/sym_file.h (with props) trunk/reactos/tools/sysreg/sysreg.cpp (with props) trunk/reactos/tools/sysreg/sysreg.h (with props) Propchange: trunk/reactos/tools/sysreg/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Oct 20 19:49:46 2006 @@ -1,0 +1,8 @@ +*.coff +*.exe +*.d +*.a +*.o +*.sym +*.map +*.tmp Added: trunk/reactos/tools/sysreg/comp_factory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/comp_factory.… ============================================================================== --- trunk/reactos/tools/sysreg/comp_factory.h (added) +++ trunk/reactos/tools/sysreg/comp_factory.h Fri Oct 20 19:49:46 2006 @@ -1,0 +1,204 @@ +#ifndef COMPONENT_FACTORY_TEMPLATE_H_ //comp_factory.h +#define COMPONENT_FACTORY_TEMPLATE_H_ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/comp_factory.h + * PURPOSE: component management + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + + +#include <map> +#include <vector> + +namespace System_ +{ + using std::map; + using std::vector; + using std::endl; +//---------------------------------------------------------- +/// +/// ComponentFactoryTemplate +/// +/// This class servess as a factory class for components. In general +/// can be used for any possible class which has base class +/// and a derrived class +/// + +//-------------------------------------------------------------------- +/// +/// create +/// +/// Description: this template function creates a function which returns +/// objects of type ElementType but in real are objects of DerrivedType +/// + + template<class ElementType, class DerrivedType> + static ElementType * create () + { + return new DerrivedType(); + } + +//-------------------------------------------------------------------- + + template<typename ElementType, typename ElementId> + class ComponentFactoryTemplate + { + typedef ElementType * (*creation_function)(); + typedef map<ElementId, creation_function> ElementMap; + typedef vector<ElementId> ElementIdVector; + public: + +//-------------------------------------------------------------------- +/// +/// ComponentFactoryTemplate +/// +/// Description: default destructor of class ComponentFactoryTemplate +/// + + ComponentFactoryTemplate() + { + + } + +//-------------------------------------------------------------------- +/// +/// ~ComponentFactoryTemplate +/// +/// Description: default destructor of class ComponentFactoryTemplate +/// + + virtual ~ComponentFactoryTemplate() + { + + } +//-------------------------------------------------------------------- +/// +/// listComponent +/// +/// Description: lists all registererd components ids + + void listComponentIds() + { + for(unsigned i = 0; i < ids_.size (); i++) + cout<<ids_[i]<<endl; + } +//-------------------------------------------------------------------- +/// +/// isComponentRegistered +/// +/// Description: this function just checks if a component with a given +/// id has been registered or not. If it is it returns true else false +/// +/// @return bool +/// @param element id of the component + + bool isComponentRegistered(ElementId const & id) + { + typename ElementMap::const_iterator iter = elements_.find(id); + if(iter != elements_.end()) + return true; + else + return false; + } + +//-------------------------------------------------------------------- +/// +/// getNumOfComponents +/// +/// Description: returns how many components have been registered + + const unsigned getNumOfComponents() + { + return ids_.size (); + } + +//-------------------------------------------------------------------- +/// +/// registerComponent +/// +/// Description: this function is template function in a class template. +/// The purpose is that at compiletime for each of the derriving classes of +/// ElementType a registerComponent function is generated and then all classes +/// of that type are added at runtime to factory. +/// returns zero on success, nonzero on failure +/// +/// @return bool +/// @param id the element id of the content type + template<typename ContentType> + bool registerComponent(ElementId const & id) + { + typename ElementMap::const_iterator iter = elements_.find(id); + if(iter != elements_.end()) + return false; + ids_.insert(ids_.begin(),id); + elements_.insert(std::make_pair<ElementId, creation_function >(id, &create<ElementType, ContentType>)); + return true; + + } + + //-------------------------------------------------------------------- +/// +/// deregisterComponent +/// +/// Description: unregisters a given component indentified by param id +/// After unregistration, the specified component can no longer be +/// created +/// @return bool +/// @param id the element id of the ContentType + + template<typename ContentType> + const bool deregisterComponent(ElementId const & id) + { + typename ElementMap::const_iterator iterator = elements_.find(id); + if(iterator != elements_.end()) + { + elements_.erase(iterator); + return true; + } + else + return false; + } + + +//-------------------------------------------------------------------- +/// +/// createComponent +/// +/// Description: creates a component according to the specified information +/// returns the component encapsulated in an std::auto_ptr +/// @param id specifies the key id, to look for +/// @return std::auto_ptr<ElementType> + ElementType * createComponent(ElementId const & id) const + { + typename ElementMap::const_iterator first_it = elements_.find(id); + if(first_it != elements_.end()) + return (first_it->second)(); + else + return 0; + } + +//-------------------------------------------------------------------- +/// +/// deleteComponent +/// +/// Description: deletes a component +/// @param element the element to be deleted + + void deleteComponent(ElementType * element) + { + delete element; + } + protected: + ElementMap elements_; + ElementIdVector ids_; + }; + + +} //end of namespace Sysreg_ + +#endif + Propchange: trunk/reactos/tools/sysreg/comp_factory.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/comp_factory.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/conf_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.c… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.cpp (added) +++ trunk/reactos/tools/sysreg/conf_parser.cpp Fri Oct 20 19:49:46 2006 @@ -1,0 +1,98 @@ +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: configuration parser + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + +#include "conf_parser.h" +#include <iostream> +#include <sstream> +#include <fstream> + +namespace Sysreg_ +{ + using std::cout; + using std::cerr; + using std::endl; + using std::ifstream; +//--------------------------------------------------------------------------------------- + ConfigParser::ConfigParser() + { + + } + +//--------------------------------------------------------------------------------------- + ConfigParser::~ConfigParser() + { + m_Map.clear (); + } + +//--------------------------------------------------------------------------------------- + bool ConfigParser::parseFile(TCHAR * FileName) + { + FILE * file; +#ifdef UNICODE + file = _tfopen(FileName, _T("rt,ccs=UNICODE")); +#else + file = _tfopen(FileName, _T("rt")); +#endif + if (!file) + { + cerr << " Error: ConfigParser::parseFile failed to open configuration file " <<endl; + return false; + } + + bool ret = false; + while (!feof(file)) + { + TCHAR buffer[500]; + TCHAR * buf; + + buf = _fgetts(buffer, sizeof(buffer) / sizeof(TCHAR), file); + if (buf) + { + if (buffer[0] != ';') + { + string s_buffer = string(buffer); + string::size_type ws_pos = s_buffer.find_first_of (_T("=")); + + if (ws_pos != string::npos && ws_pos > 0 && ws_pos < s_buffer.size()) + { + string name = s_buffer.substr (0, ws_pos); + string value = s_buffer.substr (ws_pos + 1); + if (value[value.length () -1] == 0xA) + { + // remove newline char + value[value.length ()-1] = _T('\0'); + } + m_Map[name] = value; + ret = true; + } + } + } + } + return ret; + + } + +//--------------------------------------------------------------------------------------- + bool ConfigParser::getStringValue(string &ConfVariable, string &ConfValue) + { + ConfigMap::iterator it = m_Map.find (ConfVariable); + if (it == m_Map.end ()) + { +#ifdef NDEBUG + cerr << "ConfigParser::getValue failed to find " << ConfVariable << endl; +#endif + return false; + } + + ConfValue = it->second; + return true; + } + + +} // end of namespace Sysreg_ Propchange: trunk/reactos/tools/sysreg/conf_parser.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/conf_parser.cpp ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/conf_parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.h… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.h (added) +++ trunk/reactos/tools/sysreg/conf_parser.h Fri Oct 20 19:49:46 2006 @@ -1,0 +1,92 @@ +#ifndef CONF_PARSER_H__ +#define CONF_PARSER_H__ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: configuration parser + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + + +#include <string> +#include <map> +#include <tchar.h> + +namespace Sysreg_ +{ + using std::map; +//--------------------------------------------------------------------------------------- +/// +/// class ConfigParser +/// +/// Description: this class reads configuration entries from a configuration file +/// Each entry must have the form of VALUE=XXX. The entries are stored +/// in a map which can be queried after parsing the configuration file +/// +/// Note: lines beginning with an ; are ignored +/// +/// Usage: First, call parseFile with param to file. Finally, call getValue with the +/// appropiate type + + class ConfigParser + { + public: + typedef std::basic_string<TCHAR> string; + typedef std::basic_istringstream<TCHAR> istringstream; + typedef map<string, string> ConfigMap; +//--------------------------------------------------------------------------------------- +/// +/// ConfigParser +/// +/// Description: constructor of class ConfigParser + + ConfigParser(); + +//--------------------------------------------------------------------------------------- +/// +/// ~ConfigParser +/// +/// Description: destructor of class ConfigParser + + virtual ~ConfigParser(); + +//--------------------------------------------------------------------------------------- +/// +/// parseFile +/// +/// Description: this function takes as param a path to file. it attempts to parse this specific +/// file with the given syntax. On success it returns true. +/// +/// Note: Everytime parseFile is called, the previous stored values are cleared +/// +/// @param FileName path to configuration file +/// @return bool + + bool parseFile(TCHAR * FileName); + +//-------------------------------------------------------------------------------------- +/// +/// getStringValue +/// +/// Description: attempts to read a config variable from the configuration file +/// If the variable name is not found, it returns false and the param +/// ConfValue remains untouched. On success it returns the true. +/// +/// @param ConfVariable name of the configuration variable to retrieve +/// @param ConfValue type of value to retrieve + + bool getStringValue(string & ConfVariable, string & ConfValue); + + protected: + ConfigMap m_Map; + + }; // end of class ConfigParser + + +} // end of namspace Sysreg_ + + +#endif /* end of CONF_PARSER_H__ */ Propchange: trunk/reactos/tools/sysreg/conf_parser.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/conf_parser.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/env_var.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/env_var.cpp?r… ============================================================================== --- trunk/reactos/tools/sysreg/env_var.cpp (added) +++ trunk/reactos/tools/sysreg/env_var.cpp Fri Oct 20 19:49:46 2006 @@ -1,0 +1,67 @@ +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: environment variable lookup + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + + +#include "env_var.h" +#include <iostream> + +namespace System_ +{ + using std::cout; + using std::endl; + using std::cerr; + +//--------------------------------------------------------------------------------------- + EnvironmentVariable::EnvironmentVariable() + { + + } + +//--------------------------------------------------------------------------------------- + EnvironmentVariable::~EnvironmentVariable() + { + m_Map.clear (); + } + +//--------------------------------------------------------------------------------------- + + bool EnvironmentVariable::getValue(const System_::string &EnvName, System_::string &EnvValue) + { + EnvironmentMap::const_iterator it = m_Map.find (EnvName); + if (it != m_Map.end()) + { + EnvValue = it->second; + return true; + } + + TCHAR * value = _tgetenv(EnvName.c_str ()); + + if (!value) + { +#ifdef NDEBUG + cerr << "EnvironmentVariable::getValue found no value for " << EnvName << endl; +#endif + return false; + } + + if (!_tcslen(value)) + { +#ifdef NDEBUG + cerr << "EnvironmentVariable::getValue found no value for " << EnvName << endl; +#endif + return false; + } + + EnvValue = value; + m_Map[EnvName] = EnvValue; + return true; + } + + +} // end of namespace System_ Propchange: trunk/reactos/tools/sysreg/env_var.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/env_var.cpp ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/env_var.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/env_var.h?rev… ============================================================================== --- trunk/reactos/tools/sysreg/env_var.h (added) +++ trunk/reactos/tools/sysreg/env_var.h Fri Oct 20 19:49:46 2006 @@ -1,0 +1,71 @@ +#ifndef ENV_VAR_H__ +#define ENV_VAR_H__ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: environment variable lookup + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + +#include <string> +#include <map> +#include <tchar.h> + +namespace System_ +{ + + using std::map; + typedef std::basic_string<TCHAR> string; +//--------------------------------------------------------------------------------------- +/// +/// class EnvironmentVariable +/// +/// Description: this class performs looking up environment variable from the system +/// The result is also stored in its internal map to cache results + + class EnvironmentVariable + { + typedef map<string, string> EnvironmentMap; + public: +//--------------------------------------------------------------------------------------- +/// +/// EnvironmentVariable +/// +/// Description: constructor of class EnvironmentVariable + + EnvironmentVariable(); + +//--------------------------------------------------------------------------------------- +/// +/// ~EnvironmentVariable +/// +/// Description: destructor of class EnvironmentVariable + + virtual ~EnvironmentVariable(); + +//--------------------------------------------------------------------------------------- +/// +/// getValue +/// +/// Description: this function returns the value of an associated environment variable. if +/// the variable is set it returns true and the value in the parameter EnvValue. On error +/// it returns false and the param EnvValue remains untouched +/// +/// @param EnvName name of environment variable to retrieve +/// @param EnvValue value of the environment variable +/// @return bool + + bool getValue(const string & EnvName, string & EnvValue); + + + protected: + EnvironmentMap m_Map; + + }; // end of class EnvironmentVariable + +} // end of namespace System_ + +#endif /* end of ENV_VAR_H__ */ Propchange: trunk/reactos/tools/sysreg/env_var.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/env_var.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.cpp (added) +++ trunk/reactos/tools/sysreg/pipe_reader.cpp Fri Oct 20 19:49:46 2006 @@ -1,0 +1,132 @@ +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: pipe reader support + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + +#include "pipe_reader.h" + +#include <iostream> +#include <assert.h> + +namespace System_ +{ + using std::cout; + using std::endl; + using std::cerr; + +//--------------------------------------------------------------------------------------- + PipeReader::PipeReader() : m_File(NULL) + { + + } + +//--------------------------------------------------------------------------------------- + PipeReader::~PipeReader() + { + + } + +//--------------------------------------------------------------------------------------- + + bool PipeReader::openPipe(const System_::string &PipeCmd, System_::string AccessMode) + { + if (m_File != NULL) + { +#ifdef NDEBUG + cerr << "PipeReader::openPipe> pipe already open" << endl; +#endif + return false; + } + // + m_File = _tpopen(PipeCmd.c_str(), AccessMode.c_str()); + if (m_File) + { +#ifdef NDEBUG + cerr << "PipeReader::openPipe> successfully opened pipe" << endl; +#endif + return true; + } + +#ifdef NDEBUG + cerr << "PipeReader::openPipe> failed to open pipe " << PipeCmd << endl; +#endif + return false; + } + +//--------------------------------------------------------------------------------------- + + bool PipeReader::closePipe() + { + if (!m_File) + { +#ifdef NDEBUG + cerr << "PipeReader::closePipe> pipe is not open" << endl; +#endif + return false; + } + + int res = _pclose(m_File); + + if (res == UINT_MAX) + { +#ifdef NDEBUG + cerr << "Error: _pclose failed " <<endl; +#endif + return false; + } + + m_File = NULL; + return true; + } + +//--------------------------------------------------------------------------------------- + + bool PipeReader::isEof() const + { + return feof(m_File); + } + +//--------------------------------------------------------------------------------------- + + string::size_type PipeReader::readPipe(System_::string &Buffer) + { + + TCHAR * buf = (TCHAR *)Buffer.c_str(); + System_::string::size_type size = Buffer.capacity(); + +//#ifdef NDEBUG + memset(buf, 0x0, sizeof(TCHAR) * size); +//#endif + + TCHAR * res = _fgetts(buf, size, m_File); + if (!res) + { +#ifdef NDEBUG + cerr << "Error: PipeReader::readPipe failed" << endl; +#endif + return 0; + } + +#ifdef NDEBUG + cerr << "PipeReader::readPipe> res: " << Buffer << endl; +#endif + + return _tcslen(buf); + } + +//--------------------------------------------------------------------------------------- + + bool PipeReader::writePipe(const string & Buffer) + { + //TODO + // implement me + cerr << "PipeReader::writePipe is not yet implemented" << endl; + + return false; + } + +} // end of namespace System_ Propchange: trunk/reactos/tools/sysreg/pipe_reader.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/pipe_reader.cpp ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/pipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.h… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.h (added) +++ trunk/reactos/tools/sysreg/pipe_reader.h Fri Oct 20 19:49:46 2006 @@ -1,0 +1,117 @@ +#ifndef PIPE_READER_H__ +#define PIPE_READER_H__ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: pipe reader support + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + + + +#include <string> +#include <tchar.h> +#include <stdio.h> +#include <stdlib.h> + +namespace System_ +{ + typedef std::basic_string<TCHAR> string; +//--------------------------------------------------------------------------------------- +/// +/// class PipeReader +/// +/// Description: this class implements a pipe reader. It uses _popen to perform opening of +/// pipe / _pclose + + class PipeReader + { + public: + +//--------------------------------------------------------------------------------------- +/// +/// PipeReader +/// +/// Description: constructor of class PipeReader + + PipeReader(); + +//--------------------------------------------------------------------------------------- +/// +/// virtual ~PipeReader +/// +/// Description: destructor of class PipeReader + + virtual ~PipeReader(); + +//--------------------------------------------------------------------------------------- +/// +/// openPipe +/// +/// Description: this function attempts to open a pipe. If an pipe is already open or +/// it fails to open a pipe, the function returns false +/// +/// @param PipeCmd command of the pipe to open +/// @param AccessMode on how to open the pipe +/// accepted modes are t ... text mode - not compatible with b +/// b ... binary mode - not compatible with t +/// r ... allows reading from the pipe +/// w ... allows writing to the pipe +/// @return bool + + bool openPipe(const string & PipeCmd, string AccessMode = _T("rt")); + +//--------------------------------------------------------------------------------------- +/// +/// closePipe +/// +/// Description: closes a pipe. Returns true on success +/// +/// @return bool + + bool closePipe(); + +//--------------------------------------------------------------------------------------- +/// +/// readPipe +/// +/// Description: attempts to read from the pipe. Returns true on success. If it returns +/// false, call PipeReader::isEoF() to determine if the pipe should be closed +/// +/// @param Buffer to be written to +/// @return string::size_type + + string::size_type readPipe(string & Buffer); + +//--------------------------------------------------------------------------------------- +/// +/// writePipe +/// +/// Description: attempts to write to the pipe. Returns true on success. +/// +/// @param Buffer containing information which is written to the pipe + + bool writePipe(const string & Buffer); + +//--------------------------------------------------------------------------------------- +/// +/// isEof +/// +/// Description: returns true if the pipe has reached end of file. The caller should call +/// closePipe if this function returns true + + bool isEof() const; + +protected: + FILE * m_File; + + }; // end of class PipeReader + +} // end of namespace System_ + + + +#endif /* end of PIPE_READER_H__ */ Propchange: trunk/reactos/tools/sysreg/pipe_reader.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/pipe_reader.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/reg_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/reg_test.h?re… ============================================================================== --- trunk/reactos/tools/sysreg/reg_test.h (added) +++ trunk/reactos/tools/sysreg/reg_test.h Fri Oct 20 19:49:46 2006 @@ -1,0 +1,87 @@ +#ifndef REG_TEST_H__ +#define REG_TEST_H__ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: regression test abstract class + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + +#include "conf_parser.h" + +#include <string> +#include <tchar.h> + +namespace Sysreg_ +{ + using Sysreg_::ConfigParser; + + typedef std::basic_string<TCHAR> string; +//------------------------------------------------------------------- +/// +/// class RegressionTest +/// +/// Description: The class RegressionTest is an abstract base class. Every +/// regression test class derives from this class. + + + class RegressionTest + { + public: + +//--------------------------------------------------------------------------------------- +/// +/// RegressionTest +/// +/// Description: constructor of class RegressionTest +/// +/// @param RegName name of derriving subclass + + RegressionTest(const string RegName) : m_Name(RegName) + {} + +//--------------------------------------------------------------------------------------- +/// +/// ~RegressionTest +/// +/// Description: destructor of class RegressionTest + + virtual ~RegressionTest() + {} + +//--------------------------------------------------------------------------------------- +/// +/// getName +/// +/// Description: returns the value of the member m_Name + + const string & getName() const + { return m_Name; } + +//--------------------------------------------------------------------------------------- +/// +/// execute +/// +/// Description: the execute function passes an System_::ConfigParser object to the +/// derriving RegresssionTest class. The class can then read required options from the +/// configuration file. The RegressionTest shall then perform its specific regression test. +/// @see System_::PipeReader +/// @see System_::SymbolFile +/// +/// Note : if an error happens or the option cannot be found, this function +/// should return false. + + virtual bool execute(ConfigParser & conf_parser) = 0; + + protected: + string m_Name; + + }; // end of class RegressionTest + + +} // end of namespace Sysreg_ + +#endif Propchange: trunk/reactos/tools/sysreg/reg_test.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/reg_test.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (added) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Fri Oct 20 19:49:46 2006 @@ -1,0 +1,161 @@ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: ReactOS boot test + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + + +#include "rosboot_test.h" +#include "pipe_reader.h" + +#include <iostream> + +namespace Sysreg_ +{ + using std::cout; + using std::endl; + using std::cerr; + + using System_::PipeReader; + + string RosBootTest::VARIABLE_NAME = _T("ROSBOOT_CMD"); + string RosBootTest::CLASS_NAME = _T("rosboot"); + string RosBootTest::DEBUG_PORT = _T("ROSBOOT_DEBUG_PORT"); + string RosBootTest::DEBUG_FILE = _T("ROSBOOT_DEBUG_FILE"); +//--------------------------------------------------------------------------------------- + RosBootTest::RosBootTest() : RegressionTest(RosBootTest::CLASS_NAME) + { + + } + +//--------------------------------------------------------------------------------------- + RosBootTest::~RosBootTest() + { + + } + +//--------------------------------------------------------------------------------------- + bool RosBootTest::execute(ConfigParser &conf_parser) + { + string boot_cmd; + string debug_port; + bool ret; + + if (!conf_parser.getStringValue (RosBootTest::DEBUG_PORT, debug_port)) + { + cerr << "Error: ROSBOOT_DEBUG_TYPE is not set in configuration file" << endl; + return false; + } + if (!conf_parser.getStringValue(RosBootTest::VARIABLE_NAME, boot_cmd)) + { + cerr << "Error: ROSBOOT_CMD is not set in configuration file" << endl; + return false; + } + + if (!_tcscmp(debug_port.c_str(), _T("pipe"))) + { + ret = fetchDebugByPipe(boot_cmd); + } + else if (!_tcscmp(debug_port.c_str(), _T("file"))) + { + string debug_file; + if (!conf_parser.getStringValue (RosBootTest::DEBUG_FILE, debug_file)) + { + cerr << "Error: ROSBOOT_DEBUG_FILE is not set in configuration file" << endl; + return false; + } + ret = fetchDebugByFile(boot_cmd, debug_file); + } + else + { + _tprintf(_T("Error: unknown debug port %s Currently only file|pipe is supported\n"), debug_port); + return false; + } + + + return ret; + } +//--------------------------------------------------------------------------------------- + bool RosBootTest::checkDebugData(string debug_data) + { + /// + /// FIXME + /// + /// parse debug_data and output STOP errors, UM exception + /// as well as important stages i.e. ntoskrnl loaded + /// TBD the information needs to be written into an provided log object + /// which writes the info into HTML/log / sends etc .... + + _tprintf(debug_data.c_str ()); + return true; + + } +//--------------------------------------------------------------------------------------- + bool RosBootTest::fetchDebugByPipe(string boot_cmd) + { + struct timeval ts; + PipeReader pipe_reader; + + if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) + { + _tprintf(_T("Error: failed to open pipe with cmd: %s\n"), boot_cmd.c_str ()); + return false; + } + string Buffer; + Buffer.reserve (10000); + +// gettimeofday(&ts, NULL); + + while(!pipe_reader.isEof ()) + { + pipe_reader.readPipe (Buffer); + if (!checkDebugData(Buffer)) + { + break; + } + if (hasTimeout(&ts, 60000) + + } + pipe_reader.closePipe (); + return true; + } +//--------------------------------------------------------------------------------------- + bool RosBootTest::fetchDebugByFile(Sysreg_::string boot_cmd, Sysreg_::string debug_log) + { + PipeReader pipe_reader; + + if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) + { + _tprintf(_T("Error: failed to open pipe with cmd: %s\n"), boot_cmd.c_str ()); + return false; + } + FILE * file = _tfopen(debug_log.c_str (), _T("rt")); + if (!file) + { + _tprintf(_T("Error: failed to open debug log %s\n", debug_log.c_str ())); + pipe_reader.closePipe (); + return false; + } + + TCHAR szBuffer[500]; + + do + { + if (_fgetts(szBuffer, sizeof(szBuffer) / sizeof(TCHAR), file)) + { + string buffer = szBuffer; + if (!checkDebugData(buffer)) + { + break; + } + } + }while(!pipe_reader.isEof ()); + + pipe_reader.closePipe (); + } + +} // end of namespace Sysreg_ Propchange: trunk/reactos/tools/sysreg/rosboot_test.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/rosboot_test.cpp ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (added) +++ trunk/reactos/tools/sysreg/rosboot_test.h Fri Oct 20 19:49:46 2006 @@ -1,0 +1,116 @@ +#ifndef ROSBOOT_TEST_H__ +#define ROSBOOT_TEST_H__ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: ReactOS boot test + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + + +#include "reg_test.h" +#include <winsock2.h> + +namespace Sysreg_ +{ +//--------------------------------------------------------------------------------------- +/// +/// class RosBootTest +/// +/// Description: this class attempts to boot ReactOS in an emulator with console logging enabled. +/// It + + class RosBootTest : public RegressionTest + { + public: + static string VARIABLE_NAME; + static string CLASS_NAME; + static string DEBUG_PORT; + static string DEBUG_FILE; + +//--------------------------------------------------------------------------------------- +/// +/// RosBootTest +/// +/// Description: constructor of class RosBootTest +/// + + RosBootTest(); + +//--------------------------------------------------------------------------------------- +/// +/// ~RosBootTest +/// +/// Description: destructor of class RosBootTest +/// + + virtual ~RosBootTest(); + +//--------------------------------------------------------------------------------------- +/// +/// execute +/// +/// Description: this function performs a ReactOS boot test. It reads the variable +/// ROSBOOT_CMD and executes this specific command. This command shall contain the path +/// to an emulator (i.e. qemu) and the required arguments (-serial switch, hdd img etc) to be able +/// to read from console. If an error is detected, it attempts to resolve the faulting +/// module and address. + + virtual bool execute(ConfigParser & conf_parser); + + protected: +//--------------------------------------------------------------------------------------- +/// +/// fetchDebugByPipe +/// +/// Description: this functions debugs ReactOS by PipeReader class +/// +/// Note: if an error occurs, this function returns false +/// +/// @param BootCmd the command which is passed to PipeReader class +/// @return bool + + bool fetchDebugByPipe(string BootCmd); + +//--------------------------------------------------------------------------------------- +/// +/// fetchDebugByFile +/// +/// Description: this functions fetches debug info by reading a debug log +/// +/// Note: if an error occurs, this function returns false +/// +/// @param BootCmd the command which is passed to PipeReader class +/// @param debug_log path pointing to debug log +/// @return bool + + bool fetchDebugByFile(string BootCmd, string debug_log); + +//--------------------------------------------------------------------------------------- +/// +/// checkDebugData +/// +/// Description: this function parses the given debug data for BSOD, UM exception etc +/// If it detects an fatal error, it should return false +/// +/// Note: the received debug information should be written to an internal log object +/// to facilate post-processing of the results + + bool checkDebugData(string debug_data); + + }; // end of class RosBootTest + +//--------------------------------------------------------------------------------------- +/// +/// checkTimeOut +/// +/// Description: this function checks if the the application has already hung + + bool checkTimeOut(struct timeval * ts, unsigned max_timeout); + +} // end of namespace Sysreg_ + +#endif /* end of ROSBOOT_H__ */ Propchange: trunk/reactos/tools/sysreg/rosboot_test.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/rosboot_test.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/sym_file.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sym_file.cpp?… ============================================================================== --- trunk/reactos/tools/sysreg/sym_file.cpp (added) +++ trunk/reactos/tools/sysreg/sym_file.cpp Fri Oct 20 19:49:46 2006 @@ -1,0 +1,144 @@ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: source symbol lookup + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + + +#include "sym_file.h" +#include "env_var.h" +#include "pipe_reader.h" + +#include <iostream> +#include <stdio.h> +#include <stdlib.h> +#include <io.h> +#include <time.h> + + +namespace System_ +{ + using std::cout; + using std::endl; + using std::cerr; + + string SymbolFile::VAR_ROS_OUTPUT = _T("ROS_OUTPUT"); +//--------------------------------------------------------------------------------------- + SymbolFile::SymbolFile() + { + + } + +//--------------------------------------------------------------------------------------- + SymbolFile::~SymbolFile() + { + + } + +//--------------------------------------------------------------------------------------- + bool SymbolFile::initialize(const System_::string &Path) + { + char szBuffer[260]; +// vector<string> vect; + EnvironmentVariable envvar; + + string val = _T("output-i386"); + + envvar.getValue(SymbolFile::VAR_ROS_OUTPUT, val); + + struct _finddata_t c_file; + strcpy(szBuffer, "D:\\reactos\\output-i386\\*"); + intptr_t hFile = _findfirst(szBuffer, &c_file); + + if (hFile == -1L) + { + cerr << "SymbolFile::initialize> failed" <<endl; + return false; + } + + do + { + if (strstr(c_file.name, ".nostrip.")) + { + cerr << c_file.name << endl; + } + + }while(_findnext(hFile, &c_file) == 0); + + + + + return false; + } + +//--------------------------------------------------------------------------------------- + bool SymbolFile::resolveAddress(const string &module_name, const string &module_address, string &Buffer) + { + SymbolMap::const_iterator it = m_Map.find (module_name); +/* + if (it == m_Map.end ()) + { +#ifdef NDEBUG + cerr << "SymbolFile::resolveAddress> no symbol file found for module " << module_name << endl; +#endif + return false; + } +*/ + /// + /// fetch environment path + /// + EnvironmentVariable envvar; +#if 1 + string pipe_cmd = _T("");//D:\\reactos\\output-i386"); +#else + string path = _T("output-i386"); + envvar.getValue(SymbolFile::VAR_ROS_OUTPUT, path); +#endif + pipe_cmd += _T("addr2line.exe "); //FIXXME file extension + pipe_cmd += _T("--exe="); +#if 1 + pipe_cmd += _T("D:\\reactos\\output-i386\\dll\\win32\\kernel32\\kernel32.nostrip.dll"); +#else + path += it->second; +#endif + + pipe_cmd += _T(" "); + pipe_cmd += module_address; + + + PipeReader pipe_reader; + + if (!pipe_reader.openPipe (pipe_cmd)) + { +#ifdef NDEBUG + _tprintf(_T("SymbolFile::resolveAddress> failed to open pipe %s"), pipe_cmd); +#endif + return false; + } + + if (Buffer.capacity () < 100) + { + Buffer.reserve (500); + } + + return pipe_reader.readPipe (Buffer); + } + +//--------------------------------------------------------------------------------------- + bool SymbolFile::getSymbolFilePath(const System_::string &ModuleName, System_::string &FilePath) + { + cerr << "SymbolFile::getSymbolFilePath is not yet implemented" <<endl; + return false; + + } + + + + + + +} // end of namespace System_ Propchange: trunk/reactos/tools/sysreg/sym_file.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/sym_file.cpp ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/sym_file.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sym_file.h?re… ============================================================================== --- trunk/reactos/tools/sysreg/sym_file.h (added) +++ trunk/reactos/tools/sysreg/sym_file.h Fri Oct 20 19:49:46 2006 @@ -1,0 +1,110 @@ +#ifndef SYM_FILE_H__ +#define SYM_FILE_H__ + + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: source symbol lookup + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + +#include <string> +#include <tchar.h> +#include <map> + +namespace System_ +{ + + typedef std::basic_string<TCHAR> string; + +//--------------------------------------------------------------------------------------- +/// +/// class SymbolFile +/// +/// Description: this class performs 2 tasks: First, it locates all available module names +/// and their associated symbol files. Secondly, it performs resolving address to source addresses +/// via the function resolveAddress +/// +/// Usage: call initialize(). Then call resolveAddress(); +/// i.e. resolveAddress("comctl32.dll", 0xBLABLABLA, result); + + class SymbolFile + { + typedef std::map<string, string> SymbolMap; + public: + static string VAR_ROS_OUTPUT; +//--------------------------------------------------------------------------------------- +/// +/// SymbolFile +/// +/// Description: constructor of class SymbolFile + + SymbolFile(); + +//--------------------------------------------------------------------------------------- +/// +/// ~SymbolFile +/// +/// Description: destructor of class SymbolFile + + virtual ~SymbolFile(); + +//--------------------------------------------------------------------------------------- +/// +/// initialize +/// +/// Description: this function initialize the class. It searches the subdirs +/// of ROS_OUTPUT and adds all files with name *.nostrip.* to a map with module +/// name as the key. +/// +/// Note: if the param Path is not empty, it adds all found modules to the internal +/// map +/// +/// Note: if the path does not exist or the no symbol files were added then false is returned +/// +/// Note: if a module with same module name is already in the map, then the new module is not added +/// +/// @param Path path to ROS_OUTPUT containing symbol files +/// @return bool + + bool initialize(const string & Path = _T("output-i386")); + +//--------------------------------------------------------------------------------------- +/// +/// resolveAddress +/// +/// Description: this function attempts to resolve an address using a given symbol file +/// +/// Note: the lookup is performed with raddr2line +/// +/// @param module_name name of the module to examine +/// @param module_address address of the module to resolve +/// @param buffer receives information about the resolved location +/// @return bool + + bool resolveAddress(const string & module_name, const string & module_address, string & Buffer); + +//--------------------------------------------------------------------------------------- +/// +/// getSymbolFilePath +/// +/// Description: this function returns the associated FilePath to a given module name. If +/// the module name is not known, it returns false and the param FilePath remains untouched +/// +/// @param ModuleName name of the module to lookup +/// @param FilePath buffer receiving the address of symbol file + + bool getSymbolFilePath(const string & ModuleName, string & FilePath); + + protected: + SymbolMap m_Map; + + }; +} // end of namespace System_ + + + +#endif /* end of SYM_FILE_H__ */ Propchange: trunk/reactos/tools/sysreg/sym_file.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/sym_file.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (added) +++ trunk/reactos/tools/sysreg/sysreg.cpp Fri Oct 20 19:49:46 2006 @@ -1,0 +1,82 @@ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: app initialization + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + + +#include "sysreg.h" + + +typedef std::basic_string<TCHAR> string; + +using std::cout; +using std::endl; +using std::cerr; + + +using System_::EnvironmentVariable; +using System_::ComponentFactoryTemplate; + +using Sysreg_::ConfigParser; + +//regression test classes +using Sysreg_::RegressionTest; +using Sysreg_::RosBootTest; + + +//test include +using System_::SymbolFile; + +typedef ComponentFactoryTemplate<RegressionTest, string> ComponentFactory; + +static const TCHAR USAGE[] = +_T("sysreg.exe <conf_file> <testname>\n\nconf_file ... path to a configuration file\ntest_name ... name of test to execute\n"); + + + + +int _tmain(int argc, TCHAR * argv[]) +{ + ConfigParser config; + ComponentFactory comp_factory; + + if (argc != 3) + { + cerr << USAGE << endl; + return -1; + } +//--------------------------------------------------------------------------------------- + /// regression tests should be registered here + comp_factory.registerComponent<RosBootTest>(RosBootTest::CLASS_NAME); + +//--------------------------------------------------------------------------------------- + + if (!config.parseFile (argv[1])) + { + cerr << USAGE << endl; + return -1; + } + + RegressionTest * regtest = comp_factory.createComponent (argv[2]); + if (!regtest) + { + _tprintf(_T("Error: the requested regression test does not exist")); + return -1; + } + + if (regtest->execute (config)) + { + _tprintf(_T("The regression test %s completed successfully\n"), regtest->getName ().c_str ()); + } + else + { + _tprintf(_T("The regression test %s failed\n"), regtest->getName ().c_str ()); + } + + return 0; +} Propchange: trunk/reactos/tools/sysreg/sysreg.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/sysreg.cpp ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/sysreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.h?rev=… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.h (added) +++ trunk/reactos/tools/sysreg/sysreg.h Fri Oct 20 19:49:46 2006 @@ -1,0 +1,34 @@ +#ifndef SYSREG_H__ +#define SYSREG_H__ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: app initialization + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + +#include <tchar.h> +#include <string> +#include <iostream> + + + +#include "env_var.h" +#include "pipe_reader.h" +#include "comp_factory.h" +#include "conf_parser.h" + +// regression test classes +#include "rosboot_test.h" + +//test include +#include "sym_file.h" + + + + + +#endif /* end of SYSREG_H__ */ Propchange: trunk/reactos/tools/sysreg/sysreg.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/sysreg.h ------------------------------------------------------------------------------ svn:keywords = author date id revision

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2006