Changeset 1212
- Timestamp:
- 01/28/08 05:46:20 (7 months ago)
- Files:
-
- 1.8.3/branches/devel/src/cque.c (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
1.8.3/branches/devel/src/cque.c
r1211 r1212 62 62 char *comm; /**< command to be executed */ 63 63 uint32_t pid; /**< Process id of this entry */ 64 uint32_t flags; /**< Flags */65 64 } BQUE; 66 67 #define QUEUE_HALTED 0x1U68 65 69 66 slab *bque_slab = NULL; /**< slab for 'struct bque' allocations */ … … 303 300 tmp->left = 0; 304 301 tmp->cause = cause; 305 tmp->flags = 0;306 302 for (a = 0; a < 10; a++) 307 303 if (!global_eval_context.wnxt[a]) … … 422 418 tmp->semattr = NULL; 423 419 tmp->next = NULL; 424 tmp->flags = 0;425 420 for (a = 0; a < 10; a++) { 426 421 if (!global_eval_context.wnxt[a]) … … 581 576 if (!(qfirst = entry->next)) 582 577 qlast = NULL; 583 if (GoodObject(entry->player) && !IsGarbage(entry->player) 584 && !(entry->flags & QUEUE_HALTED)) { 578 if (GoodObject(entry->player) && !IsGarbage(entry->player)) { 585 579 global_eval_context.cplr = entry->player; 586 580 giveto(global_eval_context.cplr, QUEUE_COST); … … 1065 1059 for (tmp = q_ptr; tmp; tmp = tmp->next) { 1066 1060 (*tot)++; 1067 if (tmp->flags & QUEUE_HALTED) 1068 (*del)++; 1069 else if (!GoodObject(tmp->player)) 1061 if (!GoodObject(tmp->player)) 1070 1062 (*del)++; 1071 1063 else if (q_all || (Owner(tmp->player) == victim)) { … … 1343 1335 turn comes up (Or show it in @ps, etc.). Exception is for 1344 1336 semaphores, which otherwise might wait forever. */ 1345 q-> flags |= QUEUE_HALTED;1337 q->player = NOTHING; 1346 1338 1347 1339 if (q->semattr) {
