Update of /cvsroot/compbench/CompBenchmarks++/System
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19108
Modified Files:
System.cpp System.h
Log Message:
API changes.
CBM namespace.
Index: System.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** System.cpp 18 Jan 2007 18:43:02 -0000 1.21
--- System.cpp 21 Jan 2007 20:45:57 -0000 1.22
***************
*** 130,133 ****
--- 130,177 ----
}
+ std::string System::arch(void)
+ {
+ return("");
+ }
+
+ std::string System::hostid(void)
+ {
+ return("");
+ }
+
+ std::string System::hostname(void)
+ {
+ return("");
+ }
+
+ std::string System::os(void)
+ {
+ return("");
+ }
+
+ std::string System::os_version(void)
+ {
+ return("");
+ }
+
+ std::string System::processor_name(void)
+ {
+ return("");
+ }
+
+ std::string System::processor_mhz(void)
+ {
+ return("");
+ }
+
+ std::string System::processor_cache(void)
+ {
+ return("");
+ }
+
+ std::string System::processor_number(void)
+ {
+ return("");
+ }
PackageVector &System::packageList(int _force)
Index: System.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** System.h 18 Jan 2007 18:43:02 -0000 1.21
--- System.h 21 Jan 2007 20:45:57 -0000 1.22
***************
*** 75,97 ****
virtual std::string exec0(char *command);
! /** Returns host's architecture.
! * As uname -m on UNIX.
! * \return Host's architecture
*/
! virtual std::string arch(void) = 0;
/** Get host ID
* As hostid command does on UNIX.
* \return Host ID as string.*/
! virtual std::string hostid(void) = 0;
/** Returns hostname
* Returns the shortname.
* \return hostname */
! virtual std::string hostname(void) = 0;
/** Returns operating system name
* \return Operating system name (as uname command on UNIX) */
! virtual std::string os(void) = 0;
/** Returns operating system version
* \return Operating system version (as uname -r command on most UNIXes) */
! virtual std::string os_version(void) = 0;
/** Returns processor name
* Here we infer that each processor on the node are identical, which is the case
--- 75,110 ----
virtual std::string exec0(char *command);
! /** Checks a given directory.
! Directory is given according to its purpose in CompBenchmarks.
! \sa Temp
! \sa checkDirectory()
! \return 1 if ok.
! */
! virtual int CheckDirectory(Temp where);
!
! public:
! /** Initialize for CompBenchmarks usage.
! * Checks for temporary directories.
! * \return 1 if ok.
! * \sa CheckDirectory()
*/
! virtual int init(void);
!
/** Get host ID
* As hostid command does on UNIX.
* \return Host ID as string.*/
! virtual std::string hostid(void);
/** Returns hostname
* Returns the shortname.
* \return hostname */
!
! virtual std::string hostname(void);
/** Returns operating system name
* \return Operating system name (as uname command on UNIX) */
!
! virtual std::string os(void);
/** Returns operating system version
* \return Operating system version (as uname -r command on most UNIXes) */
! virtual std::string os_version(void);
/** Returns processor name
* Here we infer that each processor on the node are identical, which is the case
***************
*** 99,132 ****
* \return Processor name, as clear text
* \sa processor_number() */
! virtual std::string processor_name(void) = 0;
/** Returns processor speed
* Processor speed in MHz. Integer expected.
* \return std::string coding an integer matching the (first) processor speed, in MHz. */
! virtual std::string processor_mhz(void) = 0;
/** Returns processor cache
* Processor second level cache in Kb. Integer expected.
* \return std::string coding the (first) processor second level cache in Kb. */
! virtual std::string processor_cache(void) = 0;
/** Returns processors' number
* \return std::string coding the number of processors (physical and logical) on host */
! virtual std::string processor_number(void) = 0;
- /** Checks a given directory.
- Directory is given according to its purpose in CompBenchmarks.
- \sa Temp
- \sa checkDirectory()
- \return 1 if ok.
- */
- virtual int CheckDirectory(Temp where);
! public:
! /** Initialize for CompBenchmarks usage.
! * Checks for temporary directories.
! * \return 1 if ok.
! * \sa CheckDirectory()
*/
! virtual int init(void);
/** Give a list containing the compatible benchmarks
--- 112,136 ----
* \return Processor name, as clear text
* \sa processor_number() */
! virtual std::string processor_name(void);
/** Returns processor speed
* Processor speed in MHz. Integer expected.
* \return std::string coding an integer matching the (first) processor speed, in MHz. */
! virtual std::string processor_mhz(void);
/** Returns processor cache
* Processor second level cache in Kb. Integer expected.
* \return std::string coding the (first) processor second level cache in Kb. */
! virtual std::string processor_cache(void);
/** Returns processors' number
* \return std::string coding the number of processors (physical and logical) on host */
! virtual std::string processor_number(void);
! /** Returns host's architecture.
! * As uname -m on UNIX.
! * \return Host's architecture
*/
! virtual std::string arch(void);
/** Give a list containing the compatible benchmarks
|
