From d0ab92b944d98c4b310f583801926e24e8ca6be4 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 28 Jan 2007 16:40:27 +0000 Subject: [PATCH] (lwpSetDesc): Unused, remove. [EMPTH_LWP] (lwpProc): Remove member desc. [EMPTH_LWP] (lwpCreate, lwpDestroy): Don't initialize / finalize it. [EMPTH_POSIX] (empth_t): Remove member desc. [EMPTH_POSIX] (empth_init, empth_create): Don't initialize it. [EMPTH_W32] (loc_Thread): Remove member szDesc. [EMPTH_W32] (empth_init, empth_create): Don't initialize it. (empth_create, lwpCreate): Remove parameter desc. Callers changed. --- include/empthread.h | 8 ++++---- include/lwp.h | 3 +-- src/lib/empthread/lwp.c | 4 ++-- src/lib/empthread/ntthread.c | 16 ++++------------ src/lib/empthread/pthread.c | 17 ++++++----------- src/lib/lwp/lwp.c | 23 +++-------------------- src/lib/lwp/lwpint.h | 3 +-- src/lib/player/accept.c | 2 +- src/server/main.c | 9 ++++----- src/server/marketup.c | 2 +- src/server/shutdown.c | 5 ++--- src/server/update.c | 8 ++++---- 12 files changed, 33 insertions(+), 67 deletions(-) diff --git a/include/empthread.h b/include/empthread.h index 4b3144e9..ee9ce7de 100644 --- a/include/empthread.h +++ b/include/empthread.h @@ -132,8 +132,7 @@ int empth_init(void **ctx, int flags); * ENTRY is the entry point. It will be called with argument UD. * Thread stack is at least SIZE bytes. * FLAGS should be the same as were passed to empth_init(), or zero. - * NAME is the threads name, and DESC its description. These are used - * for logging and debugging. + * NAME is the thread's name, it is used for logging and debugging. * UD is the value to pass to ENTRY. It is also assigned to the * context variable defined with empth_init() whenever the thread gets * scheduled. @@ -141,7 +140,7 @@ int empth_init(void **ctx, int flags); * Return the thread, or NULL on error. */ empth_t *empth_create(int prio, void (*entry)(void *), - int size, int flags, char *name, char *desc, void *ud); + int size, int flags, char *name, void *ud); /* * Return the current thread. @@ -184,6 +183,7 @@ void empth_select(int fd, int flags); /* * Awaken THREAD if it is sleeping in empth_select(). * Note: This must not awaken threads sleeping in other functions. + * Does not yield the processor. */ void empth_wakeup(empth_t *thread); @@ -194,7 +194,7 @@ void empth_wakeup(empth_t *thread); void empth_sleep(time_t until); /* - * Wait for signal, return the signal number + * Wait for signal, return the signal number. */ int empth_wait_for_signal(void); diff --git a/include/lwp.h b/include/lwp.h index 00feba7c..3df22990 100644 --- a/include/lwp.h +++ b/include/lwp.h @@ -41,7 +41,7 @@ struct lwp_rwlock; struct lwpProc *lwpInitSystem(int prio, void **ctxp, int flags, sigset_t *); struct lwpProc *lwpCreate(int prio, void (*)(void *), int size, - int flags, char *name, char *desc, + int flags, char *name, int argc, char **argv, void *ud); void lwpExit(void); void lwpTerminate(struct lwpProc * p); @@ -52,7 +52,6 @@ void lwpWakeupFd(struct lwpProc * p); int lwpSigWait(sigset_t *set, int *sig); void *lwpGetUD(struct lwpProc * p); void lwpSetUD(struct lwpProc * p, char *ud); -void lwpSetDesc(struct lwpProc * p, char *name, char *desc); int lwpSetPriority(int prio); struct lwpSem *lwpCreateSem(char *name, int count); diff --git a/src/lib/empthread/lwp.c b/src/lib/empthread/lwp.c index c1f7146c..41432cae 100644 --- a/src/lib/empthread/lwp.c +++ b/src/lib/empthread/lwp.c @@ -61,11 +61,11 @@ empth_init(void **ctx, int flags) empth_t * empth_create(int prio, void (*entry)(void *), int size, int flags, - char *name, char *desc, void *ud) + char *name, void *ud) { if (!flags) flags = empth_flags; - return lwpCreate(prio, entry, size, flags, name, desc, 0, 0, ud); + return lwpCreate(prio, entry, size, flags, name, 0, 0, ud); } empth_t * diff --git a/src/lib/empthread/ntthread.c b/src/lib/empthread/ntthread.c index 29b018db..cd51c3ba 100644 --- a/src/lib/empthread/ntthread.c +++ b/src/lib/empthread/ntthread.c @@ -69,8 +69,6 @@ struct loc_Thread { /* The thread name, passed in at create time. */ char szName[17]; - /* The thread description, passed in at create time. */ - char szDesc[80]; /* True if this is the main line, and not a real thread. */ BOOL bMainThread; @@ -418,8 +416,6 @@ empth_init(void **ctx_ptr, int flags) memset(pThread, 0, sizeof(*pThread)); strncpy(pThread->szName, "Main", sizeof(pThread->szName) - 1); - strncpy(pThread->szDesc, "The main process", - sizeof(pThread->szDesc) - 1); pThread->ulThreadID = GetCurrentThreadId(); pThread->bMainThread = TRUE; @@ -444,29 +440,26 @@ empth_init(void **ctx_ptr, int flags) * flags - debug control. * LWP_STACKCHECK - not needed * name - name of the thread, for debug. - * desc - description of thread, for debug. * ud - "user data". The "ctx_ptr" gets this value * when the thread is active. * It is also passed to the entry function... */ empth_t * empth_create(int prio, void (*entry)(void *), int size, int flags, - char *name, char *desc, void *ud) + char *name, void *ud) { empth_t *pThread = NULL; - loc_debug("creating new thread %s:%s", name, desc); + loc_debug("creating new thread %s", name); pThread = malloc(sizeof(*pThread)); if (!pThread) { - logerror("not enough memory to create thread: %s (%s)", - name, desc); + logerror("not enough memory to create thread %s", name); return NULL; } memset(pThread, 0, sizeof(*pThread)); strncpy(pThread->szName, name, sizeof(pThread->szName) - 1); - strncpy(pThread->szDesc, desc, sizeof(pThread->szDesc) - 1); pThread->pvUserData = ud; pThread->pfnEntry = entry; pThread->bMainThread = FALSE; @@ -479,8 +472,7 @@ empth_create(int prio, void (*entry)(void *), int size, int flags, pThread->ulThreadID = _beginthread(empth_threadMain, size, pThread); if (pThread->ulThreadID == -1) { - logerror("can not create thread: %s (%s): %s", - name, desc, strerror(errno)); + logerror("can not create thread: %s: %s", name, strerror(errno)); goto bad; } diff --git a/src/lib/empthread/pthread.c b/src/lib/empthread/pthread.c index 7378e766..307a88de 100644 --- a/src/lib/empthread/pthread.c +++ b/src/lib/empthread/pthread.c @@ -61,7 +61,6 @@ struct empth_t { char *name; /* thread name */ - char *desc; /* description */ void *ud; /* user data */ int state; /* my state */ void (*ep)(void *); /* entry point */ @@ -177,7 +176,6 @@ empth_init(void **ctx_ptr, int flags) exit(1); } ctx->name = "Main"; - ctx->desc = "empire main"; ctx->ep = 0; ctx->ud = 0; ctx->id = pthread_self(); @@ -197,31 +195,29 @@ empth_init(void **ctx_ptr, int flags) */ empth_t * empth_create(int prio, void (*entry)(void *), int size, int flags, - char *name, char *desc, void *ud) + char *name, void *ud) { pthread_t t; pthread_attr_t attr; empth_t *ctx; int eno; - empth_status("creating new thread %s:%s", name, desc); + empth_status("creating new thread %s", name); ctx = malloc(sizeof(empth_t)); if (!ctx) { - logerror("not enough memory to create thread: %s (%s)", - name, desc); + logerror("not enough memory to create thread %s", name); return NULL; } ctx->name = strdup(name); - ctx->desc = strdup(desc); ctx->ud = ud; ctx->state = 0; ctx->ep = entry; eno = pthread_attr_init(&attr); if (eno) { - logerror("can not create thread attribute %s (%s): %s", - name, desc, strerror(eno)); + logerror("can not create thread attribute %s: %s", + name, strerror(eno)); goto bad; } if (size < PTHREAD_STACK_MIN) @@ -231,8 +227,7 @@ empth_create(int prio, void (*entry)(void *), int size, int flags, eno = pthread_create(&t, &attr, empth_start, ctx); if (eno) { - logerror("can not create thread: %s (%s): %s", - name, desc, strerror(eno)); + logerror("can not create thread: %s: %s", name, strerror(eno)); goto bad; } empth_status("new thread id is %ld", (long)t); diff --git a/src/lib/lwp/lwp.c b/src/lib/lwp/lwp.c index 3dcae1e7..2cf1a4c7 100644 --- a/src/lib/lwp/lwp.c +++ b/src/lib/lwp/lwp.c @@ -131,7 +131,8 @@ lwpEntryPoint(void) * lwpCreate -- create a process. */ struct lwpProc * -lwpCreate(int priority, void (*entry)(void *), int stacksz, int flags, char *name, char *desc, int argc, char **argv, void *ud) +lwpCreate(int priority, void (*entry)(void *), int stacksz, + int flags, char *name, int argc, char **argv, void *ud) { struct lwpProc *newp; @@ -139,7 +140,6 @@ lwpCreate(int priority, void (*entry)(void *), int stacksz, int flags, char *nam return NULL; newp->flags = flags; newp->name = strdup(name); - newp->desc = strdup(desc); newp->entry = entry; newp->argc = argc; newp->argv = argv; @@ -153,7 +153,6 @@ lwpCreate(int priority, void (*entry)(void *), int stacksz, int flags, char *nam LwpMaxpri = priority; if (lwpNewContext(newp, stacksz) < 0) { free(newp->name); - free(newp->desc); free(newp); return NULL; } @@ -177,7 +176,6 @@ lwpDestroy(struct lwpProc *proc) lwpStatus(proc, "destroying sbtm: %p", proc->sbtm); free(proc->sbtm); free(proc->name); - free(proc->desc); free(proc); } @@ -215,20 +213,6 @@ lwpSetUD(struct lwpProc *p, char *ud) p->ud = ud; } -/* - * set name & desc - */ -void -lwpSetDesc(struct lwpProc *p, char *name, char *desc) -{ - if (!p) - p = LwpCurrent; - free(p->name); - free(p->desc); - p->name = strdup(name); - p->desc = strdup(desc); -} - /* * lwpYield -- yield the processor to another thread. */ @@ -317,8 +301,7 @@ lwpInitSystem(int pri, void **ctxptr, int flags, sigset_t *waitset) LwpDeadQ.head = LwpDeadQ.tail = 0; lwpInitSigWait(waitset); /* must be lower in priority than us for this to work right */ - sel = lwpCreate(0, lwpSelect, 16384, flags, "EventHandler", - "Select (main loop) Event Handler", 0, 0, 0); + sel = lwpCreate(0, lwpSelect, 16384, flags, "EventHandler", 0, 0, 0); lwpInitSelect(sel); return LwpCurrent; } diff --git a/src/lib/lwp/lwpint.h b/src/lib/lwp/lwpint.h index c0ba9997..12ce6ef7 100644 --- a/src/lib/lwp/lwpint.h +++ b/src/lib/lwp/lwpint.h @@ -63,8 +63,7 @@ struct lwpProc { int argc; /* initial arguments */ char **argv; void *ud; /* user data */ - char *name; /* process name and description */ - char *desc; + char *name; /* process name, for debugging */ int flags; struct lwpProc *next; }; diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c index 76ef2c64..81987567 100644 --- a/src/lib/player/accept.c +++ b/src/lib/player/accept.c @@ -242,6 +242,6 @@ player_accept(void *unused) /* power */ MAXNOC * sizeof(struct powstr)); sprintf(buf, "Player (fd #%d)", ns); empth_create(PP_PLAYER, player_login, stacksize, - 0, buf, "Empire player", np); + 0, buf, np); } } diff --git a/src/server/main.c b/src/server/main.c index 839810de..b5f0b87a 100644 --- a/src/server/main.c +++ b/src/server/main.c @@ -324,15 +324,14 @@ start_server(int flags) exit(1); empth_create(PP_ACCEPT, player_accept, (50 * 1024), flags, - "AcceptPlayers", "Accept network connections", 0); + "AcceptPlayers", 0); empth_create(PP_KILLIDLE, player_kill_idle, (50 * 1024), flags, - "KillIdle", "Kills idle player connections", 0); + "KillIdle", 0); empth_create(PP_TIMESTAMP, delete_lostitems, (50 * 1024), flags, - "DeleteItems", "Deletes old lost items", 0); + "DeleteItems", 0); if (opt_MOB_ACCESS) { - /* Start the mobility access check thread */ empth_create(PP_TIMESTAMP, mobility_check, (50 * 1024), flags, - "MobilityCheck", "Writes the timestamp file", 0); + "MobilityCheck", 0); } market_init(); diff --git a/src/server/marketup.c b/src/server/marketup.c index fbb0384e..d1df31a0 100644 --- a/src/server/marketup.c +++ b/src/server/marketup.c @@ -72,6 +72,6 @@ market_init(void) if (!dp) exit_nomem(); if (!empth_create(PP_UPDATE, market_update, 50 * 1024, 0, - "MarketUpdate", "Updates the market", dp)) + "MarketUpdate", dp)) exit_nomem(); } diff --git a/src/server/shutdown.c b/src/server/shutdown.c index 35e259bf..8e0b68a7 100644 --- a/src/server/shutdown.c +++ b/src/server/shutdown.c @@ -65,9 +65,8 @@ shutdown_initiate(int mins_from_now) mins_from_now); /* FIXME wake up shutdown_sequence() */ } else { - if (!empth_create(PP_SHUTDOWN, shutdown_sequence, 50 * 1024, - 0, "shutdownSeq", "Counts down server shutdown", - NULL)) + if (!empth_create(PP_SHUTDOWN, shutdown_sequence, 50 * 1024, 0, + "shutdownSeq", NULL)) return -1; } diff --git a/src/server/update.c b/src/server/update.c index e0b803e1..7c0effc0 100644 --- a/src/server/update.c +++ b/src/server/update.c @@ -77,11 +77,11 @@ update_init(void) /* finish_sects */ WORLD_X * WORLD_Y * (2 * sizeof(double) + sizeof(char *)); if (!empth_create(PP_UPDATE, update_wait, stacksize, 0, - "Update", "Updates the world", dp)) + "Update", dp)) exit_nomem(); if (!empth_create(PP_SCHED, update_sched, 50 * 1024, 0, - "UpdateSched", "Schedules updates to occur", NULL)) + "UpdateSched", NULL)) exit_nomem(); } @@ -150,8 +150,8 @@ update_trigger(time_t secs_from_now) if (!secp) return -1; *secp = secs_from_now; - if (!empth_create(PP_SCHED, update_force, 50 * 1024, 0, "forceUpdate", - "Schedules an update", secp)) + if (!empth_create(PP_SCHED, update_force, 50 * 1024, 0, + "forceUpdate", secp)) return -1; return 0; }