X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FLauncher%2FLauncher_Job.cxx;h=2aae078fe1c87935dfc66f88c8d313d90f22da06;hb=a7e425483b5eb6a0491cbad5ef63cc67ccf64f7c;hp=980df5bfba08fa8376f699060ccddb1731bac8db;hpb=703cf8ca778de35a6b463d4b4fca7c36697d717f;p=modules%2Fkernel.git

diff --git a/src/Launcher/Launcher_Job.cxx b/src/Launcher/Launcher_Job.cxx
index 980df5bfb..2aae078fe 100644
--- a/src/Launcher/Launcher_Job.cxx
+++ b/src/Launcher/Launcher_Job.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2009-2017  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,6 +19,7 @@
 
 // Author: André RIBES - EDF R&D
 //
+//#define _DEBUG_
 #include "Launcher_Job.hxx"
 #include "Launcher.hxx"
 
@@ -26,7 +27,7 @@
 #include <libbatch/Constants.hxx>
 #endif
 
-using namespace std;
+#include <sstream>
 
 Launcher::Job::Job()
 {
@@ -58,7 +59,7 @@ Launcher::Job::Job()
 #endif
 }
 
-Launcher::Job::~Job() 
+Launcher::Job::~Job()
 {
   LAUNCHER_MESSAGE("Deleting job number: " << _number);
 #ifdef WITH_LIBBATCH
@@ -75,7 +76,7 @@ Launcher::Job::stopJob()
 #ifdef WITH_LIBBATCH
   if (_batch_job_id.getReference() != "undefined")
   {
-    try 
+    try
     {
       _batch_job_id.deleteJob();
     }
@@ -95,7 +96,7 @@ Launcher::Job::removeJob()
 #ifdef WITH_LIBBATCH
   if (_batch_job_id.getReference() != "undefined")
   {
-    try 
+    try
     {
       _batch_job_id.deleteJob();
     }
@@ -125,7 +126,7 @@ Launcher::Job::getJobName() const
   return _job_name;
 }
 
-void 
+void
 Launcher::Job::setState(const std::string & state)
 {
   // State of a Job: CREATED, QUEUED, RUNNING, FINISHED, FAILED
@@ -143,7 +144,7 @@ Launcher::Job::setState(const std::string & state)
   _state = state;
 }
 
-std::string 
+std::string
 Launcher::Job::getState() const
 {
   return _state;
@@ -156,7 +157,7 @@ Launcher::Job::getAssignedHostnames()
   return _assigned_hostnames;
 }
 
-void 
+void
 Launcher::Job::setNumber(const int & number)
 {
   if (_number != -1)
@@ -170,7 +171,7 @@ Launcher::Job::getNumber()
   return _number;
 }
 
-void 
+void
 Launcher::Job::setResourceDefinition(const ParserResourcesType & resource_definition)
 {
   // Check machine_definition
@@ -178,9 +179,11 @@ Launcher::Job::setResourceDefinition(const ParserResourcesType & resource_defini
   if (resource_definition.UserName == "")
   {
     user_name = getenv("USER");
+    if (user_name == "")
+      user_name = getenv("LOGNAME");
     if (user_name == "")
     {
-      std::string mess = "You must define a user name: into your resource description or with env variable USER";
+      std::string mess = "You must define a user name: into your resource description or with one of env variables USER/LOGNAME";
       throw LauncherException(mess);
     }
   }
@@ -191,13 +194,13 @@ Launcher::Job::setResourceDefinition(const ParserResourcesType & resource_defini
   _resource_definition.UserName = user_name;
 }
 
-ParserResourcesType 
+ParserResourcesType
 Launcher::Job::getResourceDefinition() const
 {
   return _resource_definition;
 }
 
-void 
+void
 Launcher::Job::setJobFile(const std::string & job_file)
 {
   // Check job file
@@ -219,7 +222,7 @@ Launcher::Job::getJobFile() const
 {
   return _job_file;
 }
-void 
+void
 Launcher::Job::setEnvFile(const std::string & env_file)
 {
   _env_file = env_file;
@@ -231,25 +234,25 @@ Launcher::Job::getEnvFile() const
   return _env_file;
 }
 
-void 
+void
 Launcher::Job::setWorkDirectory(const std::string & work_directory)
 {
   _work_directory = work_directory;
 }
 
-void 
+void
 Launcher::Job::setLocalDirectory(const std::string & local_directory)
 {
   _local_directory = local_directory;
 }
 
-void 
+void
 Launcher::Job::setResultDirectory(const std::string & result_directory)
 {
   _result_directory = result_directory;
 }
 
-void 
+void
 Launcher::Job::add_in_file(const std::string & file)
 {
   std::list<std::string>::iterator it = std::find(_in_files.begin(), _in_files.end(), file);
@@ -259,7 +262,7 @@ Launcher::Job::add_in_file(const std::string & file)
     std::cerr << "Launcher::Job::add_in_file -- Warning file was already entered in in_files: " << file << std::endl;
 }
 
-void 
+void
 Launcher::Job::add_out_file(const std::string & file)
 {
   std::list<std::string>::iterator it = std::find(_out_files.begin(), _out_files.end(), file);
@@ -269,7 +272,7 @@ Launcher::Job::add_out_file(const std::string & file)
     std::cerr << "Launcher::Job::add_out_file -- Warning file was already entered in out_files: " << file << std::endl;
 }
 
-void 
+void
 Launcher::Job::setMaximumDuration(const std::string & maximum_duration)
 {
   checkMaximumDuration(maximum_duration);
@@ -281,22 +284,22 @@ Launcher::Job::setMaximumDuration(const std::string & maximum_duration)
 void
 Launcher::Job::setLauncherFile(const std::string & launcher_file)
 {
-	_launcher_file = launcher_file;
+        _launcher_file = launcher_file;
 }
 void
 Launcher::Job::setLauncherArgs(const std::string & launcher_args)
 {
-	_launcher_args = launcher_args;
+        _launcher_args = launcher_args;
 }
 
-void 
+void
 Launcher::Job::setResourceRequiredParams(const resourceParams & resource_required_params)
 {
   checkResourceRequiredParams(resource_required_params);
   _resource_required_params = resource_required_params;
 }
 
-void 
+void
 Launcher::Job::setQueue(const std::string & queue)
 {
   _queue = queue;
@@ -343,13 +346,13 @@ Launcher::Job::setReference(const std::string & reference)
   _reference = reference;
 }
 
-std::string 
+std::string
 Launcher::Job::getWorkDirectory() const
 {
   return _work_directory;
 }
 
-std::string 
+std::string
 Launcher::Job::getLocalDirectory() const
 {
   return _local_directory;
@@ -361,19 +364,19 @@ Launcher::Job::getResultDirectory() const
   return _result_directory;
 }
 
-const std::list<std::string> & 
+const std::list<std::string> &
 Launcher::Job::get_in_files() const
 {
   return _in_files;
 }
 
-const std::list<std::string> & 
+const std::list<std::string> &
 Launcher::Job::get_out_files() const
 {
   return _out_files;
 }
 
-std::string 
+std::string
 Launcher::Job::getMaximumDuration() const
 {
   return _maximum_duration;
@@ -383,21 +386,21 @@ Launcher::Job::getMaximumDuration() const
 std::string
 Launcher::Job::getLauncherFile() const
 {
-	return _launcher_file;
+        return _launcher_file;
 }
 std::string
 Launcher::Job::getLauncherArgs() const
 {
-	return _launcher_args;
+        return _launcher_args;
 }
 
-resourceParams 
+resourceParams
 Launcher::Job::getResourceRequiredParams() const
 {
   return _resource_required_params;
 }
 
-std::string 
+std::string
 Launcher::Job::getQueue() const
 {
   return _queue;
@@ -439,7 +442,7 @@ Launcher::Job::getReference() const
   return _reference;
 }
 
-void 
+void
 Launcher::Job::checkMaximumDuration(const std::string & maximum_duration)
 {
   std::string result("");
@@ -453,7 +456,7 @@ Launcher::Job::checkMaximumDuration(const std::string & maximum_duration)
     std::string begin_edt_value = edt_value.substr(0, pos);
     std::string mid_edt_value = edt_value.substr(pos, 1);
     std::string end_edt_value = edt_value.substr(pos + 1, edt_value.npos);
-  
+
     long value;
     std::istringstream iss(begin_edt_value);
     if (!(iss >> value)) {
@@ -477,7 +480,7 @@ Launcher::Job::checkMaximumDuration(const std::string & maximum_duration)
     throw LauncherException(result);
 }
 
-void 
+void
 Launcher::Job::checkResourceRequiredParams(const resourceParams & resource_required_params)
 {
   // nb_proc has be to > 0
@@ -488,7 +491,7 @@ Launcher::Job::checkResourceRequiredParams(const resourceParams & resource_requi
   }
 }
 
-long 
+long
 Launcher::Job::convertMaximumDuration(const std::string & edt)
 {
   long hh, mm, ret;
@@ -509,20 +512,20 @@ Launcher::Job::convertMaximumDuration(const std::string & edt)
   return ret;
 }
 
-std::string 
+std::string
 Launcher::Job::getLaunchDate() const
 {
   time_t rawtime;
   time(&rawtime);
   std::string launch_date = ctime(&rawtime);
-  int i = 0 ;
-  for (;i < launch_date.size(); i++) 
+  size_t i = 0 ;
+  for (;i < launch_date.size(); i++)
     if (launch_date[i] == '/' ||
         launch_date[i] == '-' ||
         launch_date[i] == ':' ||
-        launch_date[i] == ' ') 
+        launch_date[i] == ' ')
       launch_date[i] = '_';
-  launch_date.erase(--launch_date.end()); // Last caracter is a \n
+  launch_date.erase(--launch_date.end()); // Last character is a \n
 
   return launch_date;
 }
@@ -552,7 +555,7 @@ Launcher::Job::updateJobState()
 }
 
 #ifdef WITH_LIBBATCH
-Batch::Job * 
+Batch::Job *
 Launcher::Job::getBatchJob()
 {
   update_job();
@@ -578,15 +581,27 @@ Launcher::Job::common_job_params()
     params[Batch::MEMPERCPU] = (long)_mem_per_cpu;
   }
 
-  // We define a default directory based on user time
+  // We define a default directory
   if (_work_directory == "")
   {
     const size_t BUFSIZE = 32;
     char date[BUFSIZE];
     time_t curtime = time(NULL);
     strftime(date, BUFSIZE, "%Y_%m_%d__%H_%M_%S", localtime(&curtime));
-    _work_directory = std::string("$HOME/Batch/workdir_");
-    _work_directory += date;
+    if(!_resource_definition.working_directory.empty())
+    {
+      std::string date_dir = std::string("/job_") + date;
+      std::ostringstream str_pid;
+      str_pid << ::getpid();
+      std::string job_dir = date_dir + "-" + str_pid.str();
+
+      _work_directory = _resource_definition.working_directory + job_dir;
+    }
+    else
+    {
+      _work_directory = std::string("/$HOME/Batch/workdir_");
+      _work_directory += date;
+    }
   }
   params[Batch::WORKDIR] = _work_directory;
 
@@ -602,7 +617,7 @@ Launcher::Job::common_job_params()
   std::list<std::string> in_files(_in_files);
   in_files.push_back(_job_file);
   if (_env_file != "")
-	  in_files.push_back(_env_file);
+          in_files.push_back(_env_file);
   for(std::list<std::string>::iterator it = in_files.begin(); it != in_files.end(); it++)
   {
     std::string file = *it;
@@ -615,31 +630,34 @@ Launcher::Job::common_job_params()
 #ifndef WIN32
       local_file = _local_directory + "/" + file;
 #else
-	  local_file = file;
+      local_file = file;
 #endif
-    
+
     // remote file -> get only file name from in_files
     size_t found = file.find_last_of("/");
     std::string remote_file = _work_directory + "/" + file.substr(found+1);
 
     params[Batch::INFILE] += Batch::Couple(local_file, remote_file);
   }
-   
+
   // _out_files
   for(std::list<std::string>::iterator it = _out_files.begin(); it != _out_files.end(); it++)
   {
     std::string file = *it;
-
-    // local file 
-    size_t found = file.find_last_of("/");
-    std::string local_file = _result_directory +  "/" + file.substr(found+1);
-
     // remote file -> If file is not an absolute path, we apply _work_directory
     std::string remote_file;
+    std::string local_file;
     if (file.substr(0, 1) == std::string("/"))
+    {
       remote_file = file;
+      size_t found = file.find_last_of("/");
+      local_file = file.substr(found+1);
+    }
     else
+    {
       remote_file = _work_directory + "/" + file;
+      local_file = file;
+    }
 
     params[Batch::OUTFILE] += Batch::Couple(local_file, remote_file);
   }
@@ -671,20 +689,20 @@ Launcher::Job::common_job_params()
   return params;
 }
 
-void 
+void
 Launcher::Job::setBatchManagerJobId(Batch::JobId batch_manager_job_id)
 {
   _batch_job_id = batch_manager_job_id;
 }
 
-Batch::JobId 
+Batch::JobId
 Launcher::Job::getBatchManagerJobId() const
 {
   return _batch_job_id;
 }
 #endif
 
-void 
+void
 Launcher::Job::addSpecificParameter(const std::string & name,
                                       const std::string & value)
 {