[Saga-devel] saga SVN commit 3237: /trunk/
amerzky at cct.lsu.edu
amerzky at cct.lsu.edu
Thu Jan 1 12:43:58 CST 2009
User: amerzky
Date: 2009/01/01 12:43 PM
Modified:
/trunk/adaptors/OMII/gridsam/
gridsam_jobcontrol.hpp, gridsam_jobmonitoring.hpp, gridsam_jobsubmission.hpp, omii_gridsam_job.cpp
/trunk/adaptors/default/advert/
common_helpers.hpp
/trunk/adaptors/default/replica/
common_helpers.hpp
/trunk/bindings/saga/C/engine/
saga_c_util.hpp
/trunk/saga/impl/engine/
session.cpp, session.hpp
/trunk/saga/saga/
session.cpp, session.hpp
/trunk/tools/shell/
remove_proxy.cpp
Log:
Well, what the heck: doing the switch from std::list to
std::vector for session.list_contexts() anyway...
A
File Changes:
Directory: /trunk/adaptors/default/advert/
==========================================
File [modified]: common_helpers.hpp
Delta lines: +4 -4
===================================================================
--- trunk/adaptors/default/advert/common_helpers.hpp 2008-12-30 17:03:04 UTC (rev 3236)
+++ trunk/adaptors/default/advert/common_helpers.hpp 2009-01-01 18:43:15 UTC (rev 3237)
@@ -6,7 +6,7 @@
#if !defined(ADAPTORS_DEFAULT_ADVERT_COMMON_HELPERS_HPP)
#define ADAPTORS_DEFAULT_ADVERT_COMMON_HELPERS_HPP
-#include <list>
+#include <vector>
#include <string>
#include <boost/tokenizer.hpp>
@@ -178,9 +178,9 @@
connectstring connectstr(connect);
// set username and password from a (possibly) existing context
- std::list<saga::context> ctxs(s.list_contexts());
- std::list<saga::context>::iterator end = ctxs.end();
- for (std::list<saga::context>::iterator it = ctxs.begin(); it != end; ++it)
+ std::vector<saga::context> ctxs(s.list_contexts());
+ std::vector<saga::context>::iterator end = ctxs.end();
+ for (std::vector<saga::context>::iterator it = ctxs.begin(); it != end; ++it)
{
if ((*it).attribute_exists("saga::attributes::context_type") &&
"default_advert_db" == (*it).get_attribute(saga::attributes::context_type))
Directory: /trunk/bindings/saga/C/engine/
=========================================
File [modified]: saga_c_util.hpp
Delta lines: +2 -2
===================================================================
--- trunk/bindings/saga/C/engine/saga_c_util.hpp 2008-12-30 17:03:04 UTC (rev 3236)
+++ trunk/bindings/saga/C/engine/saga_c_util.hpp 2009-01-01 18:43:15 UTC (rev 3237)
@@ -14,7 +14,7 @@
#error "This files needs to be compiled in C++ mode"
#endif
-#include <list>
+#include <vector>
///////////////////////////////////////////////////////////////////////////////
// Definition of all types needed in the SAGA C language binding
@@ -25,7 +25,7 @@
///////////////////////////////////////////////////////////////////////////////
struct saga_context_list_impl
{
- std::list<saga::context> data;
+ std::vector<saga::context> data;
};
///////////////////////////////////////////////////////////////////////////////
Directory: /trunk/saga/impl/engine/
===================================
File [modified]: session.cpp
Delta lines: +3 -3
===================================================================
--- trunk/saga/impl/engine/session.cpp 2008-12-30 17:03:04 UTC (rev 3236)
+++ trunk/saga/impl/engine/session.cpp 2009-01-01 18:43:15 UTC (rev 3237)
@@ -76,7 +76,7 @@
///////////////////////////////////////////////////////////////////////////
struct context_list : public base_context_list
{
- typedef std::list <saga::context> context_list_type;
+ typedef std::vector <saga::context> context_list_type;
context_list(saga::impl::session const* s)
: base_context_list(s)
@@ -164,7 +164,7 @@
{
saga::session s (false);
- typedef std::list<saga::context> context_list_type;
+ typedef std::vector<saga::context> context_list_type;
context_list_type ctxlist = list_contexts();
context_list_type::const_iterator end = ctxlist.end();
@@ -178,7 +178,7 @@
}
// maintain internal list of context's
- std::list<saga::context> session::list_contexts() const
+ std::vector<saga::context> session::list_contexts() const
{
mutex_type::scoped_lock lock(mtx_);
if (NULL == contexts_)
File [modified]: session.hpp
Delta lines: +1 -1
===================================================================
--- trunk/saga/impl/engine/session.hpp 2008-12-30 17:03:04 UTC (rev 3236)
+++ trunk/saga/impl/engine/session.hpp 2009-01-01 18:43:15 UTC (rev 3237)
@@ -112,7 +112,7 @@
*
* @return the context list
*/
- std::list<saga::context> list_contexts() const;
+ std::vector<saga::context> list_contexts() const;
/**
* Removes a context from the context list
Directory: /trunk/adaptors/OMII/gridsam/
========================================
File [modified]: gridsam_jobcontrol.hpp
Delta lines: +3 -3
===================================================================
--- trunk/adaptors/OMII/gridsam/gridsam_jobcontrol.hpp 2008-12-30 17:03:04 UTC (rev 3236)
+++ trunk/adaptors/OMII/gridsam/gridsam_jobcontrol.hpp 2009-01-01 18:43:15 UTC (rev 3237)
@@ -100,14 +100,14 @@
public:
JobControl(saga::impl::v1_0::cpi* cpi, std::string const& endpoint,
- std::list<saga::context> const& ctxs, std::string const& jobid)
+ std::vector<saga::context> const& ctxs, std::string const& jobid)
: endpoint_(endpoint), request_(this_(), jobid), response_(this_(), jobid)
{
this->soap_endpoint = endpoint_.c_str();
saga::impl::exception_list exceptions;
- std::list<saga::context>::const_iterator end = ctxs.end();
- for (std::list<saga::context>::const_iterator it = ctxs.begin();
+ std::vector<saga::context>::const_iterator end = ctxs.end();
+ for (std::vector<saga::context>::const_iterator it = ctxs.begin();
it != end; ++it)
{
std::string certs, usercert, userkey, userpass;
File [modified]: gridsam_jobmonitoring.hpp
Delta lines: +4 -4
===================================================================
--- trunk/adaptors/OMII/gridsam/gridsam_jobmonitoring.hpp 2008-12-30 17:03:04 UTC (rev 3236)
+++ trunk/adaptors/OMII/gridsam/gridsam_jobmonitoring.hpp 2009-01-01 18:43:15 UTC (rev 3237)
@@ -243,14 +243,14 @@
public:
JobMonitoring(saga::impl::v1_0::cpi* cpi, std::string const& endpoint,
- std::list<saga::context> const& ctxs, std::string const& jobid)
+ std::vector<saga::context> const& ctxs, std::string const& jobid)
: endpoint_(endpoint), request_(this_(), jobid), response_(this_(), jobid)
{
this->soap_endpoint = endpoint_.c_str();
saga::impl::exception_list exceptions;
- std::list<saga::context>::const_iterator end = ctxs.end();
- for (std::list<saga::context>::const_iterator it = ctxs.begin();
+ std::vector<saga::context>::const_iterator end = ctxs.end();
+ for (std::vector<saga::context>::const_iterator it = ctxs.begin();
it != end; ++it)
{
std::string certs, usercert, userkey, userpass;
@@ -327,7 +327,7 @@
///////////////////////////////////////////////////////////////////////////////
inline saga::job::state
state_from_gridsam(saga::impl::v1_0::cpi* cpi,
- std::string const& endpoint, std::list<saga::context> const& ctxs,
+ std::string const& endpoint, std::vector<saga::context> const& ctxs,
std::string const& gridsam_id, std::string* desc = NULL,
int* exit_code = NULL)
{
File [modified]: gridsam_jobsubmission.hpp
Delta lines: +3 -3
===================================================================
--- trunk/adaptors/OMII/gridsam/gridsam_jobsubmission.hpp 2008-12-30 17:03:04 UTC (rev 3236)
+++ trunk/adaptors/OMII/gridsam/gridsam_jobsubmission.hpp 2009-01-01 18:43:15 UTC (rev 3237)
@@ -773,14 +773,14 @@
public:
JobSubmission(saga::impl::v1_0::cpi* cpi, std::string const& endpoint,
- std::list<saga::context> const& ctxs, std::string const& exename)
+ std::vector<saga::context> const& ctxs, std::string const& exename)
: endpoint_(endpoint), request_(this_(), exename), response_(this_())
{
this->soap_endpoint = endpoint_.c_str();
saga::impl::exception_list exceptions;
- std::list<saga::context>::const_iterator end = ctxs.end();
- for (std::list<saga::context>::const_iterator it = ctxs.begin();
+ std::vector<saga::context>::const_iterator end = ctxs.end();
+ for (std::vector<saga::context>::const_iterator it = ctxs.begin();
it != end; ++it)
{
std::string certs, usercert, userkey, userpass;
File [modified]: omii_gridsam_job.cpp
Delta lines: +8 -8
===================================================================
--- trunk/adaptors/OMII/gridsam/omii_gridsam_job.cpp 2008-12-30 17:03:04 UTC (rev 3236)
+++ trunk/adaptors/OMII/gridsam/omii_gridsam_job.cpp 2009-01-01 18:43:15 UTC (rev 3237)
@@ -198,11 +198,11 @@
}
///////////////////////////////////////////////////////////////////////////////
-bool get_omii_gridsam_contexts(saga::session s, std::list<saga::context>& ctxs_)
+bool get_omii_gridsam_contexts(saga::session s, std::vector<saga::context>& ctxs_)
{
- std::list<saga::context> ctxs(s.list_contexts());
- std::list<saga::context>::iterator end = ctxs.end();
- for (std::list<saga::context>::iterator it = ctxs.begin(); it != end; ++it)
+ std::vector<saga::context> ctxs(s.list_contexts());
+ std::vector<saga::context>::iterator end = ctxs.end();
+ for (std::vector<saga::context>::iterator it = ctxs.begin(); it != end; ++it)
{
if (!(*it).attribute_exists(saga::attributes::context_type))
continue;
@@ -227,7 +227,7 @@
}
else {
saga::session s(this->proxy_->get_session());
- std::list<saga::context> ctxs;
+ std::vector<saga::context> ctxs;
if (!get_omii_gridsam_contexts(s, ctxs))
{
SAGA_ADAPTOR_THROW(
@@ -273,7 +273,7 @@
}
else {
saga::session s(this->proxy_->get_session());
- std::list<saga::context> ctxs;
+ std::vector<saga::context> ctxs;
if (!get_omii_gridsam_contexts(s, ctxs))
{
SAGA_ADAPTOR_THROW(
@@ -409,7 +409,7 @@
try {
saga::session s(this->proxy_->get_session());
- std::list<saga::context> ctxs;
+ std::vector<saga::context> ctxs;
if (!get_omii_gridsam_contexts(s, ctxs))
{
SAGA_ADAPTOR_THROW(
@@ -642,7 +642,7 @@
}
else {
saga::session s(this->proxy_->get_session());
- std::list<saga::context> ctxs;
+ std::vector<saga::context> ctxs;
if (!get_omii_gridsam_contexts(s, ctxs))
{
SAGA_ADAPTOR_THROW(
Directory: /trunk/adaptors/default/replica/
===========================================
File [modified]: common_helpers.hpp
Delta lines: +4 -4
===================================================================
--- trunk/adaptors/default/replica/common_helpers.hpp 2008-12-30 17:03:04 UTC (rev 3236)
+++ trunk/adaptors/default/replica/common_helpers.hpp 2009-01-01 18:43:15 UTC (rev 3237)
@@ -6,7 +6,7 @@
#if !defined(ADAPTORS_DEFAULT_REPLICA_COMMON_HELPERS_HPP)
#define ADAPTORS_DEFAULT_REPLICA_COMMON_HELPERS_HPP
-#include <list>
+#include <vector>
#include <string>
#include <boost/config.hpp>
@@ -176,9 +176,9 @@
connectstring connectstr(connect);
// set username and password from a (possibly) existing context
- std::list<saga::context> ctxs(s.list_contexts());
- std::list<saga::context>::iterator end = ctxs.end();
- for (std::list<saga::context>::iterator it = ctxs.begin(); it != end; ++it)
+ std::vector<saga::context> ctxs(s.list_contexts());
+ std::vector<saga::context>::iterator end = ctxs.end();
+ for (std::vector<saga::context>::iterator it = ctxs.begin(); it != end; ++it)
{
if ((*it).attribute_exists("saga::attributes::context_type") &&
"default_replica_db" == (*it).get_attribute(saga::attributes::context_type))
Directory: /trunk/saga/saga/
============================
File [modified]: session.cpp
Delta lines: +1 -1
===================================================================
--- trunk/saga/saga/session.cpp 2008-12-30 17:03:04 UTC (rev 3236)
+++ trunk/saga/saga/session.cpp 2009-01-01 18:43:15 UTC (rev 3237)
@@ -156,7 +156,7 @@
get_impl()->remove_context (c);
}
- std::list <context>
+ std::vector <context>
session::list_contexts() const
{
return get_impl()->list_contexts();
File [modified]: session.hpp
Delta lines: +1 -1
===================================================================
--- trunk/saga/saga/session.hpp 2008-12-30 17:03:04 UTC (rev 3236)
+++ trunk/saga/saga/session.hpp 2009-01-01 18:43:15 UTC (rev 3237)
@@ -100,7 +100,7 @@
*
*
*/
- std::list <saga::context> list_contexts() const;
+ std::vector <saga::context> list_contexts() const;
/*! \brief Brief %description starts here
*
Directory: /trunk/tools/shell/
==============================
File [modified]: remove_proxy.cpp
Delta lines: +3 -3
===================================================================
--- trunk/tools/shell/remove_proxy.cpp 2008-12-30 17:03:04 UTC (rev 3236)
+++ trunk/tools/shell/remove_proxy.cpp 2009-01-01 18:43:15 UTC (rev 3237)
@@ -38,11 +38,11 @@
// remove the proxies of the given type
std::string type (kp->context_type);
- std::list<saga::context> ctxs = session_.list_contexts();
+ std::vector<saga::context> ctxs = session_.list_contexts();
bool found_one = false;
- std::list<saga::context>::iterator end = ctxs.end();
- for (std::list<saga::context>::iterator it = ctxs.begin(); it != end; ++it)
+ std::vector<saga::context>::iterator end = ctxs.end();
+ for (std::vector<saga::context>::iterator it = ctxs.begin(); it != end; ++it)
{
if ((*it).attribute_exists(saga::attributes::context_type) &&
type == (*it).get_attribute(saga::attributes::context_type))
More information about the saga-devel
mailing list