eventq.cc (7063:c0ea4df1ddab) eventq.cc (7451:97c34fea328a)
1/*
2 * Copyright (c) 2000-2005 The Regents of The University of Michigan
3 * Copyright (c) 2008 The Hewlett-Packard Development Company
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are
8 * met: redistributions of source code must retain the above copyright

--- 224 unchanged lines hidden (view full) ---

233 UNSERIALIZE_SCALAR(_when);
234 UNSERIALIZE_SCALAR(_priority);
235
236 // need to see if original event was in a scheduled, unsquashed
237 // state, but don't want to restore those flags in the current
238 // object itself (since they aren't immediately true)
239 short _flags;
240 UNSERIALIZE_SCALAR(_flags);
1/*
2 * Copyright (c) 2000-2005 The Regents of The University of Michigan
3 * Copyright (c) 2008 The Hewlett-Packard Development Company
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are
8 * met: redistributions of source code must retain the above copyright

--- 224 unchanged lines hidden (view full) ---

233 UNSERIALIZE_SCALAR(_when);
234 UNSERIALIZE_SCALAR(_priority);
235
236 // need to see if original event was in a scheduled, unsquashed
237 // state, but don't want to restore those flags in the current
238 // object itself (since they aren't immediately true)
239 short _flags;
240 UNSERIALIZE_SCALAR(_flags);
241 assert(initialized());
241 flags = _flags;
242 flags = _flags;
243 flags.set(Initialized);
242
243 bool wasScheduled = flags.isSet(Scheduled) && !flags.isSet(Squashed);
244 flags.clear(Squashed | Scheduled);
245
246 if (wasScheduled) {
247 DPRINTF(Config, "rescheduling at %d\n", _when);
248 mainEventQueue.schedule(this, _when);
249 }

--- 165 unchanged lines hidden --- 		244
245 bool wasScheduled = flags.isSet(Scheduled) && !flags.isSet(Squashed);
246 flags.clear(Squashed | Scheduled);
247
248 if (wasScheduled) {
249 DPRINTF(Config, "rescheduling at %d\n", _when);
250 mainEventQueue.schedule(this, _when);
251 }

--- 165 unchanged lines hidden ---