Changeset 542
- Timestamp:
- 02/10/11 11:34:11 (16 months ago)
- File:
-
- 1 edited
-
trunk/avango-core/src/avango/network/NetNode.cpp (modified) (36 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/avango-core/src/avango/network/NetNode.cpp
r1 r542 197 197 av::NetNode::applyStateFragments() 198 198 { 199 #ifdef AVANGO_DEBUG 200 logger.debug() << "av::NetNode::applyStateFragments:" ; 201 #endif 199 202 { 200 203 StateUpdateList::iterator current(mStateUpdates.begin()); … … 229 232 { 230 233 #ifdef AVANGO_DEBUG 231 LOG_TRACE(logger) << "av::NetNode::register_well_known: " 234 //LOG_TRACE(logger) << "av::NetNode::register_well_known: " 235 logger.debug()<< "av::NetNode::register_well_known: " 232 236 << "well-known id: " 233 237 << id; … … 269 273 if (obj->isDistributed()) { 270 274 #ifdef AVANGO_DEBUG 271 LOG_TRACE(logger)<< "av::NetNode::unregister_well_known: "275 logger.debug()<< "av::NetNode::unregister_well_known: " 272 276 << "well-known id: " 273 277 << obj->netID(); … … 304 308 { 305 309 #ifdef AVANGO_DEBUG 306 LOG_TRACE(logger)<< "av::NetNode::register_obj: "310 logger.debug()<< "av::NetNode::register_obj: " 307 311 << "id: " 308 312 << id; … … 342 346 343 347 #ifdef AVANGO_DEBUG 344 LOG_TRACE(logger)<< "av::NetNode::unregister_obj: "348 logger.debug()<< "av::NetNode::unregister_obj: " 345 349 << "id: " 346 350 << obj->netID(); … … 373 377 { 374 378 #ifdef AVANGO_DEBUG 375 LOG_TRACE(logger)<< "av::NetNode::notify_creations: "379 logger.debug()<< "av::NetNode::notify_creations: " 376 380 << "creations pending: " 377 381 << mPendingCreations.size(); … … 424 428 { 425 429 #ifdef AVANGO_DEBUG 426 LOG_TRACE(logger)<< "av::NetNode::notify_updates: "430 logger.debug()<< "av::NetNode::notify_updates: " 427 431 << "updates pending: " 428 432 << mPendingUpdates.size(); … … 463 467 { 464 468 #ifdef AVANGO_DEBUG 465 LOG_TRACE(logger)<< "av::NetNode::notify_deletes: "469 logger.debug()<< "av::NetNode::notify_deletes: " 466 470 << "deletes pending: " 467 471 << mPendingDeletes.size(); … … 507 511 #ifdef AVANGO_DEBUG 508 512 { 509 LOG_TRACE(logger)<< "av::NetNode::lookup: "513 logger.debug()<< "av::NetNode::lookup: " 510 514 << "searching w/in " 511 515 << mWellKnownObjects.size() … … 515 519 516 520 while (i != mWellKnownObjects.end()) { 517 LOG_TRACE(logger)<< "av::NetNode::lookup: "521 logger.debug()<< "av::NetNode::lookup: " 518 522 << (*i).first 519 523 << ":" … … 528 532 if (i == mWellKnownObjects.end()) { 529 533 #ifdef AVANGO_DEBUG 530 LOG_TRACE(logger)<< "av::NetNode::lookup: "534 logger.debug()<< "av::NetNode::lookup: " 531 535 << "failed for: " 532 536 << id; … … 536 540 result = (*i).second; 537 541 #ifdef AVANGO_DEBUG 538 LOG_TRACE(logger)<< "av::NetNode::lookup: "542 logger.debug()<< "av::NetNode::lookup: " 539 543 << "succeeded for: " 540 544 << id; … … 551 555 { 552 556 #ifdef AVANGO_DEBUG 553 LOG_TRACE(logger)<< "av::NetNode::joined: "557 logger.debug()<< "av::NetNode::joined: " 554 558 << "called"; 555 559 #endif … … 564 568 { 565 569 #ifdef AVANGO_DEBUG 566 LOG_TRACE(logger)<< "av::NetNode::block: "570 logger.debug()<< "av::NetNode::block: " 567 571 << "called"; 568 572 #endif … … 574 578 { 575 579 #ifdef AVANGO_DEBUG 576 LOG_TRACE(logger)<< "av::NetNode::unblock: "580 logger.debug()<< "av::NetNode::unblock: " 577 581 << "called"; 578 582 #endif … … 584 588 { 585 589 #ifdef AVANGO_DEBUG 586 LOG_TRACE(logger)<< "av::NetNode::set_state_fragment: from "590 logger.debug()<< "av::NetNode::set_state_fragment: from " 587 591 << fragment << " size: " 588 592 << stateMsg.getSize() << " bytes."; … … 614 618 615 619 #ifdef AVANGO_DEBUG 616 LOG_TRACE(logger)<< "av::NetNode::set_state_fragment: create messages: "620 logger.debug()<< "av::NetNode::set_state_fragment: create messages: " 617 621 << num_objects; 618 622 #endif … … 626 630 627 631 #ifdef AVANGO_DEBUG 628 LOG_TRACE(logger)<< "av::NetNode::set_state_fragment: update messages: "632 logger.debug()<< "av::NetNode::set_state_fragment: update messages: " 629 633 << num_objects; 630 634 #endif … … 636 640 637 641 #ifdef AVANGO_DEBUG 638 LOG_TRACE(logger)<< "av::NetNode::set_state_fragment: setting state fragment for "642 logger.debug()<< "av::NetNode::set_state_fragment: setting state fragment for " 639 643 << fragment; 640 644 #endif … … 684 688 685 689 #ifdef AVANGO_DEBUG 686 LOG_TRACE(logger)<< "av::NetNode::get_state_fragment: for "690 logger.debug()<< "av::NetNode::get_state_fragment: for " 687 691 << fragment << " size: " 688 692 << state_msg.getSize() << " bytes."; 689 LOG_TRACE(logger)<< "av::NetNode::get_state_fragment: create messages: " << state.size();690 LOG_TRACE(logger)<< "av::NetNode::get_state_fragment: update messages: " << state.size();693 logger.debug()<< "av::NetNode::get_state_fragment: create messages: " << state.size(); 694 logger.debug()<< "av::NetNode::get_state_fragment: update messages: " << state.size(); 691 695 #endif 692 696 } … … 704 708 705 709 #ifdef AVANGO_DEBUG 706 LOG_TRACE(logger)<< "av::NetNode::remove_state_fragment: for "710 logger.debug()<< "av::NetNode::remove_state_fragment: for " 707 711 << fragment; 708 712 #endif … … 767 771 { 768 772 #if AVANGO_DEBUG 769 LOG_TRACE(logger)<< "av::NetNode::distribute_object: '"773 logger.debug()<< "av::NetNode::distribute_object: '" 770 774 << getName (obj) 771 775 << "' w/ type id " … … 789 793 { 790 794 #ifdef AVANGO_DEBUG 791 LOG_TRACE(logger)<< "av::NetNode::undistribute_object: '"795 logger.debug()<< "av::NetNode::undistribute_object: '" 792 796 << getName (obj) 793 797 << "' w/ type id " … … 826 830 827 831 #ifdef AVANGO_DEBUG 828 LOG_TRACE(logger)<< "av::NetNode::update_distributed_object: '"832 logger.debug()<< "av::NetNode::update_distributed_object: '" 829 833 << getName (obj) 830 834 << "' w/ type id " … … 852 856 { 853 857 #ifdef AVANGO_DEBUG 854 LOG_TRACE(logger)<< "av::NetNode::make_create_message: start: '"858 logger.debug()<< "av::NetNode::make_create_message: start: '" 855 859 << obj->getTypeId().getName().c_str() 856 860 << "' w/ id: " … … 863 867 864 868 #ifdef AVANGO_DEBUG 865 LOG_TRACE(logger)<< "av::NetNode::make_create_message: done: '"869 logger.debug()<< "av::NetNode::make_create_message: done: '" 866 870 << obj->getTypeId().getName().c_str() 867 871 << "' w/ id: " … … 874 878 { 875 879 #ifdef AVANGO_DEBUG 876 LOG_TRACE(logger)<< "av::NetNode::make_update_message: start: '"880 logger.debug()<< "av::NetNode::make_update_message: start: '" 877 881 << obj->getTypeId().getName().c_str() 878 882 << "' w/ id: " … … 886 890 887 891 #ifdef AVANGO_DEBUG 888 LOG_TRACE(logger)<< "av::NetNode::make_update_message: done: '"892 logger.debug()<< "av::NetNode::make_update_message: done: '" 889 893 << obj->getTypeId().getName().c_str() 890 894 << "' w/ id: " … … 897 901 { 898 902 #ifdef AVANGO_DEBUG 899 LOG_TRACE(logger)<< "av::NetNode::make_delete_message: start: '"903 logger.debug()<< "av::NetNode::make_delete_message: start: '" 900 904 << obj->getTypeId().getName().c_str() 901 905 << "' w/ id: " … … 914 918 915 919 #ifdef AVANGO_DEBUG 916 LOG_TRACE(logger)<< "av::NetNode::make_delete_message: done: '"920 logger.debug()<< "av::NetNode::make_delete_message: done: '" 917 921 << obj->getTypeId().getName().c_str() 918 922 << "' (netID deleted)"; … … 974 978 975 979 #ifdef AVANGO_DEBUG 976 LOG_TRACE(logger)<< "av::NetNode::consume_create_message: creating a '"980 logger.debug()<< "av::NetNode::consume_create_message: creating a '" 977 981 << obj_type.getName().c_str() << "'"; 978 982 #endif … … 982 986 983 987 #if AVANGO_DEBUG 984 LOG_TRACE(logger)<< "av::NetNode::consume_create_message: "988 logger.debug()<< "av::NetNode::consume_create_message: " 985 989 << "about to register object "; 986 990 #endif … … 989 993 990 994 #ifdef AVANGO_DEBUG 991 LOG_TRACE(logger)<< "av::NetNode::consume_create_message: '"995 logger.debug()<< "av::NetNode::consume_create_message: '" 992 996 << obj_type.getName().c_str() 993 997 << "' w/ id: " … … 1010 1014 1011 1015 #ifdef AVANGO_DEBUG 1012 LOG_TRACE(logger)<< "av::NetNode::consume_update_message: '"1016 logger.debug()<< "av::NetNode::consume_update_message: '" 1013 1017 << obj_type.getName().c_str() 1014 1018 << "' w/ id: " … … 1055 1059 1056 1060 #ifdef AVANGO_DEBUG 1057 LOG_TRACE(logger)<< "av::NetNode::consume_delete_message: "1061 logger.debug()<< "av::NetNode::consume_delete_message: " 1058 1062 << obj_id; 1059 1063 #endif … … 1069 1073 1070 1074 #ifdef AVANGO_DEBUG 1071 LOG_TRACE(logger)<< "av::NetNode::consume_packed_message: " << msg_count;1075 logger.debug()<< "av::NetNode::consume_packed_message: " << msg_count; 1072 1076 #endif 1073 1077
Note: See TracChangeset
for help on using the changeset viewer.
