Changeset - 0ec89d48ac6d
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Nathan Brink (binki) - 16 years ago 2010-01-10 02:34:01
ohnobinki@ohnopublishing.net
correct general_info.xml location, recursive mkdir() support
2 files changed with 45 insertions and 10 deletions:
src/server/distrend.c
42
10
src/server/listen.c
3
0 comments (0 inline, 0 general)
src/server/distrend.c
➞
Show inline comments
 
@@ -53,12 +53,19 @@
 
struct general_info
 
{
 
  struct distrenjob head;
 

			




	
	
	
		
 
  struct distrend_config *config;

			




	
	
	
		
 

			




	
	
	
		
 
  struct

			




	
	
	
		
 
  {

			




	
	
	
		
 
    /** general_info.xml */

			




	
	
	
		
 
    char *geninfo;

			




	
	
	
		
 
    

			




	
	
	
		
 
  } files;

			




	
	
	
		
 

			




	
	
	
		
 
  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;

			




	
	
		
 
@@ -83,12 +90,13 @@ int createQueueFromXML(struct general_in

			




	
	
	
		
 
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);

			




	
	
	
		
 
int distren_mkdir_recurse(char *fname);

			




	
	
	
		
 

			




	
	
	
		
 
/* ********************** 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()

			




	
	
	
		
 
{

			




	
	
		
 
@@ -102,13 +110,13 @@ int distrend_do()

			




	
	
	
		
 
  return 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/** 

			




	
	
	
		
 
    Fill variables at startup from XML dumps or defaults

			




	
	
	
		
 
 */

			




	
	
	
		
 
int start_data(struct general_info *general_info, char *datadir)

			




	
	
	
		
 
int start_data(struct general_info *general_info)

			




	
	
	
		
 
{

			




	
	
	
		
 
  struct stat buffer;

			




	
	
	
		
 

			




	
	
	
		
 
  /**

			




	
	
	
		
 
     defaults

			




	
	
	
		
 
   */

			




	
	
		
 
@@ -125,15 +133,15 @@ int start_data(struct general_info *gene

			




	
	
	
		
 
  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)

			




	
	
	
		
 
  if(stat(general_info->files.geninfo, &buffer) == 0)

			




	
	
	
		
 
    {

			




	
	
	
		
 
      fprintf(stderr, "previous state file found, loading:\n");

			




	
	
	
		
 
      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");

			




	
	
		
 
@@ -284,13 +292,13 @@ int prepare_distrenjob(struct general_in

			




	
	
	
		
 
    distrenjob->frameset[counter].status = FRAMESETSTATUS_UNASSIGNED;

			




	
	
	
		
 

			




	
	
	
		
 
    counter2++;

			




	
	
	
		
 
  }

			




	
	
	
		
 

			




	
	
	
		
 
  _distren_asprintf(&path_with_num, "stor/job%d/out/", distrenjob->jobnum);

			




	
	
	
		
 
  fprintf(stderr, ">>NOT<< creating dir ``%s''\n", path_with_num); /*< @TODO recursively create job directory */

			




	
	
	
		
 
  distren_mkdir_recurse(path_with_num);

			




	
	
	
		
 
  serialfile = job_getserialfilename(geninfo, distrenjob->jobnum);

			




	
	
	
		
 

			




	
	
	
		
 
  free(path_with_num);

			




	
	
	
		
 

			




	
	
	
		
 
  /**

			




	
	
	
		
 
     add job to queue

			




	
	
		
 
@@ -664,17 +672,14 @@ int distrend_do_config(int argc, char *a

			




	
	
	
		
 
          CFGF_MULTI),

			




	
	
	
		
 
      CFG_SIMPLE_STR("datadir", NULL),

			




	
	
	
		
 
      CFG_STR_LIST("render_types", NULL, CFGF_NONE),

			




	
	
	
		
 
      CFG_END()

			




	
	
	
		
 
    };

			




	
	
	
		
 

			




	
	
	
		
 
  struct distrenjob *distrenjob;

			




	
	
	
		
 
  cfg_t *cfg_listen;

			




	
	
	
		
 

			




	
	
	
		
 
  int tmp;

			




	
	
	
		
 

			




	
	
	
		
 
  fprintf(stderr, "%s:%d: running config\n", __FILE__, __LINE__);

			




	
	
	
		
 
  *config = malloc(sizeof(struct distrend_config));

			




	
	
	
		
 
  myopts[1].simple_value = &(*config)->datadir;

			




	
	
	
		
 

			




	
	
	
		
 
  if(options_init(argc, argv, &(*config)->mycfg, myopts, "daemon", &(*config)->options))

			




	
	
	
		
 
    return 1;

			




	
	
		
 
@@ -708,13 +713,13 @@ int distrend_config_free(struct distrend

			




	
	
	
		
 
// except that it doesn't hold free_clients and rendering_clients

			




	
	
	
		
 
void update_general_info(struct general_info *geninfo)

			




	
	
	
		
 
{

			




	
	
	
		
 
  xmlTextWriterPtr writer;

			




	
	
	
		
 
  char *tmp;

			




	
	
	
		
 

			




	
	
	
		
 
  writer = xmlNewTextWriterFilename("general_info.xml", 0);

			




	
	
	
		
 
  writer = xmlNewTextWriterFilename(geninfo->files.geninfo, 0);

			




	
	
	
		
 
  xmlTextWriterStartDocument(writer, NULL, "utf-8", NULL);

			




	
	
	
		
 

			




	
	
	
		
 
  xmlTextWriterStartElement(writer, (xmlChar*)"general_info");

			




	
	
	
		
 

			




	
	
	
		
 
  _distren_asprintf(&tmp, "%d", geninfo->jobs_in_queue);

			




	
	
	
		
 
  xmlTextWriterWriteElement(writer, (xmlChar*)"jobs_in_queue", (xmlChar*)tmp);

			




	
	
		
 
@@ -739,13 +744,13 @@ void update_general_info(struct general_

			




	
	
	
		
 
// this reads the information from general_info.xml to the general_info structure

			




	
	
	
		
 
int import_general_info(struct general_info *general_info)

			




	
	
	
		
 
{

			




	
	
	
		
 
  xmlDocPtr doc;

			




	
	
	
		
 
  xmlNodePtr cur;

			




	
	
	
		
 

			




	
	
	
		
 
  doc = xmlParseFile("general_info.xml");

			




	
	
	
		
 
  doc = xmlParseFile(general_info->files.geninfo);

			




	
	
	
		
 
  cur = xmlDocGetRootElement(doc);

			




	
	
	
		
 
  if (xmlStrcmp(cur->name, (xmlChar*)"general_info"))

			




	
	
	
		
 
    {

			




	
	
	
		
 
      fprintf(stderr, "xml document is wrong type");

			




	
	
	
		
 
      xmlFreeDoc(doc);

			




	
	
	
		
 
      return 1;

			




	
	
		
 
@@ -1172,13 +1177,17 @@ int main(int argc, char *argv[])

			




	
	
	
		
 
    }

			




	
	
	
		
 
  cont = 1;

			




	
	
	
		
 

			




	
	
	
		
 
  if(distrend_do_config(argc, argv, &general_info.config))

			




	
	
	
		
 
    return 1;

			




	
	
	
		
 

			




	
	
	
		
 
  if(start_data(&general_info, general_info.config->datadir))

			




	
	
	
		
 
  /** preset paths */

			




	
	
	
		
 
  _distren_asprintf(&general_info.files.geninfo, "%s/general_info.xml",

			




	
	
	
		
 
		    general_info.config->datadir);

			




	
	
	
		
 

			




	
	
	
		
 
  if(start_data(&general_info))

			




	
	
	
		
 
    {

			




	
	
	
		
 
      fprintf(stderr, "%s:%d: start_data() failed\n", __FILE__, __LINE__);

			




	
	
	
		
 
      return 1;

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
  /** pre-loaded jobs for testing */

			




	
	
		
 
@@ -1297,12 +1306,15 @@ int main(int argc, char *argv[])

			




	
	
	
		
 

			




	
	
	
		
 
  distrend_unlisten(general_info.config->listens, clients);

			




	
	
	
		
 
  distrend_config_free(general_info.config);

			




	
	
	
		
 

			




	
	
	
		
 
  xmlcleanup();

			




	
	
	
		
 

			




	
	
	
		
 
  /** free() paths */

			




	
	
	
		
 
  free(general_info.files.geninfo);

			




	
	
	
		
 

			




	
	
	
		
 
  return 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
   constructs the filename for a distrenjob's serialized XML

			




	
	
	
		
 
   to be stored/retrieved from/in.

			




	
	
		
 
@@ -1317,6 +1329,26 @@ char *job_getserialfilename(struct gener

			




	
	
	
		
 
  _distren_asprintf(&filename, "%s/stor/job/%d/distrenjob.xml",

			




	
	
	
		
 
		    geninfo->config->datadir,

			




	
	
	
		
 
		    jobnum);

			




	
	
	
		
 

			




	
	
	
		
 
  return filename;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
int distren_mkdir_recurse(char *dirname)

			




	
	
	
		
 
{

			




	
	
	
		
 
  size_t counter;

			




	
	
	
		
 
  char *nextdir;

			




	
	
	
		
 

			




	
	
	
		
 
  nextdir = strdup(dirname);

			




	
	
	
		
 
  for(counter = 0; nextdir[counter]; counter ++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
      /** @TODO OS-portabalize the path-separators */

			




	
	
	
		
 
      if(nextdir[counter] == '/')

			




	
	
	
		
 
	{

			




	
	
	
		
 
	  nextdir[counter] = '\0';

			




	
	
	
		
 
	  mkdir(nextdir, S_IRWXU | S_IRGRP | S_IROTH);

			




	
	
	
		
 
	  nextdir[counter] = '/';

			




	
	
	
		
 
	}

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
  return 0;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/server/listen.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -76,12 +76,15 @@ int distrend_listen(struct distrend_conf

			




	
	
	
		
 

			




	
	
	
		
 
  tmp = listen(config->listens->sock, 1);

			




	
	
	
		
 

			




	
	
	
		
 
  FD_ZERO(&(*clients)->readfds);

			




	
	
	
		
 
  FD_ZERO(&(*clients)->writefds);

			




	
	
	
		
 

			




	
	
	
		
 
  /** accept()able sockets are considered ``readable'' */

			




	
	
	
		
 
  FD_SET(config->listens->sock, &(*clients)->readfds);

			




	
	
	
		
 

			




	
	
	
		
 
  return 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
int distrend_handleread(struct distrend_config *config,

			




	
	
	
		
 
		    struct distrend_client *client)

			




	
	
	
		
 
{

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-307515
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support