fanasina/y_project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

y_socket: remove usage m_variables

Browse Source
This commit is contained in:
fanasina
2025-10-17 00:20:38 +02:00
parent 78647b47ce
commit c0e610641f
3 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
y_socket_t/include/y_socket_t/y_file_handler.h
+2 -3
View File
@@ -21,7 +21,7 @@ struct arg_send_file{
y_NODE_T node; y_NODE_T node;
char * filename; char * filename;
struct main_list_y_ptr_HEADER_T *m_ok_head_l_t; struct main_list_y_ptr_HEADER_T *m_ok_head_l_t;
struct main_list_y_ptr_VARIABLE *m_var; //struct main_list_y_ptr_VARIABLE *m_var;
}; };
void* y_socket_send_file_for_all_nodes(void* arg); void* y_socket_send_file_for_all_nodes(void* arg);
@@ -34,7 +34,6 @@ enum cmd_type {
cmd_update_wakeup, cmd_update_wakeup,
cmd_post_file, cmd_post_file,
cmd_post_ok, cmd_post_ok,
cmd_post_var,
cmd_get_file, cmd_get_file,
cmd_get_var, cmd_get_var,
}; };
@@ -74,7 +73,7 @@ GEN_HEAD_PTR_LIST(y_ptr_HEADER_T)
size_t set_tempAddr_from_node(char *tempAddr, y_NODE_T node); size_t set_tempAddr_from_node(char *tempAddr, y_NODE_T node);
//void receve_from_node(struct pollfd *fds, char *msg, size_t count); //void receve_from_node(struct pollfd *fds, char *msg, size_t count);
void receve_from_node(struct pollfd *fds, struct main_list_y_ptr_HEADER_T *m_head_l_t, struct main_list_y_ptr_VARIABLE *m_var, struct main_list_y_ptr_STRING *m_str, y_NODE_T node /* char * srcAddr*/, char *filename); void receve_from_node(struct pollfd *fds, struct main_list_y_ptr_HEADER_T *m_head_l_t, /*struct main_list_y_ptr_VARIABLE *m_var,*/ struct main_list_y_ptr_STRING *m_str, y_NODE_T node /* char * srcAddr*/, char *filename);
long y_append_to_ok_header_l_(struct main_list_y_ptr_HEADER_T *m_ok_head_l_t, char *nameid ); long y_append_to_ok_header_l_(struct main_list_y_ptr_HEADER_T *m_ok_head_l_t, char *nameid );
#endif /*Y_FILE_HANDLER_T_H__C*/ #endif /*Y_FILE_HANDLER_T_H__C*/
y_socket_t/src/y_socket_t/y_file_handler.c
+1 -3
View File
@@ -762,7 +762,7 @@ void* y_socket_send_file_for_all_nodes(void* arg){
} }
#endif #endif
void receve_from_node(struct pollfd *fds, struct main_list_y_ptr_HEADER_T *m_head_l_t, struct main_list_y_ptr_VARIABLE *m_var, struct main_list_y_ptr_STRING *m_str, y_NODE_T node /*char * srcAddr*/, char *filename ){ void receve_from_node(struct pollfd *fds, struct main_list_y_ptr_HEADER_T *m_head_l_t, /*struct main_list_y_ptr_VARIABLE *m_var,*/ struct main_list_y_ptr_STRING *m_str, y_NODE_T node /*char * srcAddr*/, char *filename ){
//printf("\ndebug: <<<< receve_from_node %s %ld\n\n",msg,count); //printf("\ndebug: <<<< receve_from_node %s %ld\n\n",msg,count);
char srcAddr[64]; char srcAddr[64];
set_addr_str_from_node(srcAddr, node); set_addr_str_from_node(srcAddr, node);
@@ -839,8 +839,6 @@ void receve_from_node(struct pollfd *fds, struct main_list_y_ptr_HEADER_T *m_hea
tmpCnt_l=tmpCnt_l->next; tmpCnt_l=tmpCnt_l->next;
} }
close(fd_file); close(fd_file);
}else if(strncmp(buf_cmd_v+5,"var",3)==0){
} }
struct list_y_ptr_HEADER_T * l_head_to_remove = pull_index_from_list_y_ptr_HEADER_T(m_head_l_t, local_header->index); struct list_y_ptr_HEADER_T * l_head_to_remove = pull_index_from_list_y_ptr_HEADER_T(m_head_l_t, local_header->index);
free_y_ptr_HEADER_T(l_head_to_remove->value); free_y_ptr_HEADER_T(l_head_to_remove->value);
y_socket_t/src/y_socket_t/y_socket_t.c
+10 -13
View File
@@ -174,7 +174,7 @@ int flags = fcntl(fds[af].fd, F_GETFL);
} }
struct arg_handler_{ struct arg_handler_{
struct main_list_y_ptr_STRING *m_str; struct main_list_y_ptr_STRING *m_str;
struct main_list_y_ptr_VARIABLE *m_var; //struct main_list_y_ptr_VARIABLE *m_var;
//char *buf; //char *buf;
struct pollfd *fds; struct pollfd *fds;
y_NODE_T node; y_NODE_T node;
@@ -299,19 +299,13 @@ void* y_socket_handler_(void *arg){
if(strncmp(buf+5,"file",4)==0){ if(strncmp(buf+5,"file",4)==0){
if(len_buf > 10){ if(len_buf > 10){
char *filename = buf+10; char *filename = buf+10;
receve_from_node(fds, argH->m_head_l_t, argH->m_var, m_str,argH->node, filename ); receve_from_node(fds, argH->m_head_l_t, /*argH->m_var,*/ m_str,argH->node, filename );
m_str = NULL; m_str = NULL;
} }
}else if(strncmp(buf+5,"ok",2)==0){ }else if(strncmp(buf+5,"ok",2)==0){
if(len_buf>8){ if(len_buf>8){
char *nameid = buf+8; char *nameid = buf+8;
y_append_to_ok_header_l_(argH->m_ok_head_l_t,nameid ); y_append_to_ok_header_l_(argH->m_ok_head_l_t,nameid );
}
}else if(strncmp(buf+5,"var",3)==0){
if(len_buf>9){
char *var_nameid = buf+9;
receve_from_node(fds, argH->m_head_l_t, argH->m_var, m_str,argH->node, var_nameid );
m_str = NULL;
} }
} }
@@ -332,7 +326,7 @@ void* y_socket_handler_(void *arg){
} }
void handle_buf_socket_rec(struct main_list_y_ptr_HEADER_T *m_ok_head_l_t, struct main_list_y_ptr_HEADER_T *m_head_l_t,struct main_list_y_ptr_VARIABLE *m_var,struct main_list_y_ptr_STRING *m_str, y_NODE_T node, struct main_list_ptr_y_WORKER_T * workers, struct argExecTasQ *argx, struct main_list_TYPE_PTR * list_arg, void * arg){ void handle_buf_socket_rec(struct main_list_y_ptr_HEADER_T *m_ok_head_l_t, struct main_list_y_ptr_HEADER_T *m_head_l_t, /*struct main_list_y_ptr_VARIABLE *m_var,*/ struct main_list_y_ptr_STRING *m_str, y_NODE_T node, struct main_list_ptr_y_WORKER_T * workers, struct argExecTasQ *argx, struct main_list_TYPE_PTR * list_arg, void * arg){
struct y_socket_t * argSock = (struct y_socket_t*)arg; struct y_socket_t * argSock = (struct y_socket_t*)arg;
struct pollfd *fds = argSock->fds; struct pollfd *fds = argSock->fds;
@@ -357,7 +351,7 @@ void handle_buf_socket_rec(struct main_list_y_ptr_HEADER_T *m_ok_head_l_t, struc
else{ else{
struct arg_handler_ *ptr_argHandl = malloc(sizeof(struct arg_handler_)); struct arg_handler_ *ptr_argHandl = malloc(sizeof(struct arg_handler_));
ptr_argHandl->m_str = m_str; ptr_argHandl->m_str = m_str;
ptr_argHandl->m_var = m_var; //ptr_argHandl->m_var = m_var;
ptr_argHandl->fds=fds; ptr_argHandl->fds=fds;
ptr_argHandl->sock=argSock; ptr_argHandl->sock=argSock;
ptr_argHandl->node=node; ptr_argHandl->node=node;
@@ -417,7 +411,7 @@ void *y_socket_poll_fds(void *arg){
struct main_list_y_ptr_STRING *m_str=NULL;//=create_var_list_y_ptr_STRING(); struct main_list_y_ptr_STRING *m_str=NULL;//=create_var_list_y_ptr_STRING();
struct main_list_y_ptr_HEADER_T *m_head_l_t = create_var_list_y_ptr_HEADER_T(); struct main_list_y_ptr_HEADER_T *m_head_l_t = create_var_list_y_ptr_HEADER_T();
struct main_list_y_ptr_HEADER_T *m_ok_head_l_t = create_var_list_y_ptr_HEADER_T(); struct main_list_y_ptr_HEADER_T *m_ok_head_l_t = create_var_list_y_ptr_HEADER_T();
struct main_list_y_ptr_VARIABLE *m_var = create_var_list_y_ptr_VARIABLE(); //struct main_list_y_ptr_VARIABLE *m_var = create_var_list_y_ptr_VARIABLE();
// char *temp_all_buf=NULL; // char *temp_all_buf=NULL;
@@ -478,7 +472,7 @@ void *y_socket_poll_fds(void *arg){
} }
if(check_y_socket_go_on(argSock) && m_str){ if(check_y_socket_go_on(argSock) && m_str){
printf("debug: call handle_buf_socket_rec\n"); printf("debug: call handle_buf_socket_rec\n");
handle_buf_socket_rec(m_ok_head_l_t,m_head_l_t, m_var, m_str, node, workers, argx, list_arg, arg); handle_buf_socket_rec(m_ok_head_l_t,m_head_l_t, /*m_var,*/ m_str, node, workers, argx, list_arg, arg);
m_str=NULL; m_str=NULL;
} }
@@ -567,10 +561,11 @@ void *y_socket_poll_fds(void *arg){
close(fds[af].fd); close(fds[af].fd);
return NULL; return NULL;
} }
/*
char dddnn[56]; char dddnn[56];
put_y_NODE_T_in_string(&node, dddnn); put_y_NODE_T_in_string(&node, dddnn);
printf("debug: sendto : %s: msg :%s\n\n",dddnn, buf+index_buf); printf("debug: sendto : %s: msg :%s\n\n",dddnn, buf+index_buf);
*/
} }
} }
@@ -597,11 +592,13 @@ void *y_socket_poll_fds(void *arg){
printf("debug: m_str!=NULL -> purge_ptr_type_list_y_ptr_STRING done\n"); printf("debug: m_str!=NULL -> purge_ptr_type_list_y_ptr_STRING done\n");
} }
#if 0
if(m_var){ if(m_var){
purge_ptr_type_list_y_ptr_VARIABLE(m_var); purge_ptr_type_list_y_ptr_VARIABLE(m_var);
printf("debug: m_var!=NULL -> purge_ptr_type_list_y_ptr_VARIABLE done\n"); printf("debug: m_var!=NULL -> purge_ptr_type_list_y_ptr_VARIABLE done\n");
} }
#endif
/* /*
if(temp_all_buf){ if(temp_all_buf){