DistRen Changeset - 4f50bc8e5de6 · protofusion repositories

Changeset - 4f50bc8e5de6

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Nathan Brink (binki) - 16 years ago 2010-01-03 12:39:20
ohnobinki@ohnopublishing.net

remove struct distrend_action, improve distrend_accept()

4 files changed with 75 insertions and 38 deletions:

src/server/distrend.c

src/server/distrend.h

src/server/listen.c

src/server/listen.h

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -8,199 +8,192 @@ @@
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen 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 Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 /* This file contains the code which both processes (renders) jobs as a slave, and the code which distributes frames to slaves after receiving them from the client portion of the codebase. */
 #include "asprintf.h"
 #include "distrenjob.h"
 #include "execio.h"
 #include "listen.h"
 #include "options.h"
 #include "protocol.h"
 #include "slavefuncs.h"
 #include <confuse.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 #include <libxml/encoding.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/xmlreader.h>
 #include <libxml/xmlwriter.h>
 /* local defs */
 #define NUMBER_ELEVEN 11
 /* ******************* Structs ************************ */
 struct general_info
+{
   struct distrenjob head;
   struct distrend_config *config;
   int jobs_in_queue;
   unsigned int free_clients;
   unsigned int rendering_clients;
   unsigned int total_finished_jobs;
   unsigned int total_frames_rendered;
   unsigned int highest_jobnum;
   int hibernate;
   time_t timestamp;
   unsigned long total_render_power;
   unsigned long total_priority_pieces;
 };
 /*
   internally defined funcs's prototypes @TODO: Make all functions nice and proper
 */
 void distrenjob_remove(struct general_info *, struct distrenjob *bj);
 struct distrenjob *distrenjob_get(struct distrenjob *head, jobnum_t jobnum);
 int distrenjob_enqueue(struct general_info *, struct distrenjob *job);
 int mortition(struct general_info *, struct distrenjob *job);
 int update_xml_joblist(struct general_info *);
 int createQueueFromXML(struct general_info*);
 int reCreateQueueFromXML(struct general_info*, xmlDocPtr doc, xmlNodePtr current);
 void update_general_info(struct general_info*);
 int import_general_info(struct general_info*);
 int updateJobStatsXML(struct distrenjob *job);
 char *job_getserialfilename(struct general_info *, unsigned int jobnum);
 /* ********************** Functions ************************* */
 /** Dumps all data in RAM to an xml file (such as current jobs, etc) which is parsed by start_data. Remember to invoke this before shutting down! @TODO: Fill this stub*/
 int xml_dump()
+{
   return 0;
+}
 /**
    Performs command stored in a client's request. @TODO: Fill stub
 */
 int distrend_do()
+{
   return 0;
+}
 /**
    Frees the action. @TODO: Fill stub
 */
 void distrend_action_free()
+{
+}
 /**
     Fill variables at startup from XML dumps or defaults
  */
 int start_data(struct general_info *general_info, char *datadir)
+{
   struct stat buffer;
   /**
      defaults
    */
   memset(&general_info->head, '\0', sizeof(struct distrenjob));
   general_info->head.priority = 0;
   general_info->jobs_in_queue = 0;
   general_info->free_clients = 0;
   general_info->rendering_clients = 0;
   general_info->total_finished_jobs = 0;
   general_info->total_frames_rendered = 0;
   general_info->highest_jobnum = 0;
   general_info->hibernate = 0;
   general_info->timestamp = 0;
   general_info->total_render_power = 0;
   general_info->total_priority_pieces = 0;
   fprintf(stderr, "Initialized default global and queue states\n");
   if(stat("general_info.xml", &buffer) == 0)
+    {
       fprintf(stderr, "previous state file found, loading:\n");
       fprintf(stderr, "Parsing XML files and restoring previous state...\n");
       if(import_general_info(general_info))
 	fprintf(stderr, "FAILURE\n");
       fprintf(stderr, "Restoring queue...\n");
       if(createQueueFromXML(general_info))
 	fprintf(stderr, "FAILURE\n");
       fprintf(stderr, "done\n");
+    }
   return 0;
+}
 /** Finish-Setter: Sets a frame to the "completed" status.*/
 void finish_frame(struct general_info *geninfo, struct distrenjob *distrenjob, int frame)
+{
   distrenjob->frameset[frame].status = FRAMESETSTATUS_DONE;
   distrenjob->total_render_time = distrenjob->total_render_time + (clock() - distrenjob->frameset[frame].start_time);
   distrenjob->completed_frames ++;
   distrenjob->assigned_frames --;
   geninfo->total_frames_rendered ++; /*< Increase total frames var for stats */
   update_general_info(geninfo);
   updateJobStatsXML(distrenjob);
+}
 /**
    checks to see if a job is actually done.
    - scans the folder of the job to make sure all output files are present
 */
 int mortition(struct general_info *geninfo, struct distrenjob *job)
+{
   short int isJobDone;
   int counter;
   char *path_and_number;
   struct stat buffer;
   isJobDone = 1;
   for(counter = 0; counter < job->total_frames; counter++)
+    {
       _distren_asprintf(&path_and_number, "%s/stor/job%d/out/%d.%s",
 			geninfo->config->datadir,
 			job->jobnum,
 			job->frameset[counter].num,
 			job->output_format);
       if(stat(path_and_number, &buffer) == -1)
+        {
 	  /**
 	     missing frame found
 	   */
           job->frameset[counter].status = FRAMESETSTATUS_UNASSIGNED;
           job->completed_frames--;
           geninfo->total_frames_rendered--;
           isJobDone = 0;
+        }
       free(path_and_number);
+    }
   if(isJobDone)
+    {
       /**
 	 all frames were accounted for
       */
       distrenjob_remove(geninfo, job);
@@ @@ -1187,157 +1180,153 @@ int main(int argc, char *argv[]) @@
 		  test=1;
+      }
+    }
   cont = 1;
   if(distrend_do_config(argc, argv, &general_info.config))
     return 1;
   if(start_data(&general_info, general_info.config->datadir))
+    {
       fprintf(stderr, "%s:%d: start_data() failed\n", __FILE__, __LINE__);
       return 1;
+    }
   // pre-loaded jobs for testing
   prepare_distrenjob(&general_info, 1, "awesome", "LordOfWar", "onlylordofwar@gmail.com", 8, 1, 100, 640, 480);
   prepare_distrenjob(&general_info, 1, "hamburger", "Ohnobinki", "ohnobinki@ohnopublishing.net", 3, 1, 50, 1280, 720);
   while(test == 1)
+  {
     fprintf(stderr, "Welcome to DistRen Alpha Interactive Test Mode\n\n");
     fprintf(stderr, "\t1 \tPrint all frames in a job\n");
     fprintf(stderr, "\t2 \tExamine certain job\n");
     fprintf(stderr, "\t3 \tGet a frame to render\n");
     fprintf(stderr, "\t4 \tAdd a job\n");
     fprintf(stderr, "\t5 \tDelete a job\n");
     fprintf(stderr, "\t6 \tPrint jobnums in queue\n");
     fprintf(stderr, "\t7 \tPrint general info\n");
     fprintf(stderr, "\t8 \tQuit\n");
     scanf("%d", &command);
     switch(command)
+    {
     case 1:
       fprintf(stderr, "Job number: ");
       scanf("%d", &jobnum);
       printJob(distrenjob_get(&general_info.head, jobnum));
       break;
     case 2:
       fprintf(stderr, "Job number: ");
       scanf("%d", &jobnum);
       printJobInfo(distrenjob_get(&general_info.head, jobnum));
       break;
     case 3:
       general_info.total_render_power ++;
       if(!find_jobframe_again(&general_info, -1, 1, &tmp_job, &tmp_frame))
+      {
     	  fprintf(stderr, "frame was found, details below\n");
           fprintf(stderr, "Job#:%d\n", tmp_job->jobnum);
           fprintf(stderr, "Frame#:%d\n", tmp_frame->num);
+      }
       break;
     case 4:
       name = NULL;
       submitter = NULL;
       email = NULL;
       fprintf(stderr, "\nType: \n\t 1 \t blender\n\t 2 \t povray\n"); scanf("%d", &type);
       fprintf(stderr, "\nName: ");        scanf("\n"); getline(&name, &read_buf, stdin);
       fprintf(stderr, "\nSubmitter: ");                getline(&submitter, &read_buf, stdin);
       fprintf(stderr, "\nEmail: ");                    getline(&email, &read_buf, stdin);
       fprintf(stderr, "\nPriority: ");                 scanf("%d", &priority);
       fprintf(stderr, "\nStart frame: ");              scanf("%d", &start_frame);
       fprintf(stderr, "\nEnd frame: ");                scanf("%d", &end_frame);
       fprintf(stderr, "\nWidth: ");                    scanf("%d", &width);
       fprintf(stderr, "\nHeight: ");                   scanf("%d", &height);
       prepare_distrenjob(&general_info, type, name, submitter, email, priority, start_frame, end_frame, width, height);
       break;
     case 5:
       fprintf(stderr, "\nJob number: ");
       scanf("%d", &jobnum);
       distrenjob_remove(&general_info, distrenjob_get(&general_info.head, jobnum));
       break;
     case 6:
       printAllJobnums(&general_info.head);
       break;
     case 7:
       fprintf(stderr, "\nHighest job number: %d", general_info.highest_jobnum);
       fprintf(stderr, "\nJobs in queue: %d", general_info.jobs_in_queue);
       fprintf(stderr, "\nTotal frames rendered: %d", general_info.total_frames_rendered);
       fprintf(stderr, "\nTimestamp: %lu", (long)general_info.timestamp);
       fprintf(stderr, "\nTotal priority pieces: %ld", general_info.total_priority_pieces);
       fprintf(stderr, "\nTotal render power: %ld\n", general_info.total_render_power);
       break;
     case 8:
       fprintf(stderr,"Goodbye.\n");
       return 0;
     default:
       fprintf(stderr, "Invalid input, please try again.\n");
+    }
+  }
   distrend_listen(general_info.config, &clients);
   /* This is called the "main loop" */
-  while(cont)
+  while(!general_info.config->die)
+    {
       struct distrend_action *action;
       int clientsays = 0; /*< temporary example variable, will be replaced when we can handle messages */
       distrend_accept(general_info.config, clients, &action);
       cont = distrend_do(action);
       distrend_accept(general_info.config, clients);
       /* Make the following code more event-driven */
       frame_watchdog(&general_info.head);
       struct frameset *frame;
       struct distrenjob *job;
       /* If the client is idle, must be modified for climbing through linked list of clients (client->clientnum) */
       if(clientstatus == CLIENTSTATUS_IDLE)
+	{
 	  int returnnum = find_jobframe(&general_info, &job, &frame); // Finds a frame to render
 	  if(returnnum)
+	    {
 	      fprintf(stderr,"No frames are available to render at this time. Idling...\n");
 	      sleep(10);
+	    }
 	  else
 	    remotio_send_to_client(frame->num, job->jobnum); // Pseudo-sends data to client
+	}
       /* If the client states that they finished the frame */
       	if(clientsays == DISTREN_REQUEST_DONEFRAME){
       	  clientstatus = CLIENTSTATUS_IDLE; // Sets the client back to idle
       	  finish_frame(&general_info, job, frame->num); // @TODO: Make sure this actually works.
+      	}
       distrend_action_free(action);
+    }
     } /* while(!general_info.config->die) */
   distrend_unlisten(general_info.config->listens, clients);
   distrend_config_free(general_info.config);
   xmlcleanup();
   return 0;
+}
 /**
    constructs the filename for a distrenjob's serialized XML
    to be stored/retrieved from/in.
    @return pointer to filename allocated using something
            malloc() and free() compatible. Must be free()ed by the
 	   caller
  */
 char *job_getserialfilename(struct general_info *geninfo, unsigned int jobnum)
+{
   char *filename;
   _distren_asprintf(&filename, "%s/stor/job/%d/distrenjob.xml",
 		    geninfo->config->datadir,
 		    jobnum);
   return filename;
+}

src/server/distrend.h

➞

Show inline comments

 /*
   Copyright 2009 Nathan Phillip Brink
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen 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 Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 struct distrend_config;
 #ifndef _DISTREN_DISTREN_H_
 #define _DISTREN_DISTREN_H_
 #include <confuse.h>
 #include "listen.h"
 struct distrend_config
+{
   cfg_t *mycfg;
   struct options_common *options;
   struct distrend_listen *listens; /*< Null terminated array of structs */
   char *datadir;
 };
 struct distrend_action
+{
   struct distrend_client *client;
   int die;
 };
 #endif

src/server/listen.c

➞

Show inline comments

 /*
   Copyright 2009 Nathan Phillip Brink
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen 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 Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "listen.h"
 #include <list.h>
 #include <malloc.h>
 #include <netinet/in.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/select.h>
 #include <sys/socket.h>
 /* local */
 struct distrend_clientset
+{
   LIST *clients;
   /*
     for select()
    */
   fd_set readfds;
   fd_set writefds;
   int nfds;
 };
 int distrend_client_new(struct distrend_client **client, int sock, enum distrend_client_state state);
 int distrend_client_free(struct distrend_client *client);
 int distrend_listen(struct distrend_config *config, struct distrend_clientset **clients)
+{
   int tmp;
   struct sockaddr_in6 sockaddr =
+    {
       .sin6_family = AF_INET6,
       .sin6_port = 0,
       .sin6_flowinfo = 0,
       .sin6_addr = IN6ADDR_ANY_INIT,
       .sin6_scope_id = 0
     };
   *clients = malloc(sizeof(struct distrend_clientset));
   (*clients)->clients = list_init();
   sockaddr.sin6_port = htonl(4050);
   config->listens->sock = socket(AF_INET6, SOCK_STREAM, 0);
   tmp = bind(config->listens->sock, (struct sockaddr *)&sockaddr, sizeof(sockaddr));
   if(tmp == -1)
+    {
       perror("bind");
       free(*clients);
       return 1;
+    }
   tmp = listen(config->listens->sock, 1);
   FD_ZERO(&(*clients)->readfds);
   FD_ZERO(&(*clients)->writefds);
   return 0;
+}
 int distrend_accept_find_client(fd_set *fdset, struct distrend_client *client)
 int distrend_handleread(struct distrend_config *config,
 		    struct distrend_client *client)
+{
   fprintf(stderr, "%s:%d: STUB: I'm supposed to read data from the client\n",
 	  __FILE__, __LINE__);
   return 0;
+}
 struct distrend_accept_client_proc_data
+{
   if(FD_ISSET(client->sock, fdset))
     return FALSE;
   fd_set *fdset;
   struct distrend_config *config;
 };
 int distrend_accept_client_proc(struct distrend_accept_client_proc_data *data,
 				struct distrend_client *client)
+{
   if(!FD_ISSET(client->sock, data->fdset))
     /** continue iteration through the list */
     return TRUE;
   fprintf(stderr, "%s:%d: My traversal says that sock %d has data waiting\n",
 	  __FILE__, __LINE__, client->sock);
   distrend_handleread(data->config, client);
   /** continue iteration through the list */
   return TRUE;
+}
-int distrend_accept(struct distrend_config *config, struct distrend_clientset *clients, struct distrend_action **action)
 int distrend_accept(struct distrend_config *config, struct distrend_clientset *clients)
+{
   int tmp;
   fd_set readfds;
   fd_set writefds;
   struct distrend_client *cli;
   memcpy(&readfds, &clients->readfds, sizeof(fd_set));
   memcpy(&writefds, &clients->writefds, sizeof(fd_set));
   tmp = select(clients->nfds, &readfds, &writefds, NULL, (struct timeval *)NULL);
   if(tmp == -1)
+    {
       perror("select");
       return 1;
+    }
   /**
-     check if our traversal function found a bit that was set
+     deal with all sockets that have data waiting
    */
   if(list_traverse(clients->clients, &readfds, &distrend_accept_find_client, LIST_FRNT | LIST_ALTR) == LIST_OK)
+    {
       cli = (struct distrend_client *)list_curr(clients->clients);
       fprintf(stderr, "%s:%d: My traversal says that sock %d has data waiting, which is %s\n",
 	     __FILE__, __LINE__,
 	     cli->sock, FD_ISSET(cli->sock, &readfds) ? "true" : "false");
       fprintf(stderr, "stub\n");
       return 1;
+    }
   list_traverse(clients->clients, &readfds, (list_traverse_func_t)&distrend_accept_client_proc, LIST_FRNT | LIST_ALTR);
   return 0;
+}
 int distrend_unlisten(struct distrend_listen *listens, struct distrend_clientset *clients)
+{
   fprintf(stderr, "%s:%d: I am a stub that needn't be implemented 'til later\n", __FILE__, __LINE__);
   return 1;
+}
 /**
    This is probably just NOT a placeholder for remotio
 */
 void remotio_send_to_client()
 void remotio_send_to_client(struct distrend_client *client, const char *msg, size_t len)
+{
     fprintf(stderr, "%s:%d: STUB I should queue data for writing to a client\n", __FILE__, __LINE__);
+}
 int distrend_client_new(struct distrend_client **client, int sock, enum distrend_client_state state)
+{
   *client = malloc(sizeof(struct distrend_client));
   if(!*client)
+{
   fprintf(stderr, "%s:%d: I am futile! And I'm happy because of it :-D\n", __FILE__, __LINE__);
       fprintf(stderr, "OOM\n");
       return 1;
+    }
   (*client)->sock = sock;
   (*client)->state = state;
   (*client)->inmsgs = list_init();
   (*client)->outmsgs = list_init();
   return 0;
+}
 int distrend_client_free(struct distrend_client *client)
+{
   list_free(client->inmsgs, (void *)LIST_DEALLOC);
   list_free(client->outmsgs, (void *)LIST_DEALLOC);
   fprintf(stderr, "%s:%d: stub!", __FILE__, __LINE__);
   return 1;
+}

src/server/listen.h

➞

Show inline comments

 /*
   Copyright 2009 Nathan Phillip Brink
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen 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 Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 struct distrend_clientset;
 struct distrend_listen;
 struct distrend_client;
 #ifndef _DISTREN_LISTEN_H
 #define _DISTREN_LISTEN_H
 #include "distrend.h"
 #include <list.h>
 enum distrend_client_state
+  {
     DISTREND_CLIENT_PREAUTH,
     DISTREND_CLIENT_GOODDOGGY,
     DISTREND_CLIENT_BADBOY
   };
 struct distrend_listen
+{
   int port;
   int sock;
 };
 struct distrend_client
+{
   int sock;
   int state;
   enum distrend_client_state state;
   LIST *inmsgs;
   LIST *outmsgs;
 };
 /**
    initializes the listens and clientset
    @param config the configuration from distrend
    @param clients a pointer to a struct distrend_clientset pointer which will be set to memory allocated for the clientset
  */
 int distrend_listen(struct distrend_config *config, struct distrend_clientset **clients);
 /**
    checks states of the sockets I'm managing. If there are any new connections,
    or activity on any sockets, I'll call the appropriate function.
    I will block until there is some sort of activity, including
    signals. If you want to cleanly shut down, it's best to register
    signal handlers somewhere
  */
-int distrend_accept(struct distrend_config *config, struct distrend_clientset *clients, struct distrend_action **action);
 int distrend_accept(struct distrend_config *config, struct distrend_clientset *clients);
 /**
    cleans listening socket. Unnecessary for a working server, currently a stub.
  */
 int distrend_unlisten(struct distrend_listen *listens, struct distrend_clientset *clients);
 /**
    This is probably just NOT a placeholder for remotio
 */
 void remotio_send_to_client();
 #endif

0 comments (0 inline, 0 general)