compbench-devel

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10765

Modified Files:
	System.cpp 
Log Message:
XML based message reporting.
New path for benchmark (because of move of compbenchmarks-core in a sub-directory).
downloadNow() uses system() call to prevent messages to be send by another thread.


Index: System.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** System.cpp	28 May 2007 18:06:26 -0000	1.16
--- System.cpp	6 Jun 2007 15:59:16 -0000	1.17
***************
*** 14,18 ****
  #include <Benchmark/Benchmark-DLLoader.h>
  
! #include <UI/UI.h>
  
  #include <iostream>
--- 14,18 ----
  #include <Benchmark/Benchmark-DLLoader.h>
  
! #include <UI/UI-Console.h>
  
  #include <iostream>
***************
*** 46,50 ****
  
    if (!cbmUI)
!     cbmUI=new CBM::UI;
  
    tmp_bm=PREFIX;
--- 46,50 ----
  
    if (!cbmUI)
!     cbmUI=new CBM::UIConsole;
  
    tmp_bm=PREFIX;
***************
*** 55,58 ****
--- 55,59 ----
    CBM::cbmlib_paths.push_back(tmp_bm);
    CBM::cbmlib_paths.push_back("./SupportedBenchmarks/.libs");
+   CBM::cbmlib_paths.push_back("../SupportedBenchmarks/.libs");
    CBM::cbmlib_paths.push_back("../../SupportedBenchmarks/.libs");
  
***************
*** 77,82 ****
    if (!checkDirectory(dir)) {
  
!     cbmUI->Information(CBM::UI::DirectoryCreate,
! 		       dir);
  
      r=mkdir(dir);
--- 78,83 ----
    if (!checkDirectory(dir)) {
  
!     cbmUI->msgCreate(UIMsg::Directory,
! 		     dir);
  
      r=mkdir(dir);
***************
*** 85,90 ****
        std::string msg = "Can't create ";
        msg+=dir;
!       cbmUI->Fatal(msg);
!     }
    }
  
--- 86,92 ----
        std::string msg = "Can't create ";
        msg+=dir;
!       cbmUI->outputKO(msg);
!     } else
!       cbmUI->outputOK();
    }
  
***************
*** 114,118 ****
    cmd+=localfile;
  
!   exec0(cmd);
    return(1);
  }
--- 116,121 ----
    cmd+=localfile;
  
!   system(cmd.c_str());
!   // exec0(cmd);
    return(1);
  }
***************
*** 126,131 ****
  
    
!   cbmUI->Information(CBM::UI::PackageDownload,
! 		     url);
  		     
    T.Start();
--- 129,133 ----
  
    
!   cbmUI->msgDownload(url);
  		     
    T.Start();
***************
*** 133,142 ****
    while (!T.Terminated()) {
      sleep(1);
!     cbmUI->Information(CBM::UI::PackageDownload,
! 		       CBM::UI::Running,
! 		       T.Progress());
    }
!   cbmUI->Information(CBM::UI::PackageDownload,
! 		     CBM::UI::OK);
    return(1);
  }
--- 135,141 ----
    while (!T.Terminated()) {
      sleep(1);
!     cbmUI->Progress(T.Progress());
    }
!   cbmUI->outputOK();
    return(1);
  }
***************
*** 459,463 ****
  
    if (r == "") {
!     cbmUI->Fatal("No such external program");
    }
  
--- 458,462 ----
  
    if (r == "") {
!     cbmUI->msgFatal("No such external program");
    }
  
***************
*** 530,536 ****
    } else {
      std::string str;
!     str="Invalid MD5 for ";
      str+=filename;
!     cbmUI->Fatal(str);
      result="";
    }
--- 529,535 ----
    } else {
      std::string str;
!     str="Can't compute MD5 for ";
      str+=filename;
!     cbmUI->outputInfo(str);
      result="";
    }