[Saga-devel] saga SVN commit 3249: /trunk/adaptors/default/job/

[amerzky at cct.lsu.edu]

User: amerzky
Date: 2009/01/09 05:20 AM

Modified:
 /trunk/adaptors/default/job/
  default_job_service.cpp, posix_job.cpp

Log:
 more a-url-is-a-url-is-a-url fixes
 A

File Changes:

Directory: /trunk/adaptors/default/job/
=======================================

File [modified]: default_job_service.cpp
Delta lines: +10 -10
===================================================================
--- trunk/adaptors/default/job/default_job_service.cpp	2009-01-09 11:17:09 UTC (rev 3248)
+++ trunk/adaptors/default/job/default_job_service.cpp	2009-01-09 11:19:55 UTC (rev 3249)
@@ -108,10 +108,10 @@
     }
     
     // get resource manager string
-    std::string rm;
+    saga::url rm;
     { 
         instance_data data(this);
-        rm = data->rm_.get_string();             // use resource manager as provided
+        rm = data->rm_;             // use resource manager as provided
     }
 
     saga::job::job job = saga::adaptors::job(rm, jd, proxy_->get_session());
@@ -264,10 +264,10 @@
     }
 
     // get resource manager string
-    std::string rm;
+    saga::url rm;
     { 
         instance_data data(this);
-        rm = data->rm_.get_string();             // use resource manager as provided
+        rm = data->rm_;             // use resource manager as provided
     }
 
     // create a new job instance
@@ -312,10 +312,10 @@
         saga::attributes::common_true);
 
     // get resource manager string
-    std::string rm;
+    saga::url rm;
     { 
         instance_data data(this);
-        rm = data->rm_.get_string();             // use resource manager as provided
+        rm = data->rm_;             // use resource manager as provided
     }
 
     // create a new job instance
@@ -347,10 +347,10 @@
 void job_service_cpi_impl::sync_get_job(saga::job::job & ret, std::string jobid)
 {
     // get resource manager string
-    std::string rm;
+    saga::url rm;
     { 
         instance_data data(this);
-        rm = data->rm_.get_string();             // use resource manager as provided
+        rm = data->rm_;             // use resource manager as provided
     }
     saga::job::job job = saga::adaptors::job(rm, jobid, proxy_->get_session());
 
@@ -385,10 +385,10 @@
 void job_service_cpi_impl::sync_get_self(saga::job::self& ret)
 {
     // get resource manager string
-    std::string rm;
+    saga::url rm;
     { 
         instance_data data(this);
-        rm = data->rm_.get_string();     // use resource manager as provided
+        rm = data->rm_;     // use resource manager as provided
     }
 
     // get at our jobid

File [modified]: posix_job.cpp
Delta lines: +14 -1
===================================================================
--- trunk/adaptors/default/job/posix_job.cpp	2009-01-09 11:17:09 UTC (rev 3248)
+++ trunk/adaptors/default/job/posix_job.cpp	2009-01-09 11:19:55 UTC (rev 3249)
@@ -65,7 +65,7 @@
 {
   log ("posix job c'tor");
 
-  instance_data idata (this);
+  instance_data     idata (this);
   adaptor_data_type adata (this);
 
   // check if we have a rm url.  If yes, check if we are asked for.
@@ -108,6 +108,7 @@
 
   log ("posix job ctor 1");
 
+  SAGA_LOG_INFO("posix job ctor");
 
 
   if ( idata->init_from_jobid_ )
@@ -404,6 +405,7 @@
                         saga::NotImplemented);
   }
 
+  SAGA_LOG_INFO("posix job run");
 
   // retrieve and check saga job description for this host
   jd_ = idata->jd_;
@@ -417,6 +419,8 @@
   { 
     std::string exe = jd_.get_attribute (saga::job::attributes::description_executable);
 
+    SAGA_LOG_INFO(exe.c_str ());
+
     struct ::stat stat_buf;
     int ret = ::stat (exe.c_str (), &stat_buf);
 
@@ -428,7 +432,16 @@
     }
   }
 
+  if ( jd_.attribute_exists (saga::job::attributes::description_arguments) )
+  {
+    std::vector <std::string> args = jd_.get_vector_attribute (saga::job::attributes::description_arguments);
 
+    for ( int i = 0; i < args.size (); i++ )
+    {
+      SAGA_LOG_INFO (args[i].c_str ());
+    }
+  }
+
   if ( impl_->get_state () != saga::job::New )
   {
     SAGA_ADAPTOR_THROW ("run can only be called on New jobs.",