aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorentropy <entropy@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2006-09-13 20:04:57 +0000
committerentropy <entropy@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2006-09-13 20:04:57 +0000
commitb416e414376c0eeb472e93a41b394085e94df7b2 (patch)
tree0b49417dff00d4abb990be01669342dc7afcb26a
parent663f8445f1120cbb21653da3956f0e35be881ebe (diff)
downloadlcd4linux-b416e414376c0eeb472e93a41b394085e94df7b2.tar.gz
[lcd4linux @ 2006-09-13 20:04:57 by entropy]
threads change argv[0] to their thread name, for a neat 'ps' output git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@711 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
-rw-r--r--lcd4linux.c10
-rw-r--r--thread.c14
-rw-r--r--thread.h9
3 files changed, 29 insertions, 4 deletions
diff --git a/lcd4linux.c b/lcd4linux.c
index 1e33e7c..824c59c 100644
--- a/lcd4linux.c
+++ b/lcd4linux.c
@@ -1,4 +1,4 @@
-/* $Id: lcd4linux.c,v 1.81 2006/08/13 06:46:51 reinelt Exp $
+/* $Id: lcd4linux.c,v 1.82 2006/09/13 20:04:57 entropy Exp $
*
* LCD4Linux
*
@@ -23,6 +23,9 @@
*
*
* $Log: lcd4linux.c,v $
+ * Revision 1.82 2006/09/13 20:04:57 entropy
+ * threads change argv[0] to their thread name, for a neat 'ps' output
+ *
* Revision 1.81 2006/08/13 06:46:51 reinelt
* T6963 soft-timing & enhancements; indent
*
@@ -394,6 +397,7 @@
#include "timer.h"
#include "layout.h"
#include "plugin.h"
+#include "thread.h"
#include "widget.h"
#include "widget_timer.h"
@@ -541,6 +545,10 @@ int main(int argc, char *argv[])
my_argv[c] = strdup(argv[c]);
}
my_argv[c] = NULL;
+
+ /* save original arguments pointer for threads */
+ thread_argv=argv;
+ thread_argc=argc;
running_foreground = 0;
running_background = 0;
diff --git a/thread.c b/thread.c
index bbfad14..2aac128 100644
--- a/thread.c
+++ b/thread.c
@@ -1,4 +1,4 @@
-/* $Id: thread.c,v 1.8 2006/07/12 21:01:41 reinelt Exp $
+/* $Id: thread.c,v 1.9 2006/09/13 20:04:57 entropy Exp $
*
* thread handling (mutex, shmem, ...)
*
@@ -26,6 +26,9 @@
*
*
* $Log: thread.c,v $
+ * Revision 1.9 2006/09/13 20:04:57 entropy
+ * threads change argv[0] to their thread name, for a neat 'ps' output
+ *
* Revision 1.8 2006/07/12 21:01:41 reinelt
* thread_destroy, minor cleanups
*
@@ -108,6 +111,10 @@
#endif
+int thread_argc;
+char **thread_argv;
+
+
/* glibc 2.1 requires defining semun ourselves */
#ifdef _SEM_SEMUN_UNDEFINED
union semun {
@@ -195,13 +202,16 @@ int thread_create(const char *name, void (*thread) (void *data), void *data)
pid_t pid, ppid;
ppid = getpid();
-
+
switch (pid = fork()) {
case -1:
error("fatal error: fork(%s) failed: %s", name, strerror(errno));
return -1;
case 0:
info("thread %s starting...", name);
+ if (thread_argc > 0) {
+ strncpy(thread_argv[0],name,strlen(thread_argv[0]));
+ }
thread(data);
info("thread %s ended.", name);
exit(0);
diff --git a/thread.h b/thread.h
index fcecc89..39ef6a8 100644
--- a/thread.h
+++ b/thread.h
@@ -1,4 +1,4 @@
-/* $Id: thread.h,v 1.7 2006/07/12 21:01:41 reinelt Exp $
+/* $Id: thread.h,v 1.8 2006/09/13 20:04:57 entropy Exp $
*
* thread handling (mutex, shmem, ...)
*
@@ -26,6 +26,9 @@
*
*
* $Log: thread.h,v $
+ * Revision 1.8 2006/09/13 20:04:57 entropy
+ * threads change argv[0] to their thread name, for a neat 'ps' output
+ *
* Revision 1.7 2006/07/12 21:01:41 reinelt
* thread_destroy, minor cleanups
*
@@ -56,6 +59,10 @@
#ifndef _THREAD_H_
#define _THREAD_H_
+
+extern int thread_argc;
+extern char **thread_argv;
+
int mutex_create(void);
void mutex_lock(const int semid);
void mutex_unlock(const int semid);
id='n308' href='#n308'>308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482
/* $Id$
 * $URL$
 *
 * plugin handler for the Evaluator
 *
 * Copyright (C) 2003 Michael Reinelt <michael@reinelt.co.at>
 * Copyright (C) 2004 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
 *
 * This file is part of LCD4Linux.
 *
 * LCD4Linux is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2, or (at your option)
 * any later version.
 *
 * LCD4Linux is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 */

/* 
 * exported functions:
 *
 * int plugin_init (void)
 *  initializes the expression evaluator
 *  adds some handy constants and functions
 *
 */


#include "config.h"

#include <stdlib.h>
#include <stdio.h>
#include <string.h>

#include "debug.h"
#include "plugin.h"


char *Plugins[] = {
    "cfg",
    "math",
    "string",
    "test",
    "time",
#ifdef PLUGIN_APM
    "apm",
#endif
#ifdef PLUGIN_ASTERISK
    "asterisk",
#endif
#ifdef PLUGIN_BUTTON_EXEC
    "button_exec",
#endif
#ifdef PLUGIN_CPUINFO
    "cpuinfo",
#endif
#ifdef PLUGIN_DISKSTATS
    "diskstats",
#endif
#ifdef PLUGIN_DVB
    "dvb",
#endif
#ifdef PLUGIN_EXEC
    "exec",
#endif
#ifdef PLUGIN_FIFO
    "fifo",
#endif
#ifdef PLUGIN_FILE
    "file",
#endif
#ifdef PLUGIN_GPS
    "gps",
#endif
#ifdef PLUGIN_HDDTEMP
    "hddtemp",
#endif
#ifdef PLUGIN_I2C_SENSORS
    "i2c_sensors",
#endif
#ifdef PLUGIN_ICONV
    "iconv",
#endif
#ifdef PLUGIN_IMON
    "imon",
#endif
#ifdef PLUGIN_ISDN
    "isdn",
#endif
#ifdef PLUGIN_KVV
    "kvv",
#endif
#ifdef PLUGIN_LOADAVG
    "loadavg",
#endif
#ifdef PLUGIN_MEMINFO
    "meminfo",
#endif
#ifdef PLUGIN_MPD
    "mpd",
#endif
#ifdef PLUGIN_MYSQL
    "mysql",
#endif
#ifdef PLUGIN_NETDEV
    "netdev",
#endif
#ifdef PLUGIN_NETINFO
    "netinfo",
#endif
#ifdef PLUGIN_POP3
    "pop3",
#endif
#ifdef PLUGIN_PPP
    "ppp",
#endif
#ifdef PLUGIN_PROC_STAT
    "proc_stat",
#endif
#ifdef PLUGIN_PYTHON
    "python",
#endif
#ifdef PLUGIN_SAMPLE
    "sample",
#endif
#ifdef PLUGIN_SETI
    "seti",
#endif
#ifdef PLUGIN_STATFS
    "statfs",
#endif
#ifdef PLUGIN_UNAME
    "uname",
#endif
#ifdef PLUGIN_UPTIME
    "uptime",
#endif
#ifdef PLUGIN_W1RETAP
    "w1retap",
#endif
#ifdef PLUGIN_WIRELESS
    "wireless",
#endif
#ifdef PLUGIN_XMMS
    "xmms",
#endif
    NULL,
};


/* Prototypes */
int plugin_init_cfg(void);
void plugin_exit_cfg(void);
int plugin_init_math(void);
void plugin_exit_math(void);
int plugin_init_string(void);
void plugin_exit_string(void);
int plugin_init_test(void);
void plugin_exit_test(void);
int plugin_init_time(void);
void plugin_exit_time(void);

int plugin_init_apm(void);
void plugin_exit_apm(void);
int plugin_init_asterisk(void);
void plugin_exit_asterisk(void);
int plugin_init_button_exec(void);
void plugin_exit_button_exec(void);
int plugin_init_cpuinfo(void);
void plugin_exit_cpuinfo(void);
int plugin_init_diskstats(void);
void plugin_exit_diskstats(void);
int plugin_init_dvb(void);
void plugin_exit_dvb(void);
int plugin_init_exec(void);
void plugin_exit_exec(void);
int plugin_init_fifo(void);
void plugin_exit_fifo(void);
int plugin_init_file(void);
void plugin_exit_file(void);
int plugin_init_gps(void);
void plugin_exit_gps(void);
int plugin_init_hddtemp(void);
void plugin_exit_hddtemp(void);
int plugin_init_i2c_sensors(void);
void plugin_exit_i2c_sensors(void);
int plugin_init_imon(void);
void plugin_exit_imon(void);
int plugin_init_iconv(void);
void plugin_exit_iconv(void);
int plugin_init_isdn(void);
void plugin_exit_isdn(void);
int plugin_init_kvv(void);
void plugin_exit_kvv(void);
int plugin_init_loadavg(void);
void plugin_exit_loadavg(void);
int plugin_init_meminfo(void);
void plugin_exit_meminfo(void);
int plugin_init_mpd(void);
void plugin_exit_mpd(void);
int plugin_init_mysql(void);
void plugin_exit_mysql(void);
int plugin_init_netdev(void);
void plugin_exit_netdev(void);
int plugin_init_netinfo(void);
void plugin_exit_netinfo(void);
int plugin_init_pop3(void);
void plugin_exit_pop3(void);
int plugin_init_ppp(void);
void plugin_exit_ppp(void);
int plugin_init_proc_stat(void);
void plugin_exit_proc_stat(void);
int plugin_init_python(void);
void plugin_exit_python(void);
int plugin_init_sample(void);
void plugin_exit_sample(void);
int plugin_init_seti(void);
void plugin_exit_seti(void);
int plugin_init_statfs(void);
void plugin_exit_statfs(void);
int plugin_init_uname(void);
void plugin_exit_uname(void);
int plugin_init_uptime(void);
void plugin_exit_uptime(void);
int plugin_init_w1retap(void);
void plugin_exit_w1retap(void);
int plugin_init_wireless(void);
void plugin_exit_wireless(void);
int plugin_init_xmms(void);
void plugin_exit_xmms(void);


int plugin_list(void)
{
    int i;

    printf("available plugins:\n  ");

    for (i = 0; Plugins[i]; i++) {
	printf("%s", Plugins[i]);
	if (Plugins[i + 1])
	    printf(", ");
    }
    printf("\n");
    return 0;
}


int plugin_init(void)
{
    plugin_init_cfg();
    plugin_init_math();
    plugin_init_string();
    plugin_init_test();
    plugin_init_time();

#ifdef PLUGIN_APM
    plugin_init_apm();
#endif
#ifdef PLUGIN_ASTERISK
    plugin_init_asterisk();
#endif
#ifdef PLUGIN_BUTTON_EXEC
    plugin_init_button_exec();
#endif
#ifdef PLUGIN_CPUINFO
    plugin_init_cpuinfo();
#endif
#ifdef PLUGIN_DISKSTATS
    plugin_init_diskstats();
#endif
#ifdef PLUGIN_DVB
    plugin_init_dvb();
#endif
#ifdef PLUGIN_EXEC
    plugin_init_exec();
#endif
#ifdef PLUGIN_FIFO
    plugin_init_fifo();
#endif
#ifdef PLUGIN_FILE
    plugin_init_file();
#endif
#ifdef PLUGIN_GPS
    plugin_init_gps();
#endif
#ifdef PLUGIN_HDDTEMP
    plugin_init_hddtemp();
#endif
#ifdef PLUGIN_I2C_SENSORS
    plugin_init_i2c_sensors();
#endif
#ifdef PLUGIN_ICONV
    plugin_init_iconv();
#endif
#ifdef PLUGIN_IMON
    plugin_init_imon();
#endif
#ifdef PLUGIN_ISDN
    plugin_init_isdn();
#endif
#ifdef PLUGIN_KVV
    plugin_init_kvv();
#endif
#ifdef PLUGIN_LOADAVG
    plugin_init_loadavg();
#endif
#ifdef PLUGIN_MEMINFO
    plugin_init_meminfo();
#endif
#ifdef PLUGIN_MPD
    plugin_init_mpd();
#endif
#ifdef PLUGIN_MYSQL
    plugin_init_mysql();
#endif
#ifdef PLUGIN_NETDEV
    plugin_init_netdev();
#endif
#ifdef PLUGIN_NETINFO
    plugin_init_netinfo();
#endif
#ifdef PLUGIN_POP3
    plugin_init_pop3();
#endif
#ifdef PLUGIN_PPP
    plugin_init_ppp();
#endif
#ifdef PLUGIN_PROC_STAT
    plugin_init_proc_stat();
#endif
#ifdef PLUGIN_PYTHON
    plugin_init_python();
#endif
#ifdef PLUGIN_SAMPLE
    plugin_init_sample();
#endif
#ifdef PLUGIN_SETI
    plugin_init_seti();
#endif
#ifdef PLUGIN_STATFS
    plugin_init_statfs();
#endif
#ifdef PLUGIN_UNAME
    plugin_init_uname();
#endif
#ifdef PLUGIN_UPTIME
    plugin_init_uptime();
#endif
#ifdef PLUGIN_W1RETAP
    plugin_init_w1retap();
#endif
#ifdef PLUGIN_WIRELESS
    plugin_init_wireless();
#endif
#ifdef PLUGIN_XMMS
    plugin_init_xmms();
#endif

    return 0;
}


void plugin_exit(void)
{
#ifdef PLUGIN_APM
    plugin_exit_apm();
#endif
#ifdef PLUGIN_ASTERISK
    plugin_exit_asterisk();
#endif
#ifdef PLUGIN_BUTTON_EXEC
    plugin_exit_button_exec();
#endif
#ifdef PLUGIN_CPUINFO
    plugin_exit_cpuinfo();
#endif
#ifdef PLUGIN_DISKSTATS
    plugin_exit_diskstats();
#endif
#ifdef PLUGIN_DVB
    plugin_exit_dvb();
#endif
#ifdef PLUGIN_EXEC
    plugin_exit_exec();
#endif
#ifdef PLUGIN_FIFO
    plugin_exit_fifo();
#endif
#ifdef PLUGIN_FILE
    plugin_exit_file();
#endif
#ifdef PLUGIN_GPS
    plugin_exit_gps();
#endif
#ifdef PLUGIN_I2C_SENSORS
    plugin_exit_i2c_sensors();
#endif
#ifdef PLUGIN_ICONV
    plugin_exit_iconv();
#endif
#ifdef PLUGIN_IMON
    plugin_exit_imon();
#endif
#ifdef PLUGIN_ISDN
    plugin_exit_isdn();
#endif
#ifdef PLUGIN_KVV
    plugin_exit_kvv();
#endif
#ifdef PLUGIN_LOADAVG
    plugin_exit_loadavg();
#endif
#ifdef PLUGIN_MEMINFO
    plugin_exit_meminfo();
#endif
#ifdef PLUGIN_MPD
    plugin_exit_mpd();
#endif
#ifdef PLUGIN_MYSQL
    plugin_exit_mysql();
#endif
#ifdef PLUGIN_NETDEV
    plugin_exit_netdev();
#endif
#ifdef PLUGIN_NETINFO
    plugin_exit_netinfo();
#endif
#ifdef PLUGIN_POP3
    plugin_exit_pop3();
#endif
#ifdef PLUGIN_PPP
    plugin_exit_ppp();
#endif
#ifdef PLUGIN_PROC_STAT
    plugin_exit_proc_stat();
#endif
#ifdef PLUGIN_PYTHON
    plugin_exit_python();
#endif
#ifdef PLUGIN_SAMPLE
    plugin_exit_sample();
#endif
#ifdef PLUGIN_SETI
    plugin_exit_seti();
#endif
#ifdef PLUGIN_STATFS
    plugin_exit_statfs();
#endif
#ifdef PLUGIN_UNAME
    plugin_exit_uname();
#endif
#ifdef PLUGIN_UPTIME
    plugin_exit_uptime();
#endif
#ifdef PLUGIN_W1RETAP
    plugin_exit_w1retap();
#endif
#ifdef PLUGIN_WIRELESS
    plugin_exit_wireless();
#endif
#ifdef PLUGIN_XMMS
    plugin_exit_xmms();
#endif

    plugin_exit_cfg();
    plugin_exit_math();
    plugin_exit_string();
    plugin_exit_test();
    plugin_exit_time();

    DeleteFunctions();
    DeleteVariables();
}