Skip to content

Commit

Permalink
add underscores to internal helper functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@peterver
peterver authored and Jimmy Tang committed Jun 20, 2011
1 parent 9ef8c6e commit 6b9c20f
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 38 deletions.
56 changes: 28 additions & 28 deletions slurm_php.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ ZEND_GET_MODULE(slurm_php)
* TODO
*****************************************************************************
* [ADJUSTING EXISTING FUNCTIONS]
* - parse_node_pointer
* - _parse_node_pointer
* dynamic_plugin_data_t is currently not returned
* [EXTRA FUNCTIONS]
* - Functions that filter jobs on the nodes they are running on
Expand All @@ -112,13 +112,13 @@ ZEND_GET_MODULE(slurm_php)
* HELPER FUNCTIONS
\*****************************************************************************/

void parse_node_pointer(zval *sub_arr, node_info_t *node_arr)
void _parse_node_pointer(zval *sub_arr, node_info_t *node_arr)
{
zval *sub_arr_2 = NULL;

zend_add_valid_assoc_string(sub_arr, "Name", node_arr->name);
zend_add_valid_assoc_string(sub_arr, "Arch.", node_arr->arch);
zend_add_valid_assoc_time_string(sub_arr, "Boot Time",
_zend_add_valid_assoc_string(sub_arr, "Name", node_arr->name);
_zend_add_valid_assoc_string(sub_arr, "Arch.", node_arr->arch);
_zend_add_valid_assoc_time_string(sub_arr, "Boot Time",
&node_arr->boot_time);
add_assoc_long(sub_arr, "#CPU'S", node_arr->cpus);
add_assoc_long(sub_arr, "#Cores/CPU", node_arr->cores);
Expand All @@ -128,19 +128,19 @@ void parse_node_pointer(zval *sub_arr, node_info_t *node_arr)
} else {
ALLOC_INIT_ZVAL(sub_arr_2);
array_init(sub_arr_2);
parse_array(node_arr->features, ",", sub_arr_2);
_parse_array(node_arr->features, ",", sub_arr_2);
add_assoc_zval(sub_arr, "Features", sub_arr_2);
}

zend_add_valid_assoc_string(sub_arr, "GRES", node_arr->gres);
_zend_add_valid_assoc_string(sub_arr, "GRES", node_arr->gres);
add_assoc_long(sub_arr, "State", node_arr->node_state);
zend_add_valid_assoc_string(sub_arr, "OS", node_arr->os);
_zend_add_valid_assoc_string(sub_arr, "OS", node_arr->os);
add_assoc_long(sub_arr, "Real Mem", node_arr->real_memory);

if (node_arr->reason!=NULL) {
zend_add_valid_assoc_string(sub_arr, "Reason",
_zend_add_valid_assoc_string(sub_arr, "Reason",
node_arr->reason);
zend_add_valid_assoc_time_string(sub_arr,"Reason Timestamp",
_zend_add_valid_assoc_time_string(sub_arr,"Reason Timestamp",
&node_arr->reason_time);
add_assoc_long(sub_arr, "Reason User Id",
node_arr->reason_uid);
Expand All @@ -150,7 +150,7 @@ void parse_node_pointer(zval *sub_arr, node_info_t *node_arr)
add_assoc_null(sub_arr, "Reason User Id");
}

zend_add_valid_assoc_time_string(sub_arr, "Slurmd Startup Time",
_zend_add_valid_assoc_time_string(sub_arr, "Slurmd Startup Time",
&node_arr->slurmd_start_time);
add_assoc_long(sub_arr, "#Sockets/Node", node_arr->sockets);
add_assoc_long(sub_arr, "#Threads/Core", node_arr->threads);
Expand All @@ -159,7 +159,7 @@ void parse_node_pointer(zval *sub_arr, node_info_t *node_arr)
}


void parse_assoc_array(char *char_arr, char *delims, zval *result_arr)
void _parse_assoc_array(char *char_arr, char *delims, zval *result_arr)
{
char *rslt = NULL;
char *tmp;
Expand All @@ -173,7 +173,7 @@ void parse_assoc_array(char *char_arr, char *delims, zval *result_arr)
if (strcmp(rslt,"(null)")==0) {
add_assoc_null(result_arr, tmp);
} else {
zend_add_valid_assoc_string(result_arr,
_zend_add_valid_assoc_string(result_arr,
tmp, rslt);
}
}
Expand All @@ -186,7 +186,7 @@ void parse_assoc_array(char *char_arr, char *delims, zval *result_arr)
}


void parse_array(char *char_arr, char *delims, zval *rslt_arr)
void _parse_array(char *char_arr, char *delims, zval *rslt_arr)
{
char *rslt = NULL;
char *tmp = NULL;
Expand All @@ -205,7 +205,7 @@ void parse_array(char *char_arr, char *delims, zval *rslt_arr)
}
}

void zend_add_valid_assoc_string(zval *rstl_arr, char *key, char *val)
void _zend_add_valid_assoc_string(zval *rstl_arr, char *key, char *val)
{
char *tmp = NULL;
if (val==NULL) {
Expand All @@ -219,7 +219,7 @@ void zend_add_valid_assoc_string(zval *rstl_arr, char *key, char *val)
}


void zend_add_valid_assoc_time_string(zval *rstl_arr, char *key, time_t *val)
void _zend_add_valid_assoc_time_string(zval *rstl_arr, char *key, time_t *val)
{
char buf[80];
struct tm *timeinfo;
Expand Down Expand Up @@ -261,9 +261,9 @@ PHP_FUNCTION(slurm_slurmd_status)
}

array_init(return_value);
zend_add_valid_assoc_time_string(return_value,"Booted_at",
_zend_add_valid_assoc_time_string(return_value,"Booted_at",
&status_ptr->booted);
zend_add_valid_assoc_time_string(return_value,"Last_Msg",
_zend_add_valid_assoc_time_string(return_value,"Last_Msg",
&status_ptr->last_slurmctld_msg);
add_assoc_long(return_value,"Logging_Level", status_ptr->slurmd_debug);
add_assoc_long(return_value,"Actual_CPU's", status_ptr->actual_cpus);
Expand All @@ -277,13 +277,13 @@ PHP_FUNCTION(slurm_slurmd_status)
add_assoc_long(return_value,"Actual_Tmp_Disk",
status_ptr->actual_tmp_disk);
add_assoc_long(return_value,"PID",status_ptr->pid);
zend_add_valid_assoc_string(return_value, "Hostname",
_zend_add_valid_assoc_string(return_value, "Hostname",
status_ptr->hostname);
zend_add_valid_assoc_string(return_value, "Slurm Logfile",
_zend_add_valid_assoc_string(return_value, "Slurm Logfile",
status_ptr->slurmd_logfile);
zend_add_valid_assoc_string(return_value, "Step List",
_zend_add_valid_assoc_string(return_value, "Step List",
status_ptr->step_list);
zend_add_valid_assoc_string(return_value, "Version",
_zend_add_valid_assoc_string(return_value, "Version",
status_ptr->version);

if (status_ptr != NULL) {
Expand Down Expand Up @@ -398,7 +398,7 @@ PHP_FUNCTION(slurm_array_to_hostlist)

array_init(return_value);
buf = slurm_hostlist_ranged_string_xmalloc(hl);
zend_add_valid_assoc_string(return_value,"HOSTLIST",buf);
_zend_add_valid_assoc_string(return_value,"HOSTLIST",buf);
}


Expand Down Expand Up @@ -473,7 +473,7 @@ PHP_FUNCTION(slurm_get_specific_partition_info)
prt_data = prt_ptr->partition_array;
tmp = slurm_sprint_partition_info(prt_data, 1);
array_init(return_value);
parse_assoc_array(tmp, "= ", return_value);
_parse_assoc_array(tmp, "= ", return_value);
y++;
break;
}
Expand Down Expand Up @@ -600,7 +600,7 @@ PHP_FUNCTION(slurm_get_node_elements)
for (i = 0; i < node_ptr->record_count; i++) {
ALLOC_INIT_ZVAL(sub_arr);
array_init(sub_arr);
parse_node_pointer(sub_arr, node_ptr->node_array);
_parse_node_pointer(sub_arr, node_ptr->node_array);
tmp = malloc(strlen(node_ptr->node_array->name)+1);
strcpy(tmp,node_ptr->node_array->name);
add_assoc_zval(return_value, tmp,
Expand Down Expand Up @@ -651,7 +651,7 @@ PHP_FUNCTION(slurm_get_node_element_by_name)
y++;
ALLOC_INIT_ZVAL(sub_arr);
array_init(sub_arr);
parse_node_pointer(sub_arr, node_ptr->node_array);
_parse_node_pointer(sub_arr, node_ptr->node_array);
add_assoc_zval(return_value, node_name,
sub_arr);
break;
Expand Down Expand Up @@ -833,7 +833,7 @@ PHP_FUNCTION(slurm_load_job_information)
sprintf(tmp, "%d", job_ptr->job_array->job_id);
ALLOC_INIT_ZVAL(sub_arr);
array_init(sub_arr);
parse_assoc_array(slurm_sprint_job_info(job_ptr->job_array, 1),
_parse_assoc_array(slurm_sprint_job_info(job_ptr->job_array, 1),
"= ", sub_arr);
add_assoc_zval(return_value, tmp, sub_arr);
job_ptr->job_array++;
Expand Down Expand Up @@ -884,7 +884,7 @@ PHP_FUNCTION(slurm_load_partition_jobs)
sprintf(tmp, "%d", job_ptr->job_array->job_id);
ALLOC_INIT_ZVAL(sub_arr);
array_init(sub_arr);
parse_assoc_array(
_parse_assoc_array(
slurm_sprint_job_info(job_ptr->job_array, 1),
"= ", sub_arr);
add_assoc_zval(return_value, tmp, sub_arr);
Expand Down
20 changes: 10 additions & 10 deletions slurm_php.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,49 +74,49 @@ typedef struct key_value {
\*****************************************************************************/

/*
* parse_node_pointer - Parse a node pointer's contents into an
* _parse_node_pointer - Parse a node pointer's contents into an
* assocative zval array where the key is descriptive to the
* value
*
* IN sub_arr - array to store the contents of the node pointer
* IN node_arr - node pointer that needs parsing
*/
void parse_node_pointer(zval *sub_arr, node_info_t *node_arr);
void _parse_node_pointer(zval *sub_arr, node_info_t *node_arr);

/*
* parse_assoc_array - Parse a character array where the elements are
* _parse_assoc_array - Parse a character array where the elements are
* key-value pairs separated by delimiters into an associative
* array
*
* IN char_arr - character array that needs parsing
* IN delims - character array that contains the delimeters used in parsing
* IN result_arr - associative array used to store the key_value pairs in
*/
void parse_assoc_array(char *char_arr, char *delims, zval *result_arr);
void _parse_assoc_array(char *char_arr, char *delims, zval *result_arr);

/*
* parse_array - Parse a character array where the elements are values
* _parse_array - Parse a character array where the elements are values
* separated by delimiters into a numerically indexed array
*
* IN char_arr - character array that needs parsing
* IN delims - character array that contains the delimeters used in parsing
* IN result_arr - numerically indexed array used to store the values in
*/
void parse_array(char *char_arr, char *delims, zval *rslt_arr);
void _parse_array(char *char_arr, char *delims, zval *rslt_arr);

/*
* zend_add_valid_assoc_string - checks a character array to see if
* _zend_add_valid_assoc_string - checks a character array to see if
* it's NULL or not, if so an associative null is added, if not
* an associative string is added.
*
* IN rstl_arr - array to store the associative key_value pairs in
* IN key - character array used as the associative key
* IN val - character array to be validated and added as value if valid
*/
void zend_add_valid_assoc_string(zval *rstl_arr, char *key, char *val);
void _zend_add_valid_assoc_string(zval *rstl_arr, char *key, char *val);

/*
* zend_add_valid_assoc_time_string - checks a unix timestamp to see if it's
* _zend_add_valid_assoc_time_string - checks a unix timestamp to see if it's
* 0 or not, if so an associative null is added, if not a formatted string
* is added.
*
Expand All @@ -126,7 +126,7 @@ void zend_add_valid_assoc_string(zval *rstl_arr, char *key, char *val);
* NOTE : If you'd like to change the format in which the valid strings are
* returned, you can change the TIME_FORMAT_STRING macro to the needed format
*/
void zend_add_valid_assoc_time_string(zval *rstl_arr, char *key, time_t *val);
void _zend_add_valid_assoc_time_string(zval *rstl_arr, char *key, time_t *val);


/*****************************************************************************\
Expand Down

0 comments on commit 6b9c20f

Please sign in to comment.