diff --git a/checkin_notes b/checkin_notes index e4cce741b2..98bd3c4031 100755 --- a/checkin_notes +++ b/checkin_notes @@ -6919,3 +6919,10 @@ David 18 Oct 2003 scheduler_op.C win/ wingui.h + +David 19 Oct 2003 + - fixed file names + + client/ + speed_stats.C,h (old) + cpu_benchmark.C,h (new) diff --git a/client/Makefile.am b/client/Makefile.am index 7a89c8204c..74c56582a5 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -7,15 +7,16 @@ STATIC_FLAGS=@STATIC_FLAGS@ bin_PROGRAMS = boinc_client -EXTRA_PROGRAMS = speed_stats +EXTRA_PROGRAMS = cpu_benchmark -boinc_client_SOURCES = \ - main.C \ - app.C \ - check_state.C \ +boinc_client_SOURCES = \ + app.C \ + check_state.C \ + client_messages.C \ client_state.C \ client_types.C \ - cs_account.C \ + cpu_benchmark.C \ + cs_account.C \ cs_apps.C \ cs_benchmark.C \ cs_cmdline.C \ @@ -27,24 +28,23 @@ boinc_client_SOURCES = \ file_xfer.C \ hostinfo.C \ hostinfo_unix.C \ - http.C \ + http.C \ log_flags.C \ + main.C \ message.C \ net_stats.C \ net_xfer.C \ - pers_file_xfer.C \ - prefs.C \ + pers_file_xfer.C \ + prefs.C \ scheduler_op.C \ - speed_stats.C \ ss_logic.C \ time_stats.C \ - client_messages.C \ - ../lib/app_ipc.C \ - ../lib/filesys.C \ - ../lib/language.C \ + ../lib/app_ipc.C \ + ../lib/filesys.C \ + ../lib/language.C \ ../lib/parse.C \ ../lib/shmem.C \ - ../lib/md5_file.C \ + ../lib/md5_file.C \ ../lib/md5.c \ ../lib/crypt.C \ ../lib/util.C \ @@ -55,8 +55,8 @@ boinc_client_CPPFLAGS = -I $(srcdir)/win $(AM_CPPFLAGS) boinc_client_LDADD = $(RSA_LIBS) boinc_client_LDFLAGS = $(STATIC_FLAGS) -speed_stats_SOURCES = speed_stats.C -speed_stats_CFLAGS = -O6 $(AM_CFLAGS) +cpu_benchmark_SOURCES = cpu_benchmark.C +cpu_benchmark_CFLAGS = -O6 $(AM_CFLAGS) all-local: client-bin-gz client-bin: @CLIENT_BIN_FILENAME@.gz diff --git a/client/Makefile.in b/client/Makefile.in index 1de410650f..e1069d85f6 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -174,15 +174,16 @@ LIBRSA = $(top_builddir)/RSAEuro/source/librsaeuro.a bin_PROGRAMS = boinc_client -EXTRA_PROGRAMS = speed_stats +EXTRA_PROGRAMS = cpu_benchmark boinc_client_SOURCES = \ - main.C \ - app.C \ - check_state.C \ + app.C \ + check_state.C \ + client_messages.C \ client_state.C \ client_types.C \ - cs_account.C \ + cpu_benchmark.C \ + cs_account.C \ cs_apps.C \ cs_benchmark.C \ cs_cmdline.C \ @@ -194,24 +195,23 @@ boinc_client_SOURCES = \ file_xfer.C \ hostinfo.C \ hostinfo_unix.C \ - http.C \ + http.C \ log_flags.C \ + main.C \ message.C \ net_stats.C \ net_xfer.C \ - pers_file_xfer.C \ - prefs.C \ + pers_file_xfer.C \ + prefs.C \ scheduler_op.C \ - speed_stats.C \ ss_logic.C \ time_stats.C \ - client_messages.C \ - ../lib/app_ipc.C \ - ../lib/filesys.C \ - ../lib/language.C \ + ../lib/app_ipc.C \ + ../lib/filesys.C \ + ../lib/language.C \ ../lib/parse.C \ ../lib/shmem.C \ - ../lib/md5_file.C \ + ../lib/md5_file.C \ ../lib/md5.c \ ../lib/crypt.C \ ../lib/util.C \ @@ -223,8 +223,8 @@ boinc_client_CPPFLAGS = -I $(srcdir)/win $(AM_CPPFLAGS) boinc_client_LDADD = $(RSA_LIBS) boinc_client_LDFLAGS = $(STATIC_FLAGS) -speed_stats_SOURCES = speed_stats.C -speed_stats_CFLAGS = -O6 $(AM_CFLAGS) +cpu_benchmark_SOURCES = cpu_benchmark.C +cpu_benchmark_CFLAGS = -O6 $(AM_CFLAGS) EXTRA_DIST = \ *.h \ @@ -237,14 +237,16 @@ subdir = client mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -EXTRA_PROGRAMS = speed_stats$(EXEEXT) +EXTRA_PROGRAMS = cpu_benchmark$(EXEEXT) bin_PROGRAMS = boinc_client$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_boinc_client_OBJECTS = boinc_client-main.$(OBJEXT) \ - boinc_client-app.$(OBJEXT) boinc_client-check_state.$(OBJEXT) \ +am_boinc_client_OBJECTS = boinc_client-app.$(OBJEXT) \ + boinc_client-check_state.$(OBJEXT) \ + boinc_client-client_messages.$(OBJEXT) \ boinc_client-client_state.$(OBJEXT) \ boinc_client-client_types.$(OBJEXT) \ + boinc_client-cpu_benchmark.$(OBJEXT) \ boinc_client-cs_account.$(OBJEXT) \ boinc_client-cs_apps.$(OBJEXT) \ boinc_client-cs_benchmark.$(OBJEXT) \ @@ -257,26 +259,25 @@ am_boinc_client_OBJECTS = boinc_client-main.$(OBJEXT) \ boinc_client-hostinfo.$(OBJEXT) \ boinc_client-hostinfo_unix.$(OBJEXT) \ boinc_client-http.$(OBJEXT) boinc_client-log_flags.$(OBJEXT) \ - boinc_client-message.$(OBJEXT) boinc_client-net_stats.$(OBJEXT) \ + boinc_client-main.$(OBJEXT) boinc_client-message.$(OBJEXT) \ + boinc_client-net_stats.$(OBJEXT) \ boinc_client-net_xfer.$(OBJEXT) \ boinc_client-pers_file_xfer.$(OBJEXT) \ boinc_client-prefs.$(OBJEXT) \ boinc_client-scheduler_op.$(OBJEXT) \ - boinc_client-speed_stats.$(OBJEXT) \ boinc_client-ss_logic.$(OBJEXT) \ boinc_client-time_stats.$(OBJEXT) \ - boinc_client-client_messages.$(OBJEXT) \ boinc_client-app_ipc.$(OBJEXT) boinc_client-filesys.$(OBJEXT) \ boinc_client-language.$(OBJEXT) boinc_client-parse.$(OBJEXT) \ boinc_client-shmem.$(OBJEXT) boinc_client-md5_file.$(OBJEXT) \ boinc_client-md5.$(OBJEXT) boinc_client-crypt.$(OBJEXT) \ boinc_client-util.$(OBJEXT) boinc_client-messages.$(OBJEXT) boinc_client_OBJECTS = $(am_boinc_client_OBJECTS) -am_speed_stats_OBJECTS = speed_stats.$(OBJEXT) -speed_stats_OBJECTS = $(am_speed_stats_OBJECTS) -speed_stats_LDADD = $(LDADD) -speed_stats_DEPENDENCIES = -speed_stats_LDFLAGS = +am_cpu_benchmark_OBJECTS = cpu_benchmark.$(OBJEXT) +cpu_benchmark_OBJECTS = $(am_cpu_benchmark_OBJECTS) +cpu_benchmark_LDADD = $(LDADD) +cpu_benchmark_DEPENDENCIES = +cpu_benchmark_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -287,6 +288,7 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-client_messages.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-client_state.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-client_types.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-cpu_benchmark.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-crypt.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-cs_account.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-cs_apps.Po \ @@ -316,11 +318,10 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-prefs.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-scheduler_op.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-shmem.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-speed_stats.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-ss_logic.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-time_stats.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-util.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/speed_stats.Po +@AMDEP_TRUE@ ./$(DEPDIR)/cpu_benchmark.Po CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) @@ -330,10 +331,10 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(boinc_client_SOURCES) $(speed_stats_SOURCES) +DIST_SOURCES = $(boinc_client_SOURCES) $(cpu_benchmark_SOURCES) DIST_COMMON = $(top_srcdir)/Makefile.incl Makefile.am Makefile.in \ install-sh -SOURCES = $(boinc_client_SOURCES) $(speed_stats_SOURCES) +SOURCES = $(boinc_client_SOURCES) $(cpu_benchmark_SOURCES) all: all-am @@ -368,11 +369,12 @@ uninstall-binPROGRAMS: clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -boinc_client-main.$(OBJEXT): main.C boinc_client-app.$(OBJEXT): app.C boinc_client-check_state.$(OBJEXT): check_state.C +boinc_client-client_messages.$(OBJEXT): client_messages.C boinc_client-client_state.$(OBJEXT): client_state.C boinc_client-client_types.$(OBJEXT): client_types.C +boinc_client-cpu_benchmark.$(OBJEXT): cpu_benchmark.C boinc_client-cs_account.$(OBJEXT): cs_account.C boinc_client-cs_apps.$(OBJEXT): cs_apps.C boinc_client-cs_benchmark.$(OBJEXT): cs_benchmark.C @@ -387,16 +389,15 @@ boinc_client-hostinfo.$(OBJEXT): hostinfo.C boinc_client-hostinfo_unix.$(OBJEXT): hostinfo_unix.C boinc_client-http.$(OBJEXT): http.C boinc_client-log_flags.$(OBJEXT): log_flags.C +boinc_client-main.$(OBJEXT): main.C boinc_client-message.$(OBJEXT): message.C boinc_client-net_stats.$(OBJEXT): net_stats.C boinc_client-net_xfer.$(OBJEXT): net_xfer.C boinc_client-pers_file_xfer.$(OBJEXT): pers_file_xfer.C boinc_client-prefs.$(OBJEXT): prefs.C boinc_client-scheduler_op.$(OBJEXT): scheduler_op.C -boinc_client-speed_stats.$(OBJEXT): speed_stats.C boinc_client-ss_logic.$(OBJEXT): ss_logic.C boinc_client-time_stats.$(OBJEXT): time_stats.C -boinc_client-client_messages.$(OBJEXT): client_messages.C boinc_client-app_ipc.$(OBJEXT): ../lib/app_ipc.C boinc_client-filesys.$(OBJEXT): ../lib/filesys.C boinc_client-language.$(OBJEXT): ../lib/language.C @@ -410,9 +411,9 @@ boinc_client-messages.$(OBJEXT): ../lib/messages.C boinc_client$(EXEEXT): $(boinc_client_OBJECTS) $(boinc_client_DEPENDENCIES) @rm -f boinc_client$(EXEEXT) $(CXXLINK) $(boinc_client_LDFLAGS) $(boinc_client_OBJECTS) $(boinc_client_LDADD) $(LIBS) -speed_stats$(EXEEXT): $(speed_stats_OBJECTS) $(speed_stats_DEPENDENCIES) - @rm -f speed_stats$(EXEEXT) - $(CXXLINK) $(speed_stats_LDFLAGS) $(speed_stats_OBJECTS) $(speed_stats_LDADD) $(LIBS) +cpu_benchmark$(EXEEXT): $(cpu_benchmark_OBJECTS) $(cpu_benchmark_DEPENDENCIES) + @rm -f cpu_benchmark$(EXEEXT) + $(CXXLINK) $(cpu_benchmark_LDFLAGS) $(cpu_benchmark_OBJECTS) $(cpu_benchmark_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core @@ -426,6 +427,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-client_messages.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-client_state.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-client_types.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-cpu_benchmark.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-crypt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-cs_account.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-cs_apps.Po@am__quote@ @@ -455,11 +457,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-prefs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-scheduler_op.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-shmem.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-speed_stats.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-ss_logic.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-time_stats.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-util.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/speed_stats.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu_benchmark.Po@am__quote@ distclean-depend: -rm -rf ./$(DEPDIR) @@ -486,28 +487,6 @@ distclean-depend: @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` -boinc_client-main.o: main.C -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-main.o -MD -MP -MF "$(DEPDIR)/boinc_client-main.Tpo" \ -@am__fastdepCXX_TRUE@ -c -o boinc_client-main.o `test -f 'main.C' || echo '$(srcdir)/'`main.C; \ -@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/boinc_client-main.Tpo" "$(DEPDIR)/boinc_client-main.Po"; \ -@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/boinc_client-main.Tpo"; exit 1; \ -@am__fastdepCXX_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.C' object='boinc_client-main.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/boinc_client-main.Po' tmpdepfile='$(DEPDIR)/boinc_client-main.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-main.o `test -f 'main.C' || echo '$(srcdir)/'`main.C - -boinc_client-main.obj: main.C -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-main.obj -MD -MP -MF "$(DEPDIR)/boinc_client-main.Tpo" \ -@am__fastdepCXX_TRUE@ -c -o boinc_client-main.obj `if test -f 'main.C'; then $(CYGPATH_W) 'main.C'; else $(CYGPATH_W) '$(srcdir)/main.C'`; \ -@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/boinc_client-main.Tpo" "$(DEPDIR)/boinc_client-main.Po"; \ -@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/boinc_client-main.Tpo"; exit 1; \ -@am__fastdepCXX_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.C' object='boinc_client-main.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/boinc_client-main.Po' tmpdepfile='$(DEPDIR)/boinc_client-main.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-main.obj `if test -f 'main.C'; then $(CYGPATH_W) 'main.C'; else $(CYGPATH_W) '$(srcdir)/main.C'` - boinc_client-app.o: app.C @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-app.o -MD -MP -MF "$(DEPDIR)/boinc_client-app.Tpo" \ @am__fastdepCXX_TRUE@ -c -o boinc_client-app.o `test -f 'app.C' || echo '$(srcdir)/'`app.C; \ @@ -552,6 +531,28 @@ boinc_client-check_state.obj: check_state.C @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-check_state.obj `if test -f 'check_state.C'; then $(CYGPATH_W) 'check_state.C'; else $(CYGPATH_W) '$(srcdir)/check_state.C'` +boinc_client-client_messages.o: client_messages.C +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-client_messages.o -MD -MP -MF "$(DEPDIR)/boinc_client-client_messages.Tpo" \ +@am__fastdepCXX_TRUE@ -c -o boinc_client-client_messages.o `test -f 'client_messages.C' || echo '$(srcdir)/'`client_messages.C; \ +@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/boinc_client-client_messages.Tpo" "$(DEPDIR)/boinc_client-client_messages.Po"; \ +@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/boinc_client-client_messages.Tpo"; exit 1; \ +@am__fastdepCXX_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='client_messages.C' object='boinc_client-client_messages.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/boinc_client-client_messages.Po' tmpdepfile='$(DEPDIR)/boinc_client-client_messages.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-client_messages.o `test -f 'client_messages.C' || echo '$(srcdir)/'`client_messages.C + +boinc_client-client_messages.obj: client_messages.C +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-client_messages.obj -MD -MP -MF "$(DEPDIR)/boinc_client-client_messages.Tpo" \ +@am__fastdepCXX_TRUE@ -c -o boinc_client-client_messages.obj `if test -f 'client_messages.C'; then $(CYGPATH_W) 'client_messages.C'; else $(CYGPATH_W) '$(srcdir)/client_messages.C'`; \ +@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/boinc_client-client_messages.Tpo" "$(DEPDIR)/boinc_client-client_messages.Po"; \ +@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/boinc_client-client_messages.Tpo"; exit 1; \ +@am__fastdepCXX_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='client_messages.C' object='boinc_client-client_messages.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/boinc_client-client_messages.Po' tmpdepfile='$(DEPDIR)/boinc_client-client_messages.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-client_messages.obj `if test -f 'client_messages.C'; then $(CYGPATH_W) 'client_messages.C'; else $(CYGPATH_W) '$(srcdir)/client_messages.C'` + boinc_client-client_state.o: client_state.C @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-client_state.o -MD -MP -MF "$(DEPDIR)/boinc_client-client_state.Tpo" \ @am__fastdepCXX_TRUE@ -c -o boinc_client-client_state.o `test -f 'client_state.C' || echo '$(srcdir)/'`client_state.C; \ @@ -596,6 +597,28 @@ boinc_client-client_types.obj: client_types.C @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-client_types.obj `if test -f 'client_types.C'; then $(CYGPATH_W) 'client_types.C'; else $(CYGPATH_W) '$(srcdir)/client_types.C'` +boinc_client-cpu_benchmark.o: cpu_benchmark.C +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cpu_benchmark.o -MD -MP -MF "$(DEPDIR)/boinc_client-cpu_benchmark.Tpo" \ +@am__fastdepCXX_TRUE@ -c -o boinc_client-cpu_benchmark.o `test -f 'cpu_benchmark.C' || echo '$(srcdir)/'`cpu_benchmark.C; \ +@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/boinc_client-cpu_benchmark.Tpo" "$(DEPDIR)/boinc_client-cpu_benchmark.Po"; \ +@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/boinc_client-cpu_benchmark.Tpo"; exit 1; \ +@am__fastdepCXX_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cpu_benchmark.C' object='boinc_client-cpu_benchmark.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/boinc_client-cpu_benchmark.Po' tmpdepfile='$(DEPDIR)/boinc_client-cpu_benchmark.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-cpu_benchmark.o `test -f 'cpu_benchmark.C' || echo '$(srcdir)/'`cpu_benchmark.C + +boinc_client-cpu_benchmark.obj: cpu_benchmark.C +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cpu_benchmark.obj -MD -MP -MF "$(DEPDIR)/boinc_client-cpu_benchmark.Tpo" \ +@am__fastdepCXX_TRUE@ -c -o boinc_client-cpu_benchmark.obj `if test -f 'cpu_benchmark.C'; then $(CYGPATH_W) 'cpu_benchmark.C'; else $(CYGPATH_W) '$(srcdir)/cpu_benchmark.C'`; \ +@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/boinc_client-cpu_benchmark.Tpo" "$(DEPDIR)/boinc_client-cpu_benchmark.Po"; \ +@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/boinc_client-cpu_benchmark.Tpo"; exit 1; \ +@am__fastdepCXX_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cpu_benchmark.C' object='boinc_client-cpu_benchmark.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/boinc_client-cpu_benchmark.Po' tmpdepfile='$(DEPDIR)/boinc_client-cpu_benchmark.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-cpu_benchmark.obj `if test -f 'cpu_benchmark.C'; then $(CYGPATH_W) 'cpu_benchmark.C'; else $(CYGPATH_W) '$(srcdir)/cpu_benchmark.C'` + boinc_client-cs_account.o: cs_account.C @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-cs_account.o -MD -MP -MF "$(DEPDIR)/boinc_client-cs_account.Tpo" \ @am__fastdepCXX_TRUE@ -c -o boinc_client-cs_account.o `test -f 'cs_account.C' || echo '$(srcdir)/'`cs_account.C; \ @@ -904,6 +927,28 @@ boinc_client-log_flags.obj: log_flags.C @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-log_flags.obj `if test -f 'log_flags.C'; then $(CYGPATH_W) 'log_flags.C'; else $(CYGPATH_W) '$(srcdir)/log_flags.C'` +boinc_client-main.o: main.C +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-main.o -MD -MP -MF "$(DEPDIR)/boinc_client-main.Tpo" \ +@am__fastdepCXX_TRUE@ -c -o boinc_client-main.o `test -f 'main.C' || echo '$(srcdir)/'`main.C; \ +@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/boinc_client-main.Tpo" "$(DEPDIR)/boinc_client-main.Po"; \ +@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/boinc_client-main.Tpo"; exit 1; \ +@am__fastdepCXX_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.C' object='boinc_client-main.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/boinc_client-main.Po' tmpdepfile='$(DEPDIR)/boinc_client-main.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-main.o `test -f 'main.C' || echo '$(srcdir)/'`main.C + +boinc_client-main.obj: main.C +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-main.obj -MD -MP -MF "$(DEPDIR)/boinc_client-main.Tpo" \ +@am__fastdepCXX_TRUE@ -c -o boinc_client-main.obj `if test -f 'main.C'; then $(CYGPATH_W) 'main.C'; else $(CYGPATH_W) '$(srcdir)/main.C'`; \ +@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/boinc_client-main.Tpo" "$(DEPDIR)/boinc_client-main.Po"; \ +@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/boinc_client-main.Tpo"; exit 1; \ +@am__fastdepCXX_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.C' object='boinc_client-main.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/boinc_client-main.Po' tmpdepfile='$(DEPDIR)/boinc_client-main.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-main.obj `if test -f 'main.C'; then $(CYGPATH_W) 'main.C'; else $(CYGPATH_W) '$(srcdir)/main.C'` + boinc_client-message.o: message.C @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-message.o -MD -MP -MF "$(DEPDIR)/boinc_client-message.Tpo" \ @am__fastdepCXX_TRUE@ -c -o boinc_client-message.o `test -f 'message.C' || echo '$(srcdir)/'`message.C; \ @@ -1036,28 +1081,6 @@ boinc_client-scheduler_op.obj: scheduler_op.C @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-scheduler_op.obj `if test -f 'scheduler_op.C'; then $(CYGPATH_W) 'scheduler_op.C'; else $(CYGPATH_W) '$(srcdir)/scheduler_op.C'` -boinc_client-speed_stats.o: speed_stats.C -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-speed_stats.o -MD -MP -MF "$(DEPDIR)/boinc_client-speed_stats.Tpo" \ -@am__fastdepCXX_TRUE@ -c -o boinc_client-speed_stats.o `test -f 'speed_stats.C' || echo '$(srcdir)/'`speed_stats.C; \ -@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/boinc_client-speed_stats.Tpo" "$(DEPDIR)/boinc_client-speed_stats.Po"; \ -@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/boinc_client-speed_stats.Tpo"; exit 1; \ -@am__fastdepCXX_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='speed_stats.C' object='boinc_client-speed_stats.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/boinc_client-speed_stats.Po' tmpdepfile='$(DEPDIR)/boinc_client-speed_stats.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-speed_stats.o `test -f 'speed_stats.C' || echo '$(srcdir)/'`speed_stats.C - -boinc_client-speed_stats.obj: speed_stats.C -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-speed_stats.obj -MD -MP -MF "$(DEPDIR)/boinc_client-speed_stats.Tpo" \ -@am__fastdepCXX_TRUE@ -c -o boinc_client-speed_stats.obj `if test -f 'speed_stats.C'; then $(CYGPATH_W) 'speed_stats.C'; else $(CYGPATH_W) '$(srcdir)/speed_stats.C'`; \ -@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/boinc_client-speed_stats.Tpo" "$(DEPDIR)/boinc_client-speed_stats.Po"; \ -@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/boinc_client-speed_stats.Tpo"; exit 1; \ -@am__fastdepCXX_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='speed_stats.C' object='boinc_client-speed_stats.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/boinc_client-speed_stats.Po' tmpdepfile='$(DEPDIR)/boinc_client-speed_stats.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-speed_stats.obj `if test -f 'speed_stats.C'; then $(CYGPATH_W) 'speed_stats.C'; else $(CYGPATH_W) '$(srcdir)/speed_stats.C'` - boinc_client-ss_logic.o: ss_logic.C @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-ss_logic.o -MD -MP -MF "$(DEPDIR)/boinc_client-ss_logic.Tpo" \ @am__fastdepCXX_TRUE@ -c -o boinc_client-ss_logic.o `test -f 'ss_logic.C' || echo '$(srcdir)/'`ss_logic.C; \ @@ -1102,28 +1125,6 @@ boinc_client-time_stats.obj: time_stats.C @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-time_stats.obj `if test -f 'time_stats.C'; then $(CYGPATH_W) 'time_stats.C'; else $(CYGPATH_W) '$(srcdir)/time_stats.C'` -boinc_client-client_messages.o: client_messages.C -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-client_messages.o -MD -MP -MF "$(DEPDIR)/boinc_client-client_messages.Tpo" \ -@am__fastdepCXX_TRUE@ -c -o boinc_client-client_messages.o `test -f 'client_messages.C' || echo '$(srcdir)/'`client_messages.C; \ -@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/boinc_client-client_messages.Tpo" "$(DEPDIR)/boinc_client-client_messages.Po"; \ -@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/boinc_client-client_messages.Tpo"; exit 1; \ -@am__fastdepCXX_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='client_messages.C' object='boinc_client-client_messages.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/boinc_client-client_messages.Po' tmpdepfile='$(DEPDIR)/boinc_client-client_messages.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-client_messages.o `test -f 'client_messages.C' || echo '$(srcdir)/'`client_messages.C - -boinc_client-client_messages.obj: client_messages.C -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-client_messages.obj -MD -MP -MF "$(DEPDIR)/boinc_client-client_messages.Tpo" \ -@am__fastdepCXX_TRUE@ -c -o boinc_client-client_messages.obj `if test -f 'client_messages.C'; then $(CYGPATH_W) 'client_messages.C'; else $(CYGPATH_W) '$(srcdir)/client_messages.C'`; \ -@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/boinc_client-client_messages.Tpo" "$(DEPDIR)/boinc_client-client_messages.Po"; \ -@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/boinc_client-client_messages.Tpo"; exit 1; \ -@am__fastdepCXX_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='client_messages.C' object='boinc_client-client_messages.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/boinc_client-client_messages.Po' tmpdepfile='$(DEPDIR)/boinc_client-client_messages.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-client_messages.obj `if test -f 'client_messages.C'; then $(CYGPATH_W) 'client_messages.C'; else $(CYGPATH_W) '$(srcdir)/client_messages.C'` - boinc_client-app_ipc.o: ../lib/app_ipc.C @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-app_ipc.o -MD -MP -MF "$(DEPDIR)/boinc_client-app_ipc.Tpo" \ @am__fastdepCXX_TRUE@ -c -o boinc_client-app_ipc.o `test -f '../lib/app_ipc.C' || echo '$(srcdir)/'`../lib/app_ipc.C; \ diff --git a/client/speed_stats.C b/client/cpu_benchmark.C old mode 100644 new mode 100755 similarity index 92% rename from client/speed_stats.C rename to client/cpu_benchmark.C index e45195587a..abd2b0a754 --- a/client/speed_stats.C +++ b/client/cpu_benchmark.C @@ -31,20 +31,21 @@ #include "error_numbers.h" #include "message.h" -#include "speed_stats.h" +#include "cpu_benchmark.h" #ifdef _WIN32 #include #include // for timing -void CALLBACK stop_test(UINT uTimerID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2); +void CALLBACK stop_benchmark(UINT uTimerID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2); UINT speed_timer_id; #else -void stop_test(int a); +void stop_benchmark(int a); #endif -// Speed test global variables -// run_test is volatile so the test loops will notice changes made by stop_test -volatile bool run_test; +// run_benchmark is volatile so the test loops will notice changes +// made by stop_test +// +static volatile bool run_benchmark; //#define RUN_TEST @@ -55,14 +56,14 @@ int main(void) { cache_size = check_cache_size(CACHE_MAX); - run_test_suite(4); + run_benchmark_suite(4); return 0; } -void run_test_suite(double num_secs_per_test) { +void run_benchmark_suite(double num_secs_per_test) { if (num_secs_per_test<0) { - msg_printf(NULL, MSG_ERROR, "error: run_test_suite: negative num_seconds_per_test\n"); + msg_printf(NULL, MSG_ERROR, "error: run_benchmark_suite: negative num_seconds_per_test\n"); } printf( "Running tests. This will take about %.1lf seconds.\n\n", @@ -233,11 +234,11 @@ int run_double_prec_test(double num_secs, double &flops_per_sec) { } // Setup a timer to interrupt the tests in num_secs - set_test_timer(num_secs); + set_benchmark_timer(num_secs); retval = (int)double_flop_test(0, flops_per_sec, 0); - destroy_test_timer(); + destroy_benchmark_timer(); return retval; } @@ -253,11 +254,11 @@ int run_int_test(double num_secs, double &iops_per_sec) { } // Setup a timer to interrupt the tests in num_secs - set_test_timer(num_secs); + set_benchmark_timer(num_secs); retval = (int)int_op_test(0, iops_per_sec, 0); - destroy_test_timer(); + destroy_benchmark_timer(); return retval; } @@ -273,11 +274,11 @@ int run_mem_bandwidth_test(double num_secs, double &bytes_per_sec) { } // Setup a timer to interrupt the tests in num_secs - set_test_timer(num_secs); + set_benchmark_timer(num_secs); retval = (int)bandwidth_test(0, bytes_per_sec, 0); - destroy_test_timer(); + destroy_benchmark_timer(); return retval; } @@ -298,7 +299,7 @@ int double_flop_test(int iterations, double &flops_per_sec, int print_debug) { // If iterations is 0, assume we're using the timer if (iterations == 0) { - run_test = true; + run_benchmark = true; iterations = 200000000; } @@ -313,7 +314,7 @@ int double_flop_test(int iterations, double &flops_per_sec, int print_debug) { time_start = clock(); - for (n=0;(n", p_ncpus)) continue; else if (parse_str(buf, "", p_vendor, sizeof(p_vendor))) continue; else if (parse_str(buf, "", p_model, sizeof(p_model))) continue; - else if (parse_double(buf, "", p_fpops)) continue; - else if (parse_double(buf, "", p_iops)) continue; - else if (parse_double(buf, "", p_membw)) continue; + else if (parse_double(buf, "", p_fpops)) { + // fix foolishness that could result in negative value here + // + if (p_fpops < 0) p_fpops = -p_fpops; + continue; + } + else if (parse_double(buf, "", p_iops)) { + if (p_iops < 0) p_iops = -p_iops; + continue; + } + else if (parse_double(buf, "", p_membw)) { + if (p_membw < 0) p_membw = -p_membw; + continue; + } else if (parse_int(buf, "", p_fpop_err)) continue; else if (parse_int(buf, "", p_iop_err)) continue; else if (parse_int(buf, "", p_membw_err)) continue; diff --git a/doc/index.html b/doc/index.html index c59dc07f80..2d95e5f8ad 100644 --- a/doc/index.html +++ b/doc/index.html @@ -81,6 +81,18 @@ Several other distributed computing projects are evaluating BOINC.

News

+October 18, 2003 +
+A SETI@home application has been added to the beta test. +The scheduling server detect results that can't be sent +to any hosts, and flags them. +HTTP 404 errors on downloads are treated as unrecoverable. +Graphics can be limited by frame rate or percent of CPU. +Don't send two results from the same workunit to a single user. +Added JPEG support to application graphics. +Added "confirm before accept executable" mechanism. + +

September 11, 2003
BOINC is discussed in