PennMUSH Community

Changeset 1212

Show
Ignore:
Timestamp:
01/28/08 05:46:20 (7 months ago)
Author:
shawnw
Message:

Simplify queue entry halting

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • 1.8.3/branches/devel/src/cque.c

    r1211 r1212  
    6262  char *comm;                   /**< command to be executed */ 
    6363  uint32_t pid;                 /**< Process id of this entry */ 
    64   uint32_t flags;               /**< Flags */ 
    6564} BQUE; 
    66  
    67 #define QUEUE_HALTED 0x1U 
    6865 
    6966slab *bque_slab = NULL; /**< slab for 'struct bque' allocations */ 
     
    303300  tmp->left = 0; 
    304301  tmp->cause = cause; 
    305   tmp->flags = 0; 
    306302  for (a = 0; a < 10; a++) 
    307303    if (!global_eval_context.wnxt[a]) 
     
    422418  tmp->semattr = NULL; 
    423419  tmp->next = NULL; 
    424   tmp->flags = 0; 
    425420  for (a = 0; a < 10; a++) { 
    426421    if (!global_eval_context.wnxt[a]) 
     
    581576    if (!(qfirst = entry->next)) 
    582577      qlast = NULL; 
    583     if (GoodObject(entry->player) && !IsGarbage(entry->player) 
    584     && !(entry->flags & QUEUE_HALTED)) { 
     578    if (GoodObject(entry->player) && !IsGarbage(entry->player)) { 
    585579      global_eval_context.cplr = entry->player; 
    586580      giveto(global_eval_context.cplr, QUEUE_COST); 
     
    10651059  for (tmp = q_ptr; tmp; tmp = tmp->next) { 
    10661060    (*tot)++; 
    1067     if (tmp->flags & QUEUE_HALTED)  
    1068       (*del)++; 
    1069     else if (!GoodObject(tmp->player)) 
     1061    if (!GoodObject(tmp->player)) 
    10701062      (*del)++; 
    10711063    else if (q_all || (Owner(tmp->player) == victim)) { 
     
    13431335     turn comes up (Or show it in @ps, etc.).  Exception is for 
    13441336     semaphores, which otherwise might wait forever. */ 
    1345   q->flags |= QUEUE_HALTED
     1337  q->player = NOTHING
    13461338 
    13471339  if (q->semattr) {