Sequencer.cc (9508:dde110931867) | Sequencer.cc (9542:683991c46ac8) |
---|---|
1/* 2 * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 516 unchanged lines hidden (view full) --- 525 } 526 527 // If using the RubyTester, update the RubyTester sender state's 528 // subBlock with the recieved data. The tester will later access 529 // this state. 530 // Note: RubyPort will access it's sender state before the 531 // RubyTester. 532 if (m_usingRubyTester) { | 1/* 2 * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 516 unchanged lines hidden (view full) --- 525 } 526 527 // If using the RubyTester, update the RubyTester sender state's 528 // subBlock with the recieved data. The tester will later access 529 // this state. 530 // Note: RubyPort will access it's sender state before the 531 // RubyTester. 532 if (m_usingRubyTester) { |
533 RubyPort::SenderState *requestSenderState = | 533 RubyPort::SenderState *reqSenderState = |
534 safe_cast<RubyPort::SenderState*>(pkt->senderState); | 534 safe_cast<RubyPort::SenderState*>(pkt->senderState); |
535 // @todo This is a dangerous assumption on nothing else 536 // modifying the senderState |
|
535 RubyTester::SenderState* testerSenderState = | 537 RubyTester::SenderState* testerSenderState = |
536 safe_cast<RubyTester::SenderState*>(requestSenderState->saved); 537 testerSenderState->subBlock->mergeFrom(data); | 538 safe_cast<RubyTester::SenderState*>(reqSenderState->predecessor); 539 testerSenderState->subBlock.mergeFrom(data); |
538 } 539 540 delete srequest; 541 542 if (g_system_ptr->m_warmup_enabled) { 543 delete pkt; 544 g_system_ptr->m_cache_recorder->enqueueNextFetchRequest(); 545 } else if (g_system_ptr->m_cooldown_enabled) { --- 186 unchanged lines hidden --- | 540 } 541 542 delete srequest; 543 544 if (g_system_ptr->m_warmup_enabled) { 545 delete pkt; 546 g_system_ptr->m_cache_recorder->enqueueNextFetchRequest(); 547 } else if (g_system_ptr->m_cooldown_enabled) { --- 186 unchanged lines hidden --- |