Changeset 1208

Timestamp:

01/26/08 05:56:11 (7 months ago)

Author:

shawnw

Message:

#7540: Queue pids

Files:

• 1.8.3/branches/devel/CHANGES.183 (modified) (2 diffs)
• 1.8.3/branches/devel/MANIFEST (modified) (2 diffs)
• 1.8.3/branches/devel/game/txt/hlp/penncmd.hlp (modified) (4 diffs)
• 1.8.3/branches/devel/hdrs/game.h (modified) (1 diff)
• 1.8.3/branches/devel/hdrs/intmap.h (added)
• 1.8.3/branches/devel/src/Makefile.in (modified) (7 diffs)
• 1.8.3/branches/devel/src/bsd.c (modified) (7 diffs)
• 1.8.3/branches/devel/src/cmds.c (modified) (2 diffs)
• 1.8.3/branches/devel/src/command.c (modified) (2 diffs)
• 1.8.3/branches/devel/src/cque.c (modified) (18 diffs)
• 1.8.3/branches/devel/src/intmap.c (added)
• 1.8.3/branches/devel/src/mymalloc.c (modified) (2 diffs)

1.8.3/branches/devel/CHANGES.183

@@ -15 +15 @@
-
-==========================================================================
-
+
-Version 1.8.3 patchlevel 7                      ??? ??, 2008
-
@@ -26 +26 @@
-   are changed and automatically reload them instead of waiting for a 
-   @readcache.
+ * New map data structure with integer keys, used in various places.
+ * Queue entries now have process ids, used to identify and act on that
+   particular action list. This and associated commands inspired
+   by [Rhost].
+
+Commands:
- * '@hook/override cmd=#1234' will look at all attributes on the object
-   for a matching $command. By Talvo.
- * @sitelock/delete NNN will remove the sitelock rule with that number.
+ * @halt/pid NNN will remove a specific queue entry. Get the pid from 
+   @ps. [Rhost]
+ * @wait/pid will adjust the wait time of queue entries. [Rhost]
-
-Functions:

1.8.3/branches/devel/MANIFEST

@@ -99 +99 @@
-hdrs/htab.h
-hdrs/ident.h
+hdrs/intmap.h
-hdrs/intrface.h
-hdrs/lock.h
@@ -196 +197 @@
-src/htmltab.c
-src/htmltab.gperf
+src/intmap.c
-src/match.c
-src/memcheck.c

1.8.3/branches/devel/game/txt/hlp/penncmd.hlp

@@ -1619 +1619 @@
-& @halt
-  @halt <object> [=<new_command>] 
+  @halt/pid <pid>
-  @halt/all
- 
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  @halt/all is a synonym for @allhalt and is a wizard-only command.
@@ -2861 +2866 @@
-  @ps/summary just displays the queue totals for the whole queue.
-  @ps/quick displays the queue totals for just your queue.
+
+  Each line includes the proccess id of the queue entry, the object
+  and attribute being used as a semaphore (If any), the number of
+  seconds left before it executes (For waits and semaphores), the
+  object that is going to execute the entry, and the command.
+
-& @purge
-  @purge is a wizard only command that calls the internal purge routine to 
@@ -3514 +3525 @@
-  @wait[/until] <time> = <command_list>
-  @wait <object> = <command_list>
-
-
+  
+
-  The basic form of this command puts the command list (a semicolon-separated 
-  list of commands) into the wait queue to execute in <time> seconds. If the
@@ -3546 +3557 @@
-  You cannot do a non-timed semaphore on an attribute with a numeric name,
-  as that is taken as a timeout instead.
+
+  Continued in HELP @WAIT3
+& @wait3
+  @wait/pid <PID>=<SECONDS>
+  @wait/pid <PID>=[+-]<ADJUSTMENT>
+  @wait/pid/until <PID>=<TIME>
+
+  The /pid switch can be used to alter the timeout of entries in the
+  wait and semaphore queues. You can set a new wait time, increase or
+  decrease the current time, or set a new absolute time in seconds.
+
+  You must control the object doing the wait, or have the halt @power.
+
-& @wall
-  @wall[/<switch>] <message>

1.8.3/branches/devel/hdrs/game.h

@@ -21 +21 @@
-
-/* From bsd.c */
-extern 
-extern 
-extern 
+
+
+
-enum motd_type { MOTD_MOTD, MOTD_WIZ, MOTD_DOWN, MOTD_FULL, MOTD_LIST };
-extern 
-extern 
+
+
-/* From cque.c */
-
-
+
+
+
-enum queue_type { QUEUE_ALL, QUEUE_NORMAL, QUEUE_SUMMARY, QUEUE_QUICK };
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-/* From command.c */

1.8.3/branches/devel/src/Makefile.in

@@ -18 +18 @@
-    flags.c funcrypt.c function.c fundb.c funlist.c funlocal.c  \
-    funmath.c funmisc.c funstr.c funtime.c funufun.c game.c help.c  \
-local.c lock.c log.c look.c malias.c markup
-tch.c memcheck.c move.c mycrypt.c mymalloc.c mysocket.c
-rlimit.c myssl.c notify.c parse.c pcre.c player.c plyrlist
-redicat.c privtab.c info_master.c ptab.c rob.c services
-t.c shs.c sig.c sort.c speech.c sql.c strdup.c strtree
-util.c tables.c timer.c unparse.c utils.c version.c wait.c
-
+intmap.c local.c lock.c log.c look.c malias
+rkup.c match.c memcheck.c move.c mycrypt.c mymalloc.c    
+socket.c myrlimit.c myssl.c notify.c parse.c pcre.c player
+lyrlist.c predicat.c privtab.c info_master.c ptab.c rob
+rvices.c set.c shs.c sig.c sort.c speech.c sql.c strdup
+tree.c strutil.c tables.c timer.c unparse.c utils.c 
+version.c wait.c 
-
-
@@ -33 +33 @@
-    flags.o funcrypt.o function.o fundb.o funlist.o funlocal.o  \
-    funmath.o funmisc.o funstr.o funtime.o funufun.o game.o help.o  \
-local.o lock.o log.o look.o malias.o markup
-tch.o memcheck.o move.o mycrypt.o mymalloc.o mysocket.o
-rlimit.o myssl.o notify.o parse.o pcre.o player.o plyrlist
-info_master.o predicat.o privtab.o ptab.o rob.o services
-t.o shs.o sig.o sort.o speech.o sql.o strdup.o strtree
-util.o tables.o timer.o unparse.o utils.o version.o wait.o
-
+intmap.o local.o lock.o log.o look.o malias
+rkup.o match.o memcheck.o move.o mycrypt.o mymalloc.o    
+socket.o myrlimit.o myssl.o notify.o parse.o pcre.o player
+plyrlist.o info_master.o predicat.o privtab.o ptab.o rob
+rvices.o set.o shs.o sig.o sort.o speech.o sql.o strdup
+tree.o strutil.o tables.o timer.o unparse.o utils.o 
+version.o wait.o 
-
-# This is a dummy target, in case you type 'make' in the source
@@ -321 +321 @@
-bsd.o: ../hdrs/game.h
-bsd.o: ../hdrs/dbio.h
+bsd.o: ../hdrs/intmap.h
-bufferq.o: ../hdrs/copyrite.h
-bufferq.o: ../config.h
@@ -429 +430 @@
-command.o: ../hdrs/access.h
-command.o: ../hdrs/version.h
+command.o: ../hdrs/strtree.h
-command.o: ../hdrs/function.h
-command.o: ../hdrs/command.h
@@ -504 +506 @@
-cque.o: ../hdrs/attrib.h
-cque.o: ../hdrs/log.h
+cque.o: ../hdrs/intmap.h
-create.o: ../hdrs/copyrite.h
-create.o: ../config.h
@@ -1033 +1036 @@
-ident.o: ../hdrs/mysocket.h
-ident.o: ../hdrs/mymalloc.h
+intmap.o: ../config.h
+intmap.o: ../hdrs/conf.h
+intmap.o: ../hdrs/copyrite.h
+intmap.o: ../options.h
+intmap.o: ../hdrs/mushtype.h
+intmap.o: ../hdrs/htab.h
+intmap.o: ../hdrs/externs.h
+intmap.o: ../hdrs/compile.h
+intmap.o: ../hdrs/dbdefs.h
+intmap.o: ../hdrs/mushdb.h
+intmap.o: ../hdrs/flags.h
+intmap.o: ../hdrs/ptab.h
+intmap.o: ../hdrs/chunk.h
+intmap.o: ../confmagic.h
+intmap.o: ../hdrs/mypcre.h
+intmap.o: ../hdrs/mymalloc.h
+intmap.o: ../hdrs/intmap.h
-local.o: ../hdrs/copyrite.h
-local.o: ../config.h
@@ -1367 +1387 @@
-parse.o: ../hdrs/mymalloc.h
-pcre.o: ../config.h
+pcre.o: ../hdrs/mypcre.h
-player.o: ../hdrs/copyrite.h
-player.o: ../config.h

1.8.3/branches/devel/src/bsd.c

@@ -130 +130 @@
-#include "game.h"
-#include "dbio.h"
+#include "intmap.h"
-#include "confmagic.h"
-
@@ -266 +267 @@
-
-DESC *descriptor_list = NULL;   /**< The linked list of descriptors */
+intmap *descs_by_fd = NULL; /**< Map of ports to DESC* objects */
-
-static int sock;
@@ -606 +608 @@
-#endif
-
+  descs_by_fd = im_new();
+
-  /* go do it */
-#ifdef CSRI
@@ -1467 +1471 @@
-  if (d->next)
-    d->next->prev = d->prev;
+
+  im_delete(descs_by_fd, d->descriptor);
-
-#ifdef HAS_OPENSSL
@@ -1543 +1549 @@
-  }
-#endif
+  im_insert(descs_by_fd, d->descriptor, d);
-  test_telnet(d);
-  welcome_user(d);
@@ -3733 +3740 @@
-  if (is_strict_integer(name)) {
-    int fd = parse_integer(name);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-  } else {                      /* Look up player name */
-    DESC *match = NULL;
@@ -4609 +4613 @@
-      d->prev = NULL;
-      descriptor_list = d;
+      im_insert(descs_by_fd, d->descriptor, d);
-      if (d->connected && d->player && GoodObject(d->player) &&
-          IsPlayer(d->player))

1.8.3/branches/devel/src/cmds.c

@@ -427 +427 @@
-  if (SW_ISSET(sw, SWITCH_ALL))
-    do_allhalt(player);
+  else if (SW_BY_NAME(sw, "PID"))
+    do_haltpid(player, arg_left);
-  else
-    do_halt1(player, arg_left, arg_right);
@@ -1075 +1077 @@
-COMMAND(cmd_wait)
-{
-
+
+
+
+
-}
-

1.8.3/branches/devel/src/command.c

@@ -168 +168 @@
-  {"@GREP", "LIST PRINT ILIST IPRINT", cmd_grep,
-   CMD_T_ANY | CMD_T_EQSPLIT | CMD_T_RS_NOPARSE | CMD_T_NOGAGGED, 0, 0},
-
+ PID
-  {"@HIDE", "NO OFF YES ON", cmd_hide, CMD_T_ANY, 0, 0},
-  {"@HOOK", "LIST AFTER BEFORE IGNORE OVERRIDE", cmd_hook,
@@ -300 +300 @@
-  {"@VERB", NULL, cmd_verb, CMD_T_ANY | CMD_T_EQSPLIT | CMD_T_RS_ARGS, 0, 0},
-  {"@VERSION", NULL, cmd_version, CMD_T_ANY, 0, 0},
-
+PID 
-   0, 0},
-  {"@WALL", "NOEVAL EMIT", cmd_wall, CMD_T_ANY, "WIZARD ROYALTY", "ANNOUNCE"},

1.8.3/branches/devel/src/cque.c

@@ -23 +23 @@
-#include <time.h>
-#endif
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
-
-#include "conf.h"
@@ -37 +40 @@
-#include "dbdefs.h"
-#include "log.h"
+#include "intmap.h"
-#include "confmagic.h"
-
@@ -57 +61 @@
-  char *rval[NUMQ];             /**< environment, from setq() */
-  char *comm;                   /**< command to be executed */
+  uint32_t pid;                 /**< Process id of this entry */
+  uint32_t flags;               /**< Flags */
-} BQUE;
-
+#define QUEUE_HALTED 0x1U
+
-slab *bque_slab = NULL; /**< slab for 'struct bque' allocations */
+
+static intmap *queue_map = NULL; /**< Intmap for looking up queue entries by pid */
+static uint32_t top_pid = 0;
-
-static BQUE *qfirst = NULL, *qlast = NULL, *qwait = NULL;
@@ -98 +109 @@
-  bque_slab = slab_create("command queues", sizeof(BQUE));
-  slab_set_opt(bque_slab, SLAB_ALLOC_BEST_FIT, 1);
+  queue_map = im_new();
-}
-
@@ -186 +198 @@
-  for (a = 0; a < 10; a++)
-    if (point->env[a]) {
-(Malloc_t) 
+
-    }
-  for (a = 0; a < NUMQ; a++)
-    if (point->rval[a]) {
-(Malloc_t) 
+
-    }
-  if (point->semattr)
-(Malloc_t) 
+
-  if (point->comm)
-
+
+
-  slab_free(bque_slab, point);
-}
@@ -246 +259 @@
-}
-
+static uint32_t
+next_pid(void)
+{
+  uint32_t pid = top_pid;
+
+  while (1) {
+    if (pid > (1U << 16))
+      pid = 0;
+    if (im_exists(queue_map, pid))
+      pid++;
+    else {
+      top_pid = pid + 1;
+      return pid;
+    }
+  }
+}
+
-/** Add a new entry onto the player or object command queues.
- * This function adds a new entry to the back of the player or
@@ -264 +294 @@
-    return;
-  tmp = slab_malloc(bque_slab, NULL);
+  tmp->pid = next_pid();
-  tmp->comm = mush_strdup(command, "bqueue_comm");
-  tmp->semattr = NULL;
@@ -296 +327 @@
-      qllast = qlfirst = tmp;
-  }
+  im_insert(queue_map, tmp->pid, tmp);
-}
-
@@ -382 +414 @@
-  tmp = slab_malloc(bque_slab, NULL);
-  tmp->comm = mush_strdup(command, "bqueue_comm");
+  tmp->pid = next_pid();
-  tmp->player = player;
-  tmp->queued = QUEUE_PER_OWNER ? Owner(player) : player;
@@ -436 +469 @@
-    }
-  }
+  im_insert(queue_map, tmp->pid, tmp);
-}
-
@@ -544 +578 @@
-    if (!(qfirst = entry->next))
-      qlast = NULL;
-
+
+
-      global_eval_context.cplr = entry->player;
-      giveto(global_eval_context.cplr, QUEUE_COST);
@@ -828 +863 @@
- * \param player the enactor
- * \param cause the object causing the command to be added.
-
+ Modified!
- * \param cmd command to queue.
- * \param until if 1, wait until an absolute time.
- */
-void
-har *cmd, int
+onst char *cmd, bool
-{
-  dbref thing;
@@ -912 +947 @@
-}
-
+/** Interface to @wait/pid; modifies the wait times of queue
+ * entries.
+ * \param player the object doing the command.
+ * \param pidstr the process id to modify.
+ * \param timestr the new timeout.
+ * \param until true if timeout is an absolute time.
+ */
+void
+do_waitpid(dbref player, const char *pidstr, const char *timestr, bool until)
+{
+  uint32_t pid;
+  BQUE *q, *tmp, *last;
+  bool found;
+
+  if (!is_uinteger(pidstr)) {
+    notify(player, T("That is not a valid pid!"));
+    return;
+  }
+
+  pid = parse_uint32(pidstr, NULL, 10);
+  q = im_find(queue_map, pid);
+  
+  if (!q) {
+    notify(player, T("That is not a valid pid!"));
+    return;
+  }
+
+  if (!controls(player, q->player) && !HaltAny(player)) {
+    notify(player, T("Permission denied."));
+    return;
+  }
+
+  if (q->sem != NOTHING && q->left == 0) {
+    notify(player,
+       T("You cannot adjust the timeout of an indefinite semaphore."));
+    return;
+  }
+
+  if (!is_strict_integer(timestr)) {
+    notify(player, T("That is not a valid timestamp."));
+    return;
+  }
+
+  if (until) {
+    int when;    
+
+    when = parse_integer(timestr);
+
+    if (when < 0)
+      when = 0;
+
+    q->left = (time_t) when;
+
+  } else {
+    int offset = parse_integer(timestr);
+
+    /* If timestr looks like +NNN or -NNN, add or subtract a number
+       of seconds to the current timeout. Otherwise, change timeout. 
+    */
+    if (timestr[0] == '+' || timestr[0] == '-')
+      q->left += offset;
+    else
+      q->left = mudtime + offset;
+
+    if (q->left < 0)
+      q->left = 0;
+  }
+
+  /* Now adjust it in the wait queue. Not a clever approach, but I
+     wrote it at 3 am and clever was not an option. */
+  for (tmp = qwait, last = NULL; tmp; last = tmp, tmp = tmp->next) {
+    if (tmp == q) {
+      if (last)
+    last->next = q->next;
+      else
+    qwait = qwait->next;
+
+      break;
+    }
+  }
+  found = false;
+  for (tmp = qwait, last = NULL; tmp; last = tmp, tmp = tmp->next) {
+    if (tmp->left > q->left) {
+      if (last) {
+    last->next = q;
+    q->next = tmp;
+      } else {
+    q->next = qwait;
+    qwait = q;
+      }
+      found = true;
+      break;
+    }
+  }
+  if (!found) {
+    if (last) 
+      last->next = q;
+    else
+      qwait = q;
+    q->next = NULL;
+  }
+
+  notify_format(player, T("Queue entry with pid %u updated."), pid);
+}
+
-static void
-show_queue(dbref player, dbref victim, int q_type, int q_quiet, int q_all,
@@ -919 +1059 @@
-  for (tmp = q_ptr; tmp; tmp = tmp->next) {
-    (*tot)++;
+    if (tmp->flags & QUEUE_HALTED)
+      continue;
-    if (!GoodObject(tmp->player))
-      (*del)++;
@@ -929 +1071 @@
-        switch (q_type) {
-        case 1:                /* wait queue */
-[%ld]%s: %s"
+(Pid: %u) [%ld]%s: %s", tmp->pid
-                        (long) difftime(tmp->left, mudtime),
-                        unparse_object(player, tmp->player), tmp->comm);
@@ -935 +1077 @@
-        case 2:                /* semaphore queue */
-          if (tmp->left != 0) {
-[#%d/%s/%ld]%s: %s"
+(Pid: %u) [#%d/%s/%ld]%s: %s", tmp->pid
-                          tmp->semattr, (long) difftime(tmp->left, mudtime),
-                          unparse_object(player, tmp->player), tmp->comm);
-          } else {
-[#%d/%s]%s: %s"
+(Pid: %u) [#%d/%s]%s: %s", tmp->pid
-                          tmp->semattr, unparse_object(player, tmp->player),
-                          tmp->comm);
@@ -945 +1087 @@
-          break;
-        default:               /* player or object queue */
-%s: %s"
+(Pid: %u) %s: %s", tmp->pid
-                                                         tmp->player),
-                        tmp->comm);
@@ -1160 +1302 @@
-}
-
+/** Halt a particular pid
+ * \param player the enactor.
+ * \param arg1 string representing the pid to halt.
+ */
+void 
+do_haltpid(dbref player, const char *arg1)
+{
+  uint32_t pid;
+  BQUE *q;
+  dbref victim;
+
+  if (!is_uinteger(arg1)) {
+    notify(player, T("That is not a valid pid!"));
+    return;
+  }
+
+  pid = parse_uint32(arg1, NULL, 10);
+
+  q = im_find(queue_map, pid);
+
+  if (!q) {
+    notify(player, T("That is not a valid pid!"));
+     return;
+  }
+
+  victim = q->player;
+  if (!controls(player, victim) && !HaltAny(player)) {
+    notify(player, T("Permission denied."));
+    return;
+  }
+  
+  /* Instead of trying to track what queue this entry currently
+     belongs too, flag it as halted and just not execute it when its
+     turn comes up (Or show it in @ps, etc.).  Exception is for
+     semaphores, which otherwise might wait forever. */
+  q->flags |= QUEUE_HALTED;
+
+  if (q->semattr) {
+    BQUE *last = NULL, *tmp;
+    
+    for (tmp = qsemfirst; tmp; last = tmp, tmp = tmp->next) {
+      if (tmp == q) {
+    if (last)
+      last->next = tmp->next;
+    else
+      qsemfirst = tmp->next;
+    
+    if (qsemlast == tmp)
+      qsemlast = last;
+    
+    break;
+      }
+    }
+
+    giveto(victim, QUEUE_COST);
+    add_to_sem(q->sem, -1, q->semattr);
+    free_qentry(q);
+  }
+
+  notify_format(player, T("Queue entry with pid %u halted."), pid);
+}
+
+
+
-/** Halt all objects in the database.
- * \param player the enactor.

1.8.3/branches/devel/src/mymalloc.c

@@ -553 +553 @@
-  *bvm_strnode_slab, *flag_slab, *player_dbref_slab,
-  *command_slab, *channel_slab, *chanuser_slab, *chanlist_slab, *mail_slab,
-
+, *intmap_slab
-
-#if COMPRESSION_TYPE == 1 || COMPRESSION_TYPE == 2
@@ -590 +590 @@
-  slab_describe(player, text_block_slab);
-  slab_describe(player, player_dbref_slab);
+  slab_describe(player, intmap_slab);
-
-  if (options.mem_check) {