- Timestamp:
- Jul 31, 2011, 5:15:13 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/output/src/libraries/core/command/TclThreadManager.cc
r8351 r8806 225 225 TclThreadManager::getInstance().numInterpreterBundles_++; 226 226 TclThreadManager::createWithId(TclThreadManager::getInstance().numInterpreterBundles_); 227 COUT(0) << "Created new Tcl-interpreter with ID " << TclThreadManager::getInstance().numInterpreterBundles_ << std::endl;227 orxout(user_info) << "Created new Tcl-interpreter with ID " << TclThreadManager::getInstance().numInterpreterBundles_ << endl; 228 228 return TclThreadManager::getInstance().numInterpreterBundles_; 229 229 } … … 288 288 } 289 289 catch (const Tcl::tcl_error& e) 290 { bundle->interpreter_ = 0; COUT(1) << "Tcl error while creating Tcl-interpreter (" << id_string << "): " << e.what() << std::endl; } 290 { 291 bundle->interpreter_ = 0; 292 orxout(user_error, context::tcl) << "Tcl error while creating Tcl-interpreter (" << id_string << "): " << e.what() << endl; 293 } 291 294 } 292 295 … … 407 410 { 408 411 // This query would lead to a deadlock - return with an error 409 TclThreadManager::error(" Error:Circular query (" + this->dumpList(source_bundle->queriers_.getList()) + ' ' + multi_cast<std::string>(source_bundle->id_) \412 TclThreadManager::error("Circular query (" + this->dumpList(source_bundle->queriers_.getList()) + ' ' + multi_cast<std::string>(source_bundle->id_) \ 410 413 + " -> " + multi_cast<std::string>(target_bundle->id_) \ 411 414 + "), couldn't query Tcl-interpreter with ID " + multi_cast<std::string>(target_bundle->id_) \ … … 448 451 switch (error) 449 452 { 450 case CommandExecutor::Error: TclThreadManager::error(" Error:Can't execute command \"" + command + "\", command doesn't exist. (T)"); break;451 case CommandExecutor::Incomplete: TclThreadManager::error(" Error:Can't execute command \"" + command + "\", not enough arguments given. (T)"); break;452 case CommandExecutor::Deactivated: TclThreadManager::error(" Error:Can't execute command \"" + command + "\", command is not active. (T)"); break;453 case CommandExecutor::Denied: TclThreadManager::error(" Error:Can't execute command \"" + command + "\", access denied. (T)"); break;453 case CommandExecutor::Error: TclThreadManager::error("Can't execute command \"" + command + "\", command doesn't exist. (T)"); break; 454 case CommandExecutor::Incomplete: TclThreadManager::error("Can't execute command \"" + command + "\", not enough arguments given. (T)"); break; 455 case CommandExecutor::Deactivated: TclThreadManager::error("Can't execute command \"" + command + "\", command is not active. (T)"); break; 456 case CommandExecutor::Denied: TclThreadManager::error("Can't execute command \"" + command + "\", access denied. (T)"); break; 454 457 } 455 458 } … … 476 479 // This happens if the main thread tries to query a busy interpreter 477 480 // To avoid a lock of the main thread, we simply don't proceed with the query in this case 478 TclThreadManager::error(" Error:Couldn't query Tcl-interpreter with ID " + multi_cast<std::string>(target_bundle->id_) + ", interpreter is busy right now.");481 TclThreadManager::error("Couldn't query Tcl-interpreter with ID " + multi_cast<std::string>(target_bundle->id_) + ", interpreter is busy right now."); 479 482 } 480 483 } … … 522 525 else 523 526 { 524 TclThreadManager::error(" Error:No Tcl-interpreter with ID " + multi_cast<std::string>(id) + " existing.");527 TclThreadManager::error("No Tcl-interpreter with ID " + multi_cast<std::string>(id) + " existing."); 525 528 return 0; 526 529 }
Note: See TracChangeset
for help on using the changeset viewer.