Files
@ abe4f18bd898
Branch filter:
Location: DistRen/src/common/options.c
abe4f18bd898
3.7 KiB
text/plain
-added assigned_frames variable to blendjob structure
-adjusted frame_num_struct_builder by adding 1 to the total amount. (line 270)
reason: by example
sframe = 1
eframe = 2
eframe - sframe = 1.. when in reality 2 frames should be rendered... so it is now
int total = (sframe - eframe) +1;
refined frame_finder() function to use the structure for total_frames data... and optimized its frame scanning so that it scanned from (for example) 0 to 249 is 250 because the computer counts 0 as one of its numbers.
the statement in status_report_generator() function that adjust the hcfjob global variable to be able to increase the hcfjob by more than 1 per status_report_generator() function itteration by changing it to a while statement from an if statement.
moved the declaration of the num1 and num2 variables till after hcfjob was checked, because the value of num1 is based off the hcfjob value.
Added ability for status_report_generator() function to calculate the percent_done of the job and count the number of frames assigned, but not yet completed.
-adjusted frame_num_struct_builder by adding 1 to the total amount. (line 270)
reason: by example
sframe = 1
eframe = 2
eframe - sframe = 1.. when in reality 2 frames should be rendered... so it is now
int total = (sframe - eframe) +1;
refined frame_finder() function to use the structure for total_frames data... and optimized its frame scanning so that it scanned from (for example) 0 to 249 is 250 because the computer counts 0 as one of its numbers.
the statement in status_report_generator() function that adjust the hcfjob global variable to be able to increase the hcfjob by more than 1 per status_report_generator() function itteration by changing it to a while statement from an if statement.
moved the declaration of the num1 and num2 variables till after hcfjob was checked, because the value of num1 is based off the hcfjob value.
Added ability for status_report_generator() function to calculate the percent_done of the job and count the number of frames assigned, but not yet completed.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 | /*
Copyright 2008 Nathan Phillip Brink, Ethan Zonca
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/>.
*/
/* The purpose of this file is to... */
#include "options.h"
#include <confuse.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
struct options_common_data
{
cfg_t *cfg;
};
int options_init(int argc, char *argv[], cfg_t **mycfg, cfg_opt_t *myopts, char *myname, struct options_common **allopts)
{
char *configfile;
size_t i;
/* For those of you who don't know, the following is an example of concatenation of constant strings by the C compiler. Now, that doesn't mean you can do run-time string concatenation ;-)
strdup is because someday configfile will be customizable via argv[]
*/
i = strlen(SYSCONFDIR "/distren.conf") + strlen(myname) + 1;
configfile = malloc(i);
if(!configfile)
{
perror("malloc");
return 1;
}
strncpy(configfile, SYSCONFDIR "/distren", strlen(SYSCONFDIR "/distren") + 1);
strcat(configfile, myname);
strcat(configfile, ".conf");
*allopts = malloc(sizeof(struct options_common));
if(!*allopts)
{
perror("malloc");
free(configfile);
return 1;
}
memset(*allopts, '\0', sizeof(struct options_common));
(*allopts)->data = malloc(sizeof(struct options_common_data));
if(!(*allopts)->data)
{
perror("malloc");
free(configfile);
free(*allopts);
return 1;
}
memset((*allopts)->data, '\0', sizeof(struct options_common_data));
/* Conf File Parser */
cfg_opt_t common_opts[] =
{
CFG_END()
};
/*
In these arrays, I should replace NULL with a pointer to a string in the struct which should hold the result of confuse processing an option. This is partially because confuse will not free the values it parses.
*/
cfg_opt_t server_opts[] =
{
CFG_STR("username", NULL, CFGF_NONE),
CFG_STR("hostname", NULL, CFGF_NONE),
CFG_STR("method", "ssh", CFGF_NONE),
CFG_STR_LIST("types", NULL, CFGF_NONE),
CFG_END()
};
cfg_opt_t opts[] =
{
CFG_SEC("common",
common_opts,
CFGF_NONE),
CFG_SEC("server",
server_opts,
CFGF_MULTI | CFGF_TITLE),
CFG_SEC(myname,
myopts,
0),
CFG_FUNC("include",
&cfg_include),
CFG_END()
};
(*allopts)->data->cfg = cfg_init(opts, 0);
switch(cfg_parse((*allopts)->data->cfg, configfile))
{
default:
fprintf(stderr, "cfg_parse returned an unknown error code\n");
case CFG_FILE_ERROR:
cfg_error((*allopts)->data->cfg, "Couldn't open file ``%s''\n", configfile);
/* no break; on purpose */
case CFG_PARSE_ERROR:
free((*allopts)->data);
free(*allopts);
free(configfile);
return 1;
case CFG_SUCCESS:
break;
}
free(configfile);
*mycfg = cfg_getsec((*allopts)->data->cfg, myname);
return 0;
}
int options_free(struct options_common *opts)
{
/* free the other common_options struct's members */
cfg_free(opts->data->cfg);
free(opts->data);
free(opts);
return 0;
}
|