[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13541 - in gnunet/src: arm core datastore dht fs hostlist
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r13541 - in gnunet/src: arm core datastore dht fs hostlist include peerinfo statistics testing transport util vpn |
|
Date: |
Wed, 3 Nov 2010 22:38:45 +0100 |
Author: grothoff
Date: 2010-11-03 22:38:45 +0100 (Wed, 03 Nov 2010)
New Revision: 13541
Modified:
gnunet/src/arm/arm_api.c
gnunet/src/arm/do_start_process.c
gnunet/src/arm/gnunet-service-arm.c
gnunet/src/core/test_core_api.c
gnunet/src/core/test_core_api_reliability.c
gnunet/src/core/test_core_api_start_only.c
gnunet/src/datastore/perf_datastore_api.c
gnunet/src/datastore/test_datastore_api.c
gnunet/src/datastore/test_datastore_api_management.c
gnunet/src/dht/test_dht_api.c
gnunet/src/fs/test_fs.c
gnunet/src/fs/test_fs_download.c
gnunet/src/fs/test_fs_download_indexed.c
gnunet/src/fs/test_fs_download_persistence.c
gnunet/src/fs/test_fs_download_recursive.c
gnunet/src/fs/test_fs_list_indexed.c
gnunet/src/fs/test_fs_namespace.c
gnunet/src/fs/test_fs_namespace_list_updateable.c
gnunet/src/fs/test_fs_publish.c
gnunet/src/fs/test_fs_publish_persistence.c
gnunet/src/fs/test_fs_search.c
gnunet/src/fs/test_fs_search_persistence.c
gnunet/src/fs/test_fs_search_ranking.c
gnunet/src/fs/test_fs_start_stop.c
gnunet/src/fs/test_fs_unindex.c
gnunet/src/fs/test_fs_unindex_persistence.c
gnunet/src/hostlist/test_gnunet_daemon_hostlist.c
gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
gnunet/src/include/gnunet_os_lib.h
gnunet/src/include/gnunet_testing_lib.h
gnunet/src/peerinfo/perf_peerinfo_api.c
gnunet/src/peerinfo/test_peerinfo_api.c
gnunet/src/statistics/test_statistics_api.c
gnunet/src/statistics/test_statistics_api_loop.c
gnunet/src/testing/test_testing_topology.c
gnunet/src/testing/testing_group.c
gnunet/src/transport/plugin_transport_tcp.c
gnunet/src/transport/plugin_transport_udp.c
gnunet/src/transport/plugin_transport_wlan.c
gnunet/src/transport/test_quota_compliance.c
gnunet/src/transport/test_transport_api.c
gnunet/src/transport/test_transport_api_reliability.c
gnunet/src/util/crypto_random.c
gnunet/src/util/os_priority.c
gnunet/src/util/test_os_start_process.c
gnunet/src/util/test_resolver_api.c
gnunet/src/vpn/gnunet-daemon-vpn.c
Log:
style improvments wrt Mantis 1614 patch
Modified: gnunet/src/arm/arm_api.c
===================================================================
--- gnunet/src/arm/arm_api.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/arm/arm_api.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -375,7 +375,7 @@
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct RequestContext *pos = cls;
- GNUNET_OS_Process *proc;
+ struct GNUNET_OS_Process *proc;
char *binary;
char *config;
char *loprefix;
Modified: gnunet/src/arm/do_start_process.c
===================================================================
--- gnunet/src/arm/do_start_process.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/arm/do_start_process.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -12,7 +12,7 @@
* @param ... more arguments, NULL terminated
* @return PID of the started process, -1 on error
*/
-static GNUNET_OS_Process *
+static struct GNUNET_OS_Process *
do_start_process (const int *lsocks,
const char *first_arg, ...)
{
@@ -24,7 +24,7 @@
char *pos;
char *cp;
const char *last;
- GNUNET_OS_Process *proc;
+ struct GNUNET_OS_Process *proc;
argv_size = 1;
va_start (ap, first_arg);
Modified: gnunet/src/arm/gnunet-service-arm.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/arm/gnunet-service-arm.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -93,7 +93,7 @@
/**
* Process structure pointer of the child.
*/
- GNUNET_OS_Process *proc;
+ struct GNUNET_OS_Process *proc;
/**
* Last time the config of this service was
@@ -434,12 +434,10 @@
sl->name);
else
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Starting service `%s' (PID: %d)\n"),
- sl->name,
- (int) GNUNET_OS_process_get_pid (sl->proc));
+ _("Starting service `%s'\n"),
+ sl->name);
GNUNET_free (loprefix);
GNUNET_free (options);
- /* FIXME: should check sl->proc */
}
@@ -735,9 +733,8 @@
if (pos->proc != NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Stopping service `%s' (PID: %d)\n",
- pos->name,
- GNUNET_OS_process_get_pid (pos->proc));
+ "Stopping service `%s'\n",
+ pos->name);
if (0 != GNUNET_OS_process_kill (pos->proc, SIGTERM))
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
}
Modified: gnunet/src/core/test_core_api.c
===================================================================
--- gnunet/src/core/test_core_api.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/core/test_core_api.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -54,7 +54,7 @@
struct GNUNET_MessageHeader *hello;
int connect_status;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/core/test_core_api_reliability.c
===================================================================
--- gnunet/src/core/test_core_api_reliability.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/core/test_core_api_reliability.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -74,7 +74,7 @@
struct GNUNET_MessageHeader *hello;
int connect_status;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/core/test_core_api_start_only.c
===================================================================
--- gnunet/src/core/test_core_api_start_only.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/core/test_core_api_start_only.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -49,7 +49,7 @@
struct GNUNET_CORE_Handle *ch;
struct GNUNET_PeerIdentity id;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/datastore/perf_datastore_api.c
===================================================================
--- gnunet/src/datastore/perf_datastore_api.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/datastore/perf_datastore_api.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -372,7 +372,7 @@
static int
check ()
{
- GNUNET_OS_Process *proc;
+ struct GNUNET_OS_Process *proc;
char cfg_name[128];
char *const argv[] = {
"perf-datastore-api",
Modified: gnunet/src/datastore/test_datastore_api.c
===================================================================
--- gnunet/src/datastore/test_datastore_api.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/datastore/test_datastore_api.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -641,7 +641,7 @@
{
char cfg_name[128];
#if START_DATASTORE
- GNUNET_OS_Process *proc;
+ struct GNUNET_OS_Process *proc;
#endif
char *const argv[] = {
"test-datastore-api",
Modified: gnunet/src/datastore/test_datastore_api_management.c
===================================================================
--- gnunet/src/datastore/test_datastore_api_management.c 2010-11-03
21:26:40 UTC (rev 13540)
+++ gnunet/src/datastore/test_datastore_api_management.c 2010-11-03
21:38:45 UTC (rev 13541)
@@ -350,7 +350,7 @@
static int
check ()
{
- GNUNET_OS_Process *proc;
+ struct GNUNET_OS_Process *proc;
char cfg_name[128];
char *const argv[] = {
"test-datastore-api-management",
Modified: gnunet/src/dht/test_dht_api.c
===================================================================
--- gnunet/src/dht/test_dht_api.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/dht/test_dht_api.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -85,7 +85,7 @@
struct GNUNET_DHT_FindPeerHandle *find_peer_handle;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/fs/test_fs.c
===================================================================
--- gnunet/src/fs/test_fs.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/fs/test_fs.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -104,7 +104,7 @@
main (int argc, char *argv[])
{
#if START_DAEMON
- GNUNET_OS_Process *daemon;
+ struct GNUNET_OS_Process *daemon;
#endif
int ok;
struct GNUNET_ECRS_URI *uri;
Modified: gnunet/src/fs/test_fs_download.c
===================================================================
--- gnunet/src/fs/test_fs_download.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/fs/test_fs_download.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -52,7 +52,7 @@
{
struct GNUNET_CONFIGURATION_Handle *cfg;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/fs/test_fs_download_indexed.c
===================================================================
--- gnunet/src/fs/test_fs_download_indexed.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/fs/test_fs_download_indexed.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -52,7 +52,7 @@
{
struct GNUNET_CONFIGURATION_Handle *cfg;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/fs/test_fs_download_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_download_persistence.c 2010-11-03 21:26:40 UTC
(rev 13540)
+++ gnunet/src/fs/test_fs_download_persistence.c 2010-11-03 21:38:45 UTC
(rev 13541)
@@ -52,7 +52,7 @@
{
struct GNUNET_CONFIGURATION_Handle *cfg;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/fs/test_fs_download_recursive.c
===================================================================
--- gnunet/src/fs/test_fs_download_recursive.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/fs/test_fs_download_recursive.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -256,7 +256,7 @@
main (int argc, char *argv[])
{
#if START_DAEMON
- GNUNET_OS_Process *daemon;
+ struct GNUNET_OS_Process *daemon;
#endif
int ok;
char *fn = NULL;
Modified: gnunet/src/fs/test_fs_list_indexed.c
===================================================================
--- gnunet/src/fs/test_fs_list_indexed.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/fs/test_fs_list_indexed.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -56,7 +56,7 @@
{
struct GNUNET_CONFIGURATION_Handle *cfg;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/fs/test_fs_namespace.c
===================================================================
--- gnunet/src/fs/test_fs_namespace.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/fs/test_fs_namespace.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -59,7 +59,7 @@
{
struct GNUNET_CONFIGURATION_Handle *cfg;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/fs/test_fs_namespace_list_updateable.c
===================================================================
--- gnunet/src/fs/test_fs_namespace_list_updateable.c 2010-11-03 21:26:40 UTC
(rev 13540)
+++ gnunet/src/fs/test_fs_namespace_list_updateable.c 2010-11-03 21:38:45 UTC
(rev 13541)
@@ -55,7 +55,7 @@
{
struct GNUNET_CONFIGURATION_Handle *cfg;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/fs/test_fs_publish.c
===================================================================
--- gnunet/src/fs/test_fs_publish.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/fs/test_fs_publish.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -53,7 +53,7 @@
{
struct GNUNET_CONFIGURATION_Handle *cfg;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/fs/test_fs_publish_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_publish_persistence.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/fs/test_fs_publish_persistence.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -52,7 +52,7 @@
{
struct GNUNET_CONFIGURATION_Handle *cfg;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/fs/test_fs_search.c
===================================================================
--- gnunet/src/fs/test_fs_search.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/fs/test_fs_search.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -53,7 +53,7 @@
struct GNUNET_CONFIGURATION_Handle *cfg;
struct GNUNET_PeerIdentity id;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/fs/test_fs_search_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_search_persistence.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/fs/test_fs_search_persistence.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -53,7 +53,7 @@
struct GNUNET_CONFIGURATION_Handle *cfg;
struct GNUNET_PeerIdentity id;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/fs/test_fs_search_ranking.c
===================================================================
--- gnunet/src/fs/test_fs_search_ranking.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/fs/test_fs_search_ranking.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -126,7 +126,7 @@
main (int argc, char *argv[])
{
#if START_DAEMON
- GNUNET_OS_Process *daemon;
+ struct GNUNET_OS_Process *daemon;
#endif
int ok;
char *fn = NULL;
Modified: gnunet/src/fs/test_fs_start_stop.c
===================================================================
--- gnunet/src/fs/test_fs_start_stop.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/fs/test_fs_start_stop.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -41,7 +41,7 @@
{
struct GNUNET_CONFIGURATION_Handle *cfg;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/fs/test_fs_unindex.c
===================================================================
--- gnunet/src/fs/test_fs_unindex.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/fs/test_fs_unindex.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -52,7 +52,7 @@
{
struct GNUNET_CONFIGURATION_Handle *cfg;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/fs/test_fs_unindex_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_unindex_persistence.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/fs/test_fs_unindex_persistence.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -51,7 +51,7 @@
{
struct GNUNET_CONFIGURATION_Handle *cfg;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist.c 2010-11-03 21:26:40 UTC
(rev 13540)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist.c 2010-11-03 21:38:45 UTC
(rev 13541)
@@ -49,7 +49,7 @@
struct GNUNET_TRANSPORT_Handle *th;
struct GNUNET_MessageHeader *hello;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c 2010-11-03
21:26:40 UTC (rev 13540)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c 2010-11-03
21:38:45 UTC (rev 13541)
@@ -71,7 +71,7 @@
struct GNUNET_CORE_Handle *core;
struct GNUNET_STATISTICS_Handle *stats;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/include/gnunet_os_lib.h
===================================================================
--- gnunet/src/include/gnunet_os_lib.h 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/include/gnunet_os_lib.h 2010-11-03 21:38:45 UTC (rev 13541)
@@ -47,7 +47,7 @@
/**
* Process information (OS-dependent)
*/
-typedef struct _GNUNET_OS_Process GNUNET_OS_Process;
+struct GNUNET_OS_Process;
/**
@@ -175,16 +175,7 @@
#define GNUNET_OS_get_hostname_max_length() 255
#endif
-/**
- * Allocates new process structure
- *
- * Should be made internal?
- *
- * @return pointer to allocated structure
- */
-GNUNET_OS_Process *GNUNET_OS_process_alloc ();
-
/**
* Get process structure for current process
*
@@ -193,7 +184,7 @@
*
* @return pointer to the process sturcutre for this process
*/
-GNUNET_OS_Process *GNUNET_OS_process_current ();
+struct GNUNET_OS_Process *GNUNET_OS_process_current (void);
/**
@@ -203,65 +194,25 @@
* @param sig signal
* @return 0 on success, -1 on error
*/
-int GNUNET_OS_process_kill (GNUNET_OS_Process *proc, int sig);
+int GNUNET_OS_process_kill (struct GNUNET_OS_Process *proc, int sig);
-/**
- * Get process ID
- *
- * Should be made internal?
- *
- * @param proc pointer to process structure
- * @return process ID
- */
-pid_t GNUNET_OS_process_get_pid (GNUNET_OS_Process *proc);
/**
- * Set process ID
+ * Cleans up process structure contents (OS-dependent) and deallocates it
*
- * Should be made internal?
- *
* @param proc pointer to process structure
- * @param pid process ID
*/
-void GNUNET_OS_process_set_pid (GNUNET_OS_Process *proc, pid_t pid);
+void GNUNET_OS_process_close (struct GNUNET_OS_Process *proc);
-#if WINDOWS
-/**
- * Get process handle
- *
- * Should be made internal?
- *
- * @param proc pointer to process structure
- * @return process handle
- */
-HANDLE GNUNET_OS_process_get_handle (GNUNET_OS_Process *proc);
/**
- * Set process handle
- *
- * Should be made internal?
- *
- * @param proc pointer to process structure
- * @param handle process handle
- */
-void GNUNET_OS_process_set_handle(GNUNET_OS_Process *proc, HANDLE handle);
-#endif
-
-/**
- * Cleans up process structure contents (OS-dependent) and deallocates it
- *
- * @param proc pointer to process structure
- */
-void GNUNET_OS_process_close (GNUNET_OS_Process *proc);
-
-/**
* Set process priority
*
* @param proc pointer to process structure
* @param prio priority value
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
-int GNUNET_OS_set_process_priority (GNUNET_OS_Process *proc,
+int GNUNET_OS_set_process_priority (struct GNUNET_OS_Process *proc,
enum GNUNET_SCHEDULER_Priority prio);
@@ -274,7 +225,7 @@
* @param ... NULL-terminated list of arguments to the process
* @return pointer to process structure of the new process, NULL on error
*/
-GNUNET_OS_Process *
+struct GNUNET_OS_Process *
GNUNET_OS_start_process (struct GNUNET_DISK_PipeHandle *pipe_stdin,
struct GNUNET_DISK_PipeHandle *pipe_stdout,
const char *filename, ...);
@@ -290,7 +241,7 @@
* including the process name as the first argument
* @return pointer to process structure of the new process, NULL on error
*/
-GNUNET_OS_Process *
+struct GNUNET_OS_Process *
GNUNET_OS_start_process_v (const int *lsocks, const char *filename,
char *const argv[]);
@@ -302,8 +253,8 @@
* @param code return code/signal number
* @return GNUNET_OK on success, GNUNET_NO if the process is still running,
GNUNET_SYSERR otherwise
*/
-int GNUNET_OS_process_status (GNUNET_OS_Process *proc,
- enum GNUNET_OS_ProcessStatusType *type, unsigned long *code);
+int GNUNET_OS_process_status (struct GNUNET_OS_Process *proc,
+ enum GNUNET_OS_ProcessStatusType *type, unsigned
long *code);
/**
@@ -311,7 +262,7 @@
* @param proc pointer to process structure of the process to wait for
* @return GNUNET_OK on success, GNUNET_SYSERR otherwise
*/
-int GNUNET_OS_process_wait (GNUNET_OS_Process *proc);
+int GNUNET_OS_process_wait (struct GNUNET_OS_Process *proc);
#if 0 /* keep Emacsens' auto-indent happy */
Modified: gnunet/src/include/gnunet_testing_lib.h
===================================================================
--- gnunet/src/include/gnunet_testing_lib.h 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/include/gnunet_testing_lib.h 2010-11-03 21:38:45 UTC (rev
13541)
@@ -301,7 +301,7 @@
/**
* PID of the process that we started last.
*/
- GNUNET_OS_Process *proc;
+ struct GNUNET_OS_Process *proc;
/**
* In which phase are we during the start of
Modified: gnunet/src/peerinfo/perf_peerinfo_api.c
===================================================================
--- gnunet/src/peerinfo/perf_peerinfo_api.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/peerinfo/perf_peerinfo_api.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -166,7 +166,7 @@
NULL
};
#if START_SERVICE
- GNUNET_OS_Process *proc;
+ struct GNUNET_OS_Process *proc;
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
Modified: gnunet/src/peerinfo/test_peerinfo_api.c
===================================================================
--- gnunet/src/peerinfo/test_peerinfo_api.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/peerinfo/test_peerinfo_api.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -165,7 +165,7 @@
check ()
{
int ok = 3;
- GNUNET_OS_Process *proc;
+ struct GNUNET_OS_Process *proc;
char *const argv[] = { "test-peerinfo-api",
"-c",
"test_peerinfo_api_data.conf",
Modified: gnunet/src/statistics/test_statistics_api.c
===================================================================
--- gnunet/src/statistics/test_statistics_api.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/statistics/test_statistics_api.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -157,7 +157,7 @@
GNUNET_GETOPT_OPTION_END
};
#if START_SERVICE
- GNUNET_OS_Process *proc;
+ struct GNUNET_OS_Process *proc;
proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-statistics",
"gnunet-service-statistics",
#if DEBUG_STATISTICS
Modified: gnunet/src/statistics/test_statistics_api_loop.c
===================================================================
--- gnunet/src/statistics/test_statistics_api_loop.c 2010-11-03 21:26:40 UTC
(rev 13540)
+++ gnunet/src/statistics/test_statistics_api_loop.c 2010-11-03 21:38:45 UTC
(rev 13541)
@@ -96,7 +96,7 @@
GNUNET_GETOPT_OPTION_END
};
#if START_SERVICE
- GNUNET_OS_Process *proc;
+ struct GNUNET_OS_Process *proc;
proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-statistics",
"gnunet-service-statistics",
#if DEBUG_STATISTICS
Modified: gnunet/src/testing/test_testing_topology.c
===================================================================
--- gnunet/src/testing/test_testing_topology.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/testing/test_testing_topology.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -179,7 +179,7 @@
{
char *peer_number;
char *connect_number;
- GNUNET_OS_Process *mem_process;
+ struct GNUNET_OS_Process *mem_process;
GNUNET_asprintf(&peer_number, "%llu", num_peers);
GNUNET_asprintf(&connect_number, "%llu", expected_connections);
mem_process = GNUNET_OS_start_process (NULL, NULL, "./memsize.pl",
Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/testing/testing_group.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -1937,7 +1937,7 @@
FILE *temp_friend_handle;
unsigned int pg_iter;
char *temp_service_path;
- GNUNET_OS_Process **procarr;
+ struct GNUNET_OS_Process **procarr;
char *arg;
char * mytemp;
enum GNUNET_OS_ProcessStatusType type;
@@ -1946,7 +1946,7 @@
int ret;
int max_wait = 10;
- procarr = GNUNET_malloc(sizeof(GNUNET_OS_Process *) * pg->total);
+ procarr = GNUNET_malloc(sizeof(struct GNUNET_OS_Process *) * pg->total);
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
mytemp = GNUNET_DISK_mktemp("friends");
@@ -2064,7 +2064,7 @@
static struct BlacklistContext blacklist_ctx;
unsigned int pg_iter;
char *temp_service_path;
- GNUNET_OS_Process **procarr;
+ struct GNUNET_OS_Process **procarr;
char *arg;
char *mytemp;
enum GNUNET_OS_ProcessStatusType type;
@@ -2077,7 +2077,7 @@
char *pos;
char *temp_transports;
- procarr = GNUNET_malloc(sizeof(GNUNET_OS_Process *) * pg->total);
+ procarr = GNUNET_malloc(sizeof(struct GNUNET_OS_Process *) * pg->total);
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
mytemp = GNUNET_DISK_mktemp("blacklist");
Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/transport/plugin_transport_tcp.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -345,7 +345,7 @@
/**
* The process id of the server process (if behind NAT)
*/
- GNUNET_OS_Process *server_proc;
+ struct GNUNET_OS_Process *server_proc;
/**
* List of open TCP sessions.
@@ -958,7 +958,7 @@
char inet4[INET_ADDRSTRLEN];
char *address_as_string;
char *port_as_string;
- GNUNET_OS_Process *proc;
+ struct GNUNET_OS_Process *proc;
const struct sockaddr *sa = (const struct sockaddr *)addr;
#if DEBUG_TCP_NAT
Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/transport/plugin_transport_udp.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -471,7 +471,7 @@
/**
* The process id of the server process (if behind NAT)
*/
- GNUNET_OS_Process *server_proc;
+ struct GNUNET_OS_Process *server_proc;
};
@@ -702,7 +702,7 @@
char addr_buf[INET_ADDRSTRLEN];
char *address_as_string;
char *port_as_string;
- GNUNET_OS_Process *proc;
+ struct GNUNET_OS_Process *proc;
const struct IPv4UdpAddress *t4;
GNUNET_assert(addrlen == sizeof(struct IPv4UdpAddress));
Modified: gnunet/src/transport/plugin_transport_wlan.c
===================================================================
--- gnunet/src/transport/plugin_transport_wlan.c 2010-11-03 21:26:40 UTC
(rev 13540)
+++ gnunet/src/transport/plugin_transport_wlan.c 2010-11-03 21:38:45 UTC
(rev 13541)
@@ -135,7 +135,7 @@
/**
* The process id of the server process (if behind NAT)
*/
- GNUNET_OS_Process *server_proc;
+ struct GNUNET_OS_Process *server_proc;
/**
* The interface of the wlan card given to us by the user.
Modified: gnunet/src/transport/test_quota_compliance.c
===================================================================
--- gnunet/src/transport/test_quota_compliance.c 2010-11-03 21:26:40 UTC
(rev 13540)
+++ gnunet/src/transport/test_quota_compliance.c 2010-11-03 21:38:45 UTC
(rev 13541)
@@ -65,7 +65,7 @@
struct GNUNET_TRANSPORT_Handle *th;
struct GNUNET_PeerIdentity id;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/transport/test_transport_api.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -60,7 +60,7 @@
struct GNUNET_TRANSPORT_Handle *th;
struct GNUNET_PeerIdentity id;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/transport/test_transport_api_reliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_reliability.c 2010-11-03
21:26:40 UTC (rev 13540)
+++ gnunet/src/transport/test_transport_api_reliability.c 2010-11-03
21:38:45 UTC (rev 13541)
@@ -62,7 +62,7 @@
struct GNUNET_TRANSPORT_Handle *th;
struct GNUNET_PeerIdentity id;
#if START_ARM
- GNUNET_OS_Process *arm_proc;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
Modified: gnunet/src/util/crypto_random.c
===================================================================
--- gnunet/src/util/crypto_random.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/util/crypto_random.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -188,7 +188,7 @@
* Process ID of the "find" process that we use for
* entropy gathering.
*/
-static GNUNET_OS_Process *genproc;
+static struct GNUNET_OS_Process *genproc;
/**
* Function called by libgcrypt whenever we are
Modified: gnunet/src/util/os_priority.c
===================================================================
--- gnunet/src/util/os_priority.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/util/os_priority.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -29,7 +29,7 @@
#include "gnunet_os_lib.h"
#include "disk.h"
-struct _GNUNET_OS_Process
+struct GNUNET_OS_Process
{
pid_t pid;
#if WINDOWS
@@ -37,19 +37,20 @@
#endif
};
-static GNUNET_OS_Process current_process;
+static struct GNUNET_OS_Process current_process;
-GNUNET_OS_Process *
-GNUNET_OS_process_alloc ()
-{
- GNUNET_OS_Process *ret = GNUNET_malloc (sizeof (GNUNET_OS_Process));
- ret->pid = 0;
+
#if WINDOWS
- ret->handle = NULL;
-#endif
- return ret;
+void
+GNUNET_OS_process_set_handle(struct GNUNET_OS_Process *proc, HANDLE handle)
+{
+ if (proc->handle != NULL)
+ CloseHandle (proc->handle);
+ proc->handle = handle;
}
+#endif
+
/**
* Get process structure for current process
*
@@ -58,7 +59,7 @@
*
* @return pointer to the process sturcutre for this process
*/
-GNUNET_OS_Process *
+struct GNUNET_OS_Process *
GNUNET_OS_process_current ()
{
#if WINDOWS
@@ -71,7 +72,7 @@
}
int
-GNUNET_OS_process_kill (GNUNET_OS_Process *proc, int sig)
+GNUNET_OS_process_kill (struct GNUNET_OS_Process *proc, int sig)
{
#if WINDOWS
if (sig == SIGKILL || sig == SIGTERM)
@@ -79,7 +80,10 @@
HANDLE h = GNUNET_OS_process_get_handle (proc);
if (NULL == h)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Invalid process information {%d,
%08X}\n", GNUNET_OS_process_get_pid (proc), h);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Invalid process information {%d, %08X}\n"),
+ proc->pid,
+ h);
return -1;
}
if (!TerminateProcess (h, 0))
@@ -93,44 +97,17 @@
errno = EINVAL;
return -1;
#else
- return kill (GNUNET_OS_process_get_pid (proc), sig);
+ return kill (proc->pid, sig);
#endif
}
-pid_t
-GNUNET_OS_process_get_pid (GNUNET_OS_Process *proc)
-{
- return proc->pid;
-}
void
-GNUNET_OS_process_set_pid (GNUNET_OS_Process *proc, pid_t pid)
+GNUNET_OS_process_close (struct GNUNET_OS_Process *proc)
{
- proc->pid = pid;
-}
-
#if WINDOWS
-HANDLE
-GNUNET_OS_process_get_handle (GNUNET_OS_Process *proc)
-{
- return proc->handle;
-}
-
-void
-GNUNET_OS_process_set_handle(GNUNET_OS_Process *proc, HANDLE handle)
-{
if (proc->handle != NULL)
CloseHandle (proc->handle);
- proc->handle = handle;
-}
-#endif
-
-void
-GNUNET_OS_process_close (GNUNET_OS_Process *proc)
-{
-#if WINDOWS
- if (proc->handle != NULL)
- CloseHandle (proc->handle);
#endif
GNUNET_free (proc);
}
@@ -147,7 +124,7 @@
static DWORD WINAPI
ChildWaitThread (void *arg)
{
- GNUNET_OS_Process *proc = (GNUNET_OS_Process *) arg;
+ struct GNUNET_OS_Process *proc = (struct GNUNET_OS_Process *) arg;
WaitForSingleObject (proc->handle, INFINITE);
if (w32_sigchld_handler)
@@ -165,11 +142,10 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
-GNUNET_OS_set_process_priority (GNUNET_OS_Process *proc,
+GNUNET_OS_set_process_priority (struct GNUNET_OS_Process *proc,
enum GNUNET_SCHEDULER_Priority prio)
{
int rprio;
- pid_t pid;
GNUNET_assert (prio < GNUNET_SCHEDULER_PRIORITY_COUNT);
if (prio == GNUNET_SCHEDULER_PRIORITY_KEEP)
@@ -223,16 +199,17 @@
return GNUNET_SYSERR;
}
- pid = GNUNET_OS_process_get_pid (proc);
-
/* Set process priority */
#ifdef MINGW
{
- HANDLE h = GNUNET_OS_process_get_handle (proc);
+ HANDLE h = proc->handle;
GNUNET_assert (h != NULL);
SetPriorityClass (h, rprio);
}
#elif LINUX
+ pid_t pid;
+
+ pid = proc->pid;
if ( (0 == pid) ||
(pid == getpid () ) )
{
@@ -251,7 +228,6 @@
else
{
if (0 != setpriority (PRIO_PROCESS, pid, rprio))
-
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING |
GNUNET_ERROR_TYPE_BULK, "setpriority");
@@ -274,7 +250,7 @@
* @param ... NULL-terminated list of arguments to the process
* @return pointer to process structure of the new process, NULL on error
*/
-GNUNET_OS_Process *
+struct GNUNET_OS_Process *
GNUNET_OS_start_process (struct GNUNET_DISK_PipeHandle *pipe_stdin,
struct GNUNET_DISK_PipeHandle *pipe_stdout,
const char *filename, ...)
@@ -283,7 +259,7 @@
#ifndef MINGW
pid_t ret;
- GNUNET_OS_Process *gnunet_proc = NULL;
+ struct GNUNET_OS_Process *gnunet_proc = NULL;
char **argv;
int argc;
int fd_stdout_write;
@@ -342,8 +318,8 @@
GNUNET_DISK_pipe_close_end(pipe_stdin, GNUNET_DISK_PIPE_END_READ);
sleep (1);
#endif
- gnunet_proc = GNUNET_OS_process_alloc ();
- GNUNET_OS_process_set_pid (gnunet_proc, ret);
+ gnunet_proc = GNUNET_malloc (sizeof (struct GNUNET_OS_Process));
+ gnunet_proc->pid = ret;
}
GNUNET_free (argv);
return gnunet_proc;
@@ -375,7 +351,7 @@
int findresult;
STARTUPINFO start;
PROCESS_INFORMATION proc;
- GNUNET_OS_Process *gnunet_proc = NULL;
+ struct GNUNET_OS_Process *gnunet_proc = NULL;
HANDLE stdin_handle;
HANDLE stdout_handle;
@@ -429,9 +405,9 @@
return NULL;
}
- gnunet_proc = GNUNET_OS_process_alloc ();
- GNUNET_OS_process_set_pid (gnunet_proc, proc.dwProcessId);
- GNUNET_OS_process_set_handle (gnunet_proc, proc.hProcess);
+ gnunet_proc = GNUNET_malloc (sizeof (struct GNUNET_OS_Process));
+ gnunet_proc->pid = proc.dwProcessId;
+ gnunet_proc->handle = proc.hProcess;
CreateThread (NULL, 64000, ChildWaitThread, (void *) gnunet_proc, 0, NULL);
@@ -455,7 +431,7 @@
* @param argv NULL-terminated list of arguments to the process
* @return process ID of the new process, -1 on error
*/
-GNUNET_OS_Process *
+struct GNUNET_OS_Process *
GNUNET_OS_start_process_v (const int *lsocks,
const char *filename, char *const argv[])
{
@@ -463,7 +439,7 @@
pid_t ret;
char lpid[16];
char fds[16];
- GNUNET_OS_Process *gnunet_proc = NULL;
+ struct GNUNET_OS_Process *gnunet_proc = NULL;
int i;
int j;
int k;
@@ -505,8 +481,8 @@
be plenty in practice */
sleep (1);
#endif
- gnunet_proc = GNUNET_OS_process_alloc ();
- GNUNET_OS_process_set_pid (gnunet_proc, ret);
+ gnunet_proc = GNUNET_malloc (sizeof (struct GNUNET_OS_Process));
+ gnunet_proc->pid = ret;
}
GNUNET_array_grow (lscp, ls, 0);
return gnunet_proc;
@@ -566,7 +542,7 @@
int argcount = 0;
char *non_const_filename = NULL;
int filenamelen = 0;
- GNUNET_OS_Process *gnunet_proc = NULL;
+ struct GNUNET_OS_Process *gnunet_proc = NULL;
GNUNET_assert (lsocks == NULL);
/* Count the number of arguments */
@@ -634,9 +610,9 @@
return NULL;
}
- gnunet_proc = GNUNET_OS_process_alloc ();
- GNUNET_OS_process_set_pid (gnunet_proc, proc.dwProcessId);
- GNUNET_OS_process_set_handle (gnunet_proc, proc.hProcess);
+ gnunet_proc = GNUNET_malloc (sizeof (struct GNUNET_OS_Process));
+ gnunet_proc->pid = proc.dwProcessId;
+ gnunet_proc->handle = proc.hProcess;
CreateThread (NULL, 64000, ChildWaitThread, (void *) gnunet_proc, 0, NULL);
@@ -659,7 +635,8 @@
* @return GNUNET_OK on success, GNUNET_NO if the process is still running,
GNUNET_SYSERR otherwise
*/
int
-GNUNET_OS_process_status (GNUNET_OS_Process *proc, enum
GNUNET_OS_ProcessStatusType *type,
+GNUNET_OS_process_status (struct GNUNET_OS_Process *proc,
+ enum GNUNET_OS_ProcessStatusType *type,
unsigned long *code)
{
#ifndef MINGW
@@ -667,7 +644,7 @@
int ret;
GNUNET_assert (0 != proc);
- ret = waitpid (GNUNET_OS_process_get_pid (proc), &status, WNOHANG);
+ ret = waitpid (proc->pid, &status, WNOHANG);
if (ret < 0)
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
@@ -679,7 +656,7 @@
*code = 0;
return GNUNET_NO;
}
- if (GNUNET_OS_process_get_pid (proc) != ret)
+ if (proc->pid != ret)
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
return GNUNET_SYSERR;
@@ -716,7 +693,7 @@
DWORD c, error_code, ret;
h = GNUNET_OS_process_get_handle (proc);
- ret = GNUNET_OS_process_get_pid (proc);
+ ret = proc->pid;
if (h == NULL || ret == 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Invalid process information {%d,
%08X}\n", ret, h);
@@ -753,22 +730,25 @@
* @return GNUNET_OK on success, GNUNET_SYSERR otherwise
*/
int
-GNUNET_OS_process_wait (GNUNET_OS_Process *proc)
+GNUNET_OS_process_wait (struct GNUNET_OS_Process *proc)
{
- pid_t pid = GNUNET_OS_process_get_pid (proc);
+
#ifndef MINGW
+ pid_t pid = proc->pid;
if (pid != waitpid (pid, NULL, 0))
return GNUNET_SYSERR;
-
return GNUNET_OK;
#else
HANDLE h;
int ret;
- h = GNUNET_OS_process_get_handle (proc);
+ h = proc->handle;
if (NULL == h)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Invalid process information {%d,
%08X}\n", pid, h);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Invalid process information {%d, %08X}\n",
+ proc->pid,
+ h);
return GNUNET_SYSERR;
}
if (h == NULL)
Modified: gnunet/src/util/test_os_start_process.c
===================================================================
--- gnunet/src/util/test_os_start_process.c 2010-11-03 21:26:40 UTC (rev
13540)
+++ gnunet/src/util/test_os_start_process.c 2010-11-03 21:38:45 UTC (rev
13541)
@@ -38,7 +38,7 @@
static char *test_phrase = "HELLO WORLD";
static int ok;
-static GNUNET_OS_Process *proc;
+static struct GNUNET_OS_Process *proc;
/* Pipe to write to started processes stdin (on write end) */
static struct GNUNET_DISK_PipeHandle *hello_pipe_stdin;
/* Pipe to read from started processes stdout (on read end) */
Modified: gnunet/src/util/test_resolver_api.c
===================================================================
--- gnunet/src/util/test_resolver_api.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/util/test_resolver_api.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -360,7 +360,7 @@
int ok = 1 + 2 + 4 + 8;
char *fn;
char *pfx;
- GNUNET_OS_Process *proc;
+ struct GNUNET_OS_Process *proc;
char * const argv[] =
{ "test-resolver-api", "-c", "test_resolver_api_data.conf",
#if VERBOSE
Modified: gnunet/src/vpn/gnunet-daemon-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn.c 2010-11-03 21:26:40 UTC (rev 13540)
+++ gnunet/src/vpn/gnunet-daemon-vpn.c 2010-11-03 21:38:45 UTC (rev 13541)
@@ -94,7 +94,7 @@
/**
* The process id of the helper
*/
-static GNUNET_OS_Process *helper_proc;
+static struct GNUNET_OS_Process *helper_proc;
/**
* a list of outgoing dns-query-packets
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13541 - in gnunet/src: arm core datastore dht fs hostlist include peerinfo statistics testing transport util vpn,
gnunet <=