DistRen Changeset - 479a5c9e3a02 · protofusion repositories

Changeset - 479a5c9e3a02

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Nathan Brink (binki) - 15 years ago 2010-06-07 20:47:38
ohnobinki@ohnopublishing.net

Move mysql connectino configuration to distrendaemon.conf

5 files changed with 52 insertions and 15 deletions:

etc/distrendaemon.conf.in

src/server/distrend.c

src/server/distrend.h

src/server/mysql.c

src/server/mysql.h

0 comments (0 inline, 0 general)

etc/distrendaemon.conf.in

➞

Show inline comments

 /*
  configuration for _this_ server
 */
 daemon
+{
   datadir = "@LOCALSTATEDIR@/@PACKAGE@"
   render_types = {"povray", "blender", "inkscape", "imagemagick", "dcraw"}
   mysql_user = "distren"
   mysql_pass = "HwLxuBqTvJ6J7FWj"
   mysql_host = "localhost"
   mysql_database = "distren"
   listen {
          type = "unix"
          path = "@RUNSTATEDIR@/@PACKAGE@d.sock"
          port = "0770"
+  }
+}
 include("distrencommon.conf")

src/server/distrend.c

➞

Show inline comments

@@ @@ -74,24 +74,25 @@ struct general_info @@
   unsigned long total_priority_pieces;
 };
 /* *********************************************
    Function Prototypes
    ********************************************* */
 /* ************General Functions************* */
 int distrend_do();
 int distrend_do_config(int argc, char *argv[], struct distrend_config **config);
 int distrend_config_free(struct distrend_config *config);
 int distrend_handle_request(struct distren_request *req, void *reqdata, struct general_info *geninfo);
 /* **************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);
 /* **************** Main ********************* */
 int main(int argc, char *argv[])
+{
@@ @@ -127,45 +128,53 @@ int main(int argc, char *argv[]) @@
+    }
   if(distrend_do_config(argc, argv, &general_info.config))
     return 1;
   /** preset paths */
   _distren_asprintf(&general_info.files.geninfo, "%s/general_info.xml",
 		    general_info.config->datadir);
   /** MySQL Connection */
   fprintf(stderr,"Connecting to mysql...\n");
   if(mysqlConnect(&general_info.conn))
   if(mysqlConnect(&general_info.conn,
 		  general_info.config->mysql_user,
 		  general_info.config->mysql_host,
 		  general_info.config->mysql_pass,
 		  general_info.config->mysql_database) )
+    {
       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);
   distrend_listen(general_info.config, &clients);
   if(distrend_listen(general_info.config, &clients))
+    {
       fprintf(stderr, "error listening\n");
       return 1;
+    }
   int slaveKey = 0; // Remotio should set me on a per-slave basis
   /* Main Loop */
   while(!general_info.config->die)
+    {
       int clientrequest = 0; /*< temporary example variable, will be replaced when we can handle messages */
       distrend_accept(general_info.config, clients);
+      distrend_accept(general_info.config, clients, (distrend_handle_request_t)&distrend_handle_request, (void *)&general_info);
       /* Run the watchdog, @TODO: like every 10 mins or something */
       frame_watchdog(general_info.conn);
       struct frameset frame;
       struct distrenjob *job;
       distrenjob_new(&job);
       memset(&frame, '\0', sizeof(frame));
       /** If client requests work */
       if(clientrequest == DISTREN_REQUEST_GETWORK)
@@ @@ -189,59 +198,74 @@ int main(int argc, char *argv[]) @@
   xmlcleanup();
   /** free() paths */
   free(general_info.files.geninfo);
   mysqlDisconnect(general_info.conn);
   return 0;
+}
 /* ********************** Functions ************************* */
 int distrend_handle_request(struct distren_request *req, void *reqdata, struct general_info *geninfo)
+{
   fprintf(stderr, "I can haz data %d bytes long\n", req->len);
   return 0;
+}
 /**
    Performs command stored in a client's request. @TODO: Fill stub
 */
 int distrend_do()
+{
   return 0;
+}
 /* Grabs config info from confs */
-int distrend_do_csonfig(int argc, char *argv[], struct distrend_config **config)
+int distrend_do_config(int argc, char *argv[], struct distrend_config **config)
+{
   unsigned int counter;
   cfg_opt_t myopts_listen[] =
+    {
       CFG_SIMPLE_STR("type", NULL),
       CFG_SIMPLE_STR("path", NULL),
       CFG_SIMPLE_INT("port", NULL),
       CFG_END()
     };
   cfg_opt_t myopts[] =
+    {
       CFG_SEC("listen",  /* this must be imported into struct listens (which must still be declared) */
           myopts_listen,
           CFGF_MULTI),
       CFG_SIMPLE_STR("datadir", NULL),
       CFG_STR_LIST("render_types", NULL, CFGF_NONE),
       CFG_SIMPLE_STR("mysql_user", NULL),
       CFG_SIMPLE_STR("mysql_host", NULL),
       CFG_SIMPLE_STR("mysql_pass", NULL),
       CFG_SIMPLE_STR("mysql_database", NULL),
       CFG_END()
     };
   cfg_t *cfg_listen;
   fprintf(stderr, "%s:%d: running config\n", __FILE__, __LINE__);
   *config = malloc(sizeof(struct distrend_config));
   myopts[1].simple_value = &(*config)->datadir;
   myopts[3].simple_value = &(*config)->mysql_user;
   myopts[4].simple_value = &(*config)->mysql_host;
   myopts[5].simple_value = &(*config)->mysql_pass;
   myopts[6].simple_value = &(*config)->mysql_database;
   if(options_init(argc, argv, &(*config)->mycfg, myopts, "daemon", &(*config)->options))
     return 1;
   /**
      grab listen blocks:
    */
   (*config)->listens = malloc(sizeof(struct distrend_listen) * (cfg_size((*config)->mycfg, "listen") + 1));
   for(counter = 0; counter < cfg_size((*config)->mycfg, "listen"); counter ++)
+    {
       cfg_listen = cfg_getnsec((*config)->mycfg, "listen", counter);
       (*config)->listens[counter].port = cfg_getint(cfg_listen, "port");
@@ @@ -480,28 +504,32 @@ int interactiveTest(int test, struct gen @@
        scanf("%d", &tmp);
        jobKey = tmp;
        fprintf(stderr,"Frame Number: ");
        scanf("%d", &tmp);
        frameNum = tmp;
        start_frame(geninfo->conn, slaveKey, jobKey, frameNum);
        fprintf(stderr,"Started Frame!\n");
        break;
      case 5:
        distrend_listen(geninfo->config, &clients);
        if(distrend_listen(geninfo->config, &clients))
+	 {
 	   fprintf(stderr, "error listening\n");
 	   return 1;
+	 }
        while(1)
+	 {
 	   distrend_accept(geninfo->config, clients);
+	   distrend_accept(geninfo->config, clients, (distrend_handle_request_t)&distrend_handle_request, (void *)geninfo);
 	   /*
 	     code for reading data from clients either goes here or in distrend_accept().
 	     it might make sense for us to just pass the distrend_accept() function a
 	     callback which can handle packets or to have a generic packet handling
 	     subsystem which gathers data into groups defined by by packet.h and then
 	     passed onto the callback.
 	   */
+	 }
        break;
      case 0:
        test = 0;

src/server/distrend.h

➞

Show inline comments

@@ @@ -26,15 +26,20 @@ struct distrend_config; @@
 #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;
   int die;
   char *mysql_user;
   char *mysql_host;
   char *mysql_pass;
   char *mysql_database;
 };
 #endif

src/server/mysql.c

➞

Show inline comments

@@ @@ -75,38 +75,33 @@ struct distrend_mysql_conn @@
 };
 struct distrend_mysql_result
+{
   MYSQL_RES *mysqlresult;
   short pointlesscheck;
 };
 /**
     funcs
  */
 int mysqlConnect(distrend_mysql_conn_t *conn)
+int mysqlConnect(distrend_mysql_conn_t *conn, const char *user, const char *host, const char *pass, const char *database)
+{
   MYSQL *mysqlconn;
   char *server = "zserver1";
   char *user = "distren";
   char *password = "HwLxuBqTvJ6J7FWj";
   char *database = "distren";
   my_bool mybool;
   mysqlconn = mysql_init(NULL);
-  if(!mysql_real_connect(mysqlconn, server, user, password, database, 0, NULL, CLIENT_MULTI_STATEMENTS))
+  if(!mysql_real_connect(mysqlconn, host, user, pass, database, 0, NULL, CLIENT_MULTI_STATEMENTS))
+    {
       fprintf(stderr, "%s\n", mysql_error(mysqlconn));
       return 1;
+    }
   /**
      Called after mysql_real_connect() due to bug fixed in MySQL 5.1.6 and later
   */
   mybool = 1;
   mysql_options(mysqlconn, MYSQL_OPT_RECONNECT, (char *)&mybool);

src/server/mysql.h

➞

Show inline comments

@@ @@ -25,28 +25,32 @@ @@
 #include "distrenjob.h"
 #include <stdint.h>
 struct distrend_mysql_conn;
 struct distrend_mysql_result;
 typedef struct distrend_mysql_conn *distrend_mysql_conn_t;
 typedef struct distrend_mysql_result *distrend_mysql_result_t;
 /**
    initiates a MySQL connection
    @param conn, pointer will be set to the struct
    @param conn pointer will be set to the struct
    @param user the mysql username
    @param host the hostname of the mysql server
    @param pass the password for the mysql account
    @param database the database on the mysql server to use
    @return 0 on success
  */
 int mysqlConnect(distrend_mysql_conn_t *conn);
+int mysqlConnect(distrend_mysql_conn_t *conn, const char *user, const char *host, const char *pass, const char *database);
 /**
    cleans and disconnects MySQL connection
    @param conn connection to clean
    @return 0 on success
 */
 int mysqlDisconnect(distrend_mysql_conn_t conn);
 /**
    Mark a frame as finished in the database and calculate the seconds spent on that frame.
  */
 void finish_frame(distrend_mysql_conn_t conn, int32_t slavekey, int32_t jobkey, int32_t framenum);

0 comments (0 inline, 0 general)