Changeset 27435 for trunk/Ohana/src/opihi/pantasks

Timestamp:

Mar 24, 2010, 11:22:25 AM (16 years ago)

Author:

eugene

Message:

large update merging in changes for Ohana to support large files

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/pantasks/JobOps.c (modified) (1 diff)
• src/opihi/pantasks/ListenClients.c (modified) (1 diff)
• src/opihi/pantasks/status_server.c (modified) (2 diffs)
• src/opihi/pantasks/thread_locks.c (modified) (4 diffs)

trunk/Ohana/src/opihi/pantasks/JobOps.c

@@ -73 +73 @@
 
   int i;
-  int status;
-  char command[1024];
-  IOBuffer buffer;
 
   gprint (GP_LOG, "\n");

trunk/Ohana/src/opihi/pantasks/ListenClients.c

@@ -70 +70 @@
   
   int i, Ncurrent, Nmax, status, Nread;
-  char *line, log_stdout[128], log_stderr[128];
+  char *line;
   fd_set fdSet;
   struct timeval timeout;

trunk/Ohana/src/opihi/pantasks/status_server.c

@@ -1 +1 @@
 # include "pantasks.h"
+
+int status_scheduler(void);
 
 int status_server (int argc, char **argv) {
@@ -103 +105 @@
 }
 
-int status_scheduler() {
+int status_scheduler(void) {
   
   gprint (GP_LOG, "\n");

trunk/Ohana/src/opihi/pantasks/thread_locks.c

@@ -4 +4 @@
 static pthread_mutex_t ClientMutex = PTHREAD_MUTEX_INITIALIZER;
 
-void ClientLock () {
+void ClientLock (void) {
   pthread_mutex_lock (&ClientMutex);
 }
 
-void ClientUnlock () {
+void ClientUnlock (void) {
   pthread_mutex_unlock (&ClientMutex);
 }
@@ -15 +15 @@
 static pthread_mutex_t CommandMutex = PTHREAD_MUTEX_INITIALIZER;
 
-void CommandLock () {
+void CommandLock (void) {
   //  fprintf (stderr, "command lock\n");
   pthread_mutex_lock (&CommandMutex);
 }
 
-void CommandUnlock () {
+void CommandUnlock (void) {
   //  fprintf (stderr, "command unlock\n");
   pthread_mutex_unlock (&CommandMutex);
@@ -28 +28 @@
 static pthread_mutex_t ControlMutex = PTHREAD_MUTEX_INITIALIZER;
 
-void ControlLock (char *func) {
+void ControlLock (const char *func) {
   // fprintf (stderr, "control lock %s\n", func);
   pthread_mutex_lock (&ControlMutex);
 }
 
-void ControlUnlock (char *func) {
+void ControlUnlock (const char *func) {
   // fprintf (stderr, "control unlock %s\n", func);
   pthread_mutex_unlock (&ControlMutex);
@@ -41 +41 @@
 static pthread_mutex_t JobTaskMutex = PTHREAD_MUTEX_INITIALIZER;
 
-void JobTaskLock () {
+void JobTaskLock (void) {
   //  fprintf (stderr, "jobtask lock\n");
   pthread_mutex_lock (&JobTaskMutex);
 }
 
-void JobTaskUnlock () {
+void JobTaskUnlock (void) {
   //  fprintf (stderr, "jobtask unlock\n");
   pthread_mutex_unlock (&JobTaskMutex);