[Compbench-devel] CompBenchmarks++/System System-FreeBSD.cpp, NONE, 1.1 System-FreeBSD.h, NONE, 1.1
Brought to you by:
xfred
Menu
▾
▴
[Compbench-devel] CompBenchmarks++/System System-FreeBSD.cpp, NONE, 1.1 System-FreeBSD.h, NONE, 1.1 Makefile.am, 1.4, 1.5 Makefile.in, 1.6, 1.7
|
From: Frederic T. <xf...@us...> - 2006-09-25 17:29:01
|
Update of /cvsroot/compbench/CompBenchmarks++/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16880 Modified Files: Makefile.am Makefile.in Added Files: System-FreeBSD.cpp System-FreeBSD.h Log Message: Added FreeBSD support. Index: Makefile.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 25 Sep 2006 15:38:15 -0000 1.6 --- Makefile.in 25 Sep 2006 17:28:57 -0000 1.7 *************** *** 108,111 **** --- 108,112 ---- @CBM_SYSTEM_LINUX_TRUE@source_sys = System-Linux.cpp @CBM_SYSTEM_LINUX_FALSE@@CBM_SYSTEM_CYGWIN_TRUE@source_sys = System-Cygwin.cpp + @CBM_SYSTEM_LINUX_FALSE@@CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@source_sys = System-FreeBSD.cpp sources = System.cpp System-Unix.cpp md5.cpp *************** *** 114,118 **** libSystem_la_SOURCES = $(sources) $(source_sys) ! extra_DIST = System-Linux.cpp noinst_HEADERS = $(sources:.cpp=.h) $(extra_DIST:.cpp=.h) --- 115,119 ---- libSystem_la_SOURCES = $(sources) $(source_sys) ! extra_DIST = System-Linux.cpp System-Cygwin.cpp System-FreeBSD.cpp noinst_HEADERS = $(sources:.cpp=.h) $(extra_DIST:.cpp=.h) *************** *** 132,149 **** libSystem_la_LDFLAGS = libSystem_la_LIBADD = ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_LINUX_FALSE@libSystem_la_OBJECTS = \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM...@Sy... md5.lo ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_LINUX_TRUE@libSystem_la_OBJECTS = \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM...@Sy... md5.lo \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM...@Sy... ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_LINUX_TRUE@libSystem_la_OBJECTS = \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM...@Sy... System-Unix.lo \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM...@md... System-Linux.lo ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_LINUX_FALSE@libSystem_la_OBJECTS = \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM...@Sy... md5.lo \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM...@Sy... CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --- 133,175 ---- libSystem_la_LDFLAGS = libSystem_la_LIBADD = ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM_SYSTEM_LINUX_FALSE@libSystem_la_OBJECTS = \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@md... \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM_SYSTEM_LINUX_TRUE@libSystem_la_OBJECTS = \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@md... \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM_SYSTEM_LINUX_FALSE@libSystem_la_OBJECTS = \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@md... \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM_SYSTEM_LINUX_FALSE@libSystem_la_OBJECTS = \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@md... ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM_SYSTEM_LINUX_TRUE@libSystem_la_OBJECTS = \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@md... \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM_SYSTEM_LINUX_TRUE@libSystem_la_OBJECTS = \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@md... \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM_SYSTEM_LINUX_FALSE@libSystem_la_OBJECTS = \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@md... \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM_SYSTEM_LINUX_TRUE@libSystem_la_OBJECTS = \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@md... \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) *************** *** 159,164 **** TAR = tar GZIP_ENV = --best ! DEP_FILES = .deps/System-Cygwin.P .deps/System-Linux.P \ ! .deps/System-Unix.P .deps/System.P .deps/md5.P SOURCES = $(libSystem_la_SOURCES) OBJECTS = $(libSystem_la_OBJECTS) --- 185,190 ---- TAR = tar GZIP_ENV = --best ! DEP_FILES = .deps/System-Cygwin.P .deps/System-FreeBSD.P \ ! .deps/System-Linux.P .deps/System-Unix.P .deps/System.P .deps/md5.P SOURCES = $(libSystem_la_SOURCES) OBJECTS = $(libSystem_la_OBJECTS) --- NEW FILE: System-FreeBSD.cpp --- #include <System/System-FreeBSD.h> #include <string> #include <config.h> /* !!! */ CBMSystemFreeBSD::CBMSystemFreeBSD() : CBMSystemUnix() { } std::string CBMSystemFreeBSD::processor_name(void) { return(exec0("echo $(grep -i cpu /var/run/dmesg.boot | head -1 | cut -f2 -d':' | perl -pe 's/(.+) \d+ MHz/$1/g')")); } std::string CBMSystemFreeBSD::processor_mhz(void) { return(exec0("echo $(grep -i cpu /var/run/dmesg.boot | head -1 | cut -f2 -d':' | perl -pe 's/.+ (\d+) MHz/$1/g')")); } std::string CBMSystemFreeBSD::processor_cache(void) { return("0"); } std::string CBMSystemFreeBSD::processor_number(void) { return(exec0("echo $(grep -i cpu /var/run/dmesg.boot | grep MHz | wc -l")); } CBMSystemFreeBSD::~CBMSystemFreeBSD() { } --- NEW FILE: System-FreeBSD.h --- /* ---------------------------------------------------------------------------- $Id: System-FreeBSD.h,v 1.1 2006/09/25 17:28:57 xfred Exp $ This is free software. For details, see the GNU Public License in the COPYING file, or Look http://www.fsf.org ------------------------------------------------------------------------- */ #ifndef H_CBMSYSTEMFREEBSD #define H_CBMSYSTEMFREEBSD #include <System/System-Unix.h> /** \brief FreeBSD operating system support class. * * Implements a few methods not defined by CBMSystemUnix to handle properly * FreeBSD systems in CompBenchmarks. */ class CBMSystemFreeBSD : public CBMSystemUnix { protected: public: /** Constructor */ CBMSystemFreeBSD(); /** Returns processor name * Uses dmesg.boot to get the name of the first installed processor. * \return Processor name, as clear text * \sa processor_number() */ virtual std::string processor_name(void); /** Returns processor speed * Uses dmesg.boot to get the speed, in MHz, of the first installed processor. * \return Processor speed in MHz, as clear text (integer returned) * \sa processor_number() */ virtual std::string processor_mhz(void); /** Returns processor cache * Uses dmesg.boot to get processor second level cache in Kb. Integer expected. * \return std::string coding (first) processor second level cache in Kb. */ virtual std::string processor_cache(void); /** Returns processors' number * Uses dmesg.boot to get information. * \return std::string coding the number of processors (physical and logical) on host */ virtual std::string processor_number(void); /** Virtual destructor */ virtual ~CBMSystemFreeBSD(); }; #endif Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 25 Sep 2006 15:26:39 -0000 1.4 --- Makefile.am 25 Sep 2006 17:28:57 -0000 1.5 *************** *** 6,9 **** --- 6,13 ---- if CBM_SYSTEM_CYGWIN source_sys = System-Cygwin.cpp + else + if CBM_SYSTEM_FREEBSD + source_sys = System-FreeBSD.cpp + endif endif endif *************** *** 14,18 **** libSystem_la_SOURCES = $(sources) $(source_sys) ! extra_DIST = System-Linux.cpp noinst_HEADERS = $(sources:.cpp=.h) $(extra_DIST:.cpp=.h) --- 18,22 ---- libSystem_la_SOURCES = $(sources) $(source_sys) ! extra_DIST = System-Linux.cpp System-Cygwin.cpp System-FreeBSD.cpp noinst_HEADERS = $(sources:.cpp=.h) $(extra_DIST:.cpp=.h) |
