DistRen Changeset - 1478394cbd10 · protofusion repositories

Changeset - 1478394cbd10

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Nathan Brink (binki) - 15 years ago 2010-03-25 00:54:33
ohnobinki@ohnopublishing.net

cleanup and null pointer checks

2 files changed with 65 insertions and 19 deletions:

src/server/distrend.c

src/server/simpleslave.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -88,13 +88,13 @@ int distrend_config_free(struct distrend @@
 /* **************XML Functions**************** */
 void update_general_info(struct general_info *geninfo);
 int import_general_info(struct general_info *general_info);
 int update_xml_joblist(struct general_info *geninfo);
 /* **************Test Functions**************** */
-int interactiveTest(int test, struct general_info general_info, distrend_mysql_conn_t conn);
+int interactiveTest(int test, struct general_info *general_info);
 /* **************** Main ********************* */
 int main(int argc, char *argv[])
+{
   /* Parse arguments */
   int counter;
@@ @@ -136,18 +136,20 @@ int main(int argc, char *argv[]) @@
   /** MySQL Connection */
   fprintf(stderr,"Connecting to mysql...\n");
   if(mysqlConnect(&general_info.conn))
+    {
       fprintf(stderr, "%s:%d: mysqlConnect() failed\n", __FILE__, __LINE__);
       fprintf(stderr, "don't test mysql stuff\n");
       interactiveTest(test, &general_info);
       return 1;
+    }
   fprintf(stderr,"Finished connecting!\n");
   /** Execute test function */
-  interactiveTest(test, general_info, general_info.conn);
+  interactiveTest(test, &general_info);
   distrend_listen(general_info.config, &clients);
   int slaveKey = 0; // Remotio should set me on a per-slave basis
   /* Main Loop */
   while(!general_info.config->die)
@@ @@ -415,55 +417,59 @@ int update_xml_joblist(struct general_in @@
 /* ************************** Test Functions ************************* */
 /** Interactive test for the queuing system */
 /* @QUEUE: Test uses methods not present in C code using mysql web-based system */
 int interactiveTest(int test, struct general_info general_info, distrend_mysql_conn_t conn){
 int interactiveTest(int test, struct general_info *geninfo)
+{
   int command;
   fprintf(stderr,"Hello!\n");
   int32_t slaveKey = 1;
   jobnum_t jobKey = 0;
   int32_t frameNum = 0;
   int32_t newPriority = 0;
   int tmp = 0;
   struct distrend_clientset *clients;
   fprintf(stderr,"Hello!\n");
   while(test == 1)
+   {
      fprintf(stderr, "Welcome to DistRen Alpha Interactive Test Mode\n\n");
      fprintf(stderr, "\t1 \tGet a frame to render\n");
      fprintf(stderr, "\t2 \tChange job priority\n");
      fprintf(stderr, "\t3 \tSet frame finished\n");
      fprintf(stderr, "\t4 \tSet frame started\n");
      fprintf(stderr, "\t5 \tQuit\n");
      fprintf(stderr, "\t5 \tStart listener\n");
      fprintf(stderr, "\t0 \tQuit\n");
      scanf("%d", &command);
      switch(command)
+     {
      case 1:
        fprintf(stderr,"Slave Key: ");
        scanf("%d", &slaveKey);
        fprintf(stderr, "Got frame: ");
        if(find_jobframe(conn, slaveKey, &jobKey, &frameNum))
+       if(find_jobframe(geninfo->conn, slaveKey, &jobKey, &frameNum))
          fprintf(stderr,"No frames available to render!\n");
        else if(jobKey == -1)
-         fprintf(stderr,"Slave &d has no render power!", slaveKey);
+         fprintf(stderr,"Slave %d has no render power!", slaveKey);
        else
          fprintf(stderr, "jobKey: %d, frameNum: %d\n",jobKey,frameNum);
        break;
      case 2:
        fprintf(stderr,"Job key: ");
        scanf("%d", &tmp);
        jobKey = tmp;
        fprintf(stderr,"New priority: ");
        scanf("%d", &tmp);
        newPriority = tmp;
        change_job_priority(conn, jobKey, newPriority);
+       change_job_priority(geninfo->conn, jobKey, newPriority);
        fprintf(stderr,"Changed!");
        break;
      case 3:
        fprintf(stderr,"Slave Key: ");
        scanf("%d", &tmp);
        slaveKey = tmp;
@@ @@ -473,13 +479,13 @@ int interactiveTest(int test, struct gen @@
        jobKey = tmp;
        fprintf(stderr,"Frame Number: ");
        scanf("%d", &tmp);
        frameNum = tmp;
        finish_frame(conn, slaveKey, jobKey, frameNum);
+       finish_frame(geninfo->conn, slaveKey, jobKey, frameNum);
        fprintf(stderr,"Finished Frame!\n");
        break;
      case 4:
        fprintf(stderr,"Slave Key: ");
        scanf("%d", &tmp);
        slaveKey = tmp;
@@ @@ -489,16 +495,23 @@ int interactiveTest(int test, struct gen @@
        jobKey = tmp;
        fprintf(stderr,"Frame Number: ");
        scanf("%d", &tmp);
        frameNum = tmp;
        start_frame(conn, slaveKey, jobKey, frameNum);
+       start_frame(geninfo->conn, slaveKey, jobKey, frameNum);
        fprintf(stderr,"Started Frame!\n");
        break;
      case 5:
        distrend_listen(geninfo->config, &clients);
        while(1)
 	 distrend_accept(geninfo->config, clients);
        break;
      case 0:
        test = 0;
        break;
      default:
        fprintf(stderr, "Invalid input, please try again.\n");
        break;
+     }

src/server/simpleslave.c

➞

Show inline comments

@@ @@ -54,12 +54,13 @@ int main(int argc, char *argv[]) @@
      initializations
   */
   datadir = NULL;
   server = NULL;
   username = NULL;
   password = NULL;
   hostname = NULL;
   char curopt;
   while(((char)-1) != (curopt = getopt(argc, argv, "u:th")))
+     {
        if(curopt == ':')
@@ @@ -90,12 +91,40 @@ int main(int argc, char *argv[]) @@
          return 0;
+     }
   /* Get conf data */
   options_init(argc, argv, &my_cfg, myopts, "slave", &commonopts);
   if(!datadir)
+    {
       fprintf(stderr, "datadir not set\n");
       return 1;
+    }
   if(!server)
+    {
       fprintf(stderr, "server not set\n");
       return 1;
+    }
   if(!username)
+    {
       fprintf(stderr, "username not set\n");
       return 1;
+    }
   if(!password)
+    {
       fprintf(stderr, "password not set\n");
       return 1;
+    }
   if(!hostname)
+    {
       fprintf(stderr, "hostname not set\n");
       return 1;
+    }
   /* Notifies the user if there no username in .conf */
   if(checkUsername(username))
     return 1;
   if(!strncmp(password, "!password",10))
+    {
       fprintf(stderr, "You haven't specified a password. Please edit your distrenslave.conf file appropriately\n");
@@ @@ -131,22 +160,26 @@ int main(int argc, char *argv[]) @@
   int benchmarkTime = 0;
   int renderPower = 0;
   char option[1] = "";
   fprintf(stderr,"Do you want to recalculate render power? (y/n): ");
   scanf("%s", option);
   if(!strcmp(option, "y")){
     if(slaveBenchmark(datadir, &benchmarkTime, &renderPower)){
       fprintf(stderr,"Benchmark failed! Exiting.\n");
       return 1;
   if(!strcmp(option, "y"))
+    {
       if(slaveBenchmark(datadir, &benchmarkTime, &renderPower))
+	{
 	  fprintf(stderr,"Benchmark failed! Exiting.\n");
 	  return 1;
+	}
       else
+	{
 	  fprintf(stderr,"Benchmark successful, time taken was %d seconds, giving you a render power of %d.\n",
 		  benchmarkTime, renderPower);
 	  _web_setrenderpower(slavekey, password, renderPower);
+	}
+    }
     else{
       fprintf(stderr,"Benchmark successful, time taken was %d seconds, giving you a render power of %d.\n", benchmarkTime, renderPower);
       _web_setrenderpower(slavekey, password, renderPower);
+    }
+  }
   // Main loop
   while(!quit)
+    {
     // request work

0 comments (0 inline, 0 general)