Import Geant4 10.7.0.beta source tree

examples/extended/parallel/TBB/B2b/exampleB2b.cc

@@ -30,10 +30,8 @@
 #include "B2bDetectorConstruction.hh"
 #include "B2ActionInitialization.hh"
 
-//G4-TBB interfaces
-#include "tbbUserWorkerInitialization.hh"
-#include "SimpleTbbMasterRunManager.hh"
 #include "G4Threading.hh"
+#include "G4TaskRunManager.hh"
 
 #include "G4UImanager.hh"
 #include "FTFP_BERT.hh"
@@ -44,63 +42,26 @@
 #include "G4VisExecutive.hh"
 #include "G4UIExecutive.hh"
 
-//TBB includes
-#include <tbb/task_scheduler_init.h>
-#include <tbb/task.h>
-
-
-//This function is very simple: it just start tbb work.
-//This is done in a seperate thread, because for G4 the
-//master cannot live in the same thread where workers are
-//Starting tbb work in a thread guarantees that no workers
-//are created where the master lives (the main thread)
-//Clearly a separate solution is to create and configure master
-//in a separate thread. But this is much simpler.
-G4ThreadFunReturnType startWork(G4ThreadFunArgType arg)
-{
-    tbb::task_list* tasks = static_cast<tbb::task_list*>(arg);
-    //We assume at least one /run/beamOn was executed, thus the tasklist is now filled,
-    //lets start TBB
-    try {
-        std::cout<<"Now calling 'tbb::task::spawn_work_and_wait' "<<std::endl;
-        tbb::task::spawn_root_and_wait( *tasks );
-    } catch(std::exception& e) {
-        std::cerr<<"Error occurred. Error info is:\""<<e.what()<<"\""<<std::endl;
-    }
-    return static_cast<G4ThreadFunReturnType>(0);
-}
-
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-int main(int argc,char** argv)
+int main(int argc, char** argv)
 {
   // Instantiate G4UIExecutive if there are no arguments (interactive mode)
   G4UIExecutive* ui = 0;
-  if ( argc == 1 ) {
+  if(argc == 1)
+  {
     ui = new G4UIExecutive(argc, argv);
   }
 
   // Choose the Random engine
 
   G4Random::setTheEngine(new CLHEP::RanecuEngine);
-  
-  unsigned int numCoresAvailable=  G4Threading::G4GetNumberOfCores();
-  unsigned int numberOfCoresToUse= (numCoresAvailable > 1 ) ? 2 : 1 ;
-  //=== TBB engine initialization
-  tbb::task_scheduler_init init( numberOfCoresToUse );
-  tbb::task_list tasks;
-   
-  SimpleTbbMasterRunManager* runManager = new SimpleTbbMasterRunManager;
-    
-  //Set TBB specific data to run-manager, 1 event per tbb::task (e.g. Nevents == N tasks)
-  //Note that a /run/beamOn command will just create tasks and add them to tasks
-  runManager->SetNumberEventsPerTask(1); //Not needed since 1 is however default
-  runManager->SetTaskList(&tasks);
-  //Set user-initialization that specify threading model, in this case TBB.
-  //This overwrites default that uses pthreads
-  runManager->SetUserInitialization(new tbbUserWorkerInitialization );
-    
-  //==== Geant4 specific stuff, from now up to END-G4 comment is copy from MT example
+
+  auto runManager =
+    G4RunManagerFactory::CreateRunManager(G4RunManagerType::TBB);
+
+  //==== Geant4 specific stuff, from now up to END-G4 comment is copy from MT
+  // example
   // Set mandatory initialization classes
 
   runManager->SetUserInitialization(new B2bDetectorConstruction());
@@ -108,48 +69,37 @@ int main(int argc,char** argv)
   G4VModularPhysicsList* physicsList = new FTFP_BERT;
   physicsList->RegisterPhysics(new G4StepLimiterPhysics());
   runManager->SetUserInitialization(physicsList);
-    
+
   // Set user action classes
 
   runManager->SetUserInitialization(new B2ActionInitialization());
-  
+
   // Initialize G4 kernel
 
   runManager->Initialize();
-  
+
   // Get the pointer to the User Interface manager
   G4UImanager* UImanager = G4UImanager::GetUIpointer();
 
-  if (!ui)   // batch mode
-    {
-      G4String command = "/control/execute ";
-      G4String fileName = argv[1];
-      UImanager->ApplyCommand(command+fileName);
-    }
+  if(!ui)  // batch mode
+  {
+    G4String command  = "/control/execute ";
+    G4String fileName = argv[1];
+    UImanager->ApplyCommand(command + fileName);
+  }
   else
-    {  // interactive mode : define UI session
-#if 1
-      G4int nEvents= 50; 
-      runManager->BeamOn(nEvents); 
-#else     
-      UImanager->ApplyCommand("/control/execute init.mac");
-      if (ui->IsGUI())
-         UImanager->ApplyCommand("/control/execute gui.mac");
-      ui->SessionStart();
-      delete ui;
-#endif
-    }
- //END-G4
-    G4Thread* aThread = new G4Thread;
-    G4THREADCREATE(aThread, startWork, static_cast<G4ThreadFunArgType>(&tasks));
-    
-    //Wait for work to be finised
-    if(aThread)
-        aThread->join();
-  
-    delete runManager;
+  {
+    // interactive mode : define UI session
+    UImanager->ApplyCommand("/control/execute init.mac");
+    if(ui->IsGUI())
+      UImanager->ApplyCommand("/control/execute gui.mac");
+    ui->SessionStart();
+    delete ui;
+  }
 
-    return 0;
+  delete runManager;
+
+  return 0;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....