From 04d535a74420cfd6b757f9298ac6f5d4d3d30732 Mon Sep 17 00:00:00 2001 From: rahulp13 Date: Fri, 22 Nov 2019 16:12:08 +0530 Subject: removed stop-time for models --- src/createKicadLibrary.py | 1 - src/model_generation.py | 326 +++++++++++++++++++--------------------------- 2 files changed, 136 insertions(+), 191 deletions(-) (limited to 'src') diff --git a/src/createKicadLibrary.py b/src/createKicadLibrary.py index b66d487..49c298e 100644 --- a/src/createKicadLibrary.py +++ b/src/createKicadLibrary.py @@ -74,7 +74,6 @@ class AutoSchematic(QtGui.QWidget): ET.SubElement(param ,"fall_delay", default ="1.0e-9").text = "Enter Fall Delay (default=1.0e-9)" ET.SubElement(param ,"input_load", default ="1.0e-12").text = "Enter Input Load (default=1.0e-12)" ET.SubElement(param ,"instance_id", default ="1").text = "Enter Instance ID (Between 0-99)" - ET.SubElement(param ,"stop_time", default ="90e-9").text = "Enter the stop time to end the simulation (default=90e-9)" tree = ET.ElementTree(root) tree.write(str(self.modelname) + '.xml') print "Leaving the directory ", (xmlDestination) diff --git a/src/model_generation.py b/src/model_generation.py index dffd690..5bfa960 100644 --- a/src/model_generation.py +++ b/src/model_generation.py @@ -168,19 +168,18 @@ for item in output_port: var_section=''' - // Declaring components of Client - static int flag=0; - FILE *log_client = NULL; - log_client=fopen("client.log","a"); - int socket_fd, bytes_recieved; - char send_data[1024]; + // Declaring components of Client + FILE *log_client = NULL; + log_client=fopen("client.log","a"); + int socket_fd, bytes_recieved; + char send_data[1024]; char recv_data[1024]; char *key_iter; - struct hostent *host; - struct sockaddr_in server_addr; - double time_limit = PARAM(stop_time); + struct hostent *host; + struct sockaddr_in server_addr; int sock_port = 5000+PARAM(instance_id); ''' + temp_input_var=[] for item in input_port: temp_input_var.append("char temp_"+item.split(':')[0]+"[1024];") @@ -229,9 +228,9 @@ els_evt_ptr=[] els_evt_count1=0 els_evt_count2=0 for item in output_port: - els_evt_ptr.append("_op_"+item.split(":")[0]+" = cm_event_get_ptr("+str(els_evt_count1)+","+str(els_evt_count2)+");") + els_evt_ptr.append("_op_"+item.split(":")[0]+" = (Digital_State_t *) cm_event_get_ptr("+str(els_evt_count1)+","+str(els_evt_count2)+");") els_evt_count2=els_evt_count2+1 - els_evt_ptr.append("_op_"+item.split(":")[0]+"_old"+" = cm_event_get_ptr("+str(els_evt_count1)+","+str(els_evt_count2)+");") + els_evt_ptr.append("_op_"+item.split(":")[0]+"_old"+" = (Digital_State_t *) cm_event_get_ptr("+str(els_evt_count1)+","+str(els_evt_count2)+");") els_evt_count1=els_evt_count1+1 @@ -275,87 +274,80 @@ client_setup_ip=''' ''' client_fetch_ip=''' - /* Client Fetch IP Addr */ + /* Client Fetch IP Addr */ - char* my_ip = STATIC_VAR(my_ip); + char* my_ip = STATIC_VAR(my_ip); - host = gethostbyname(my_ip); - printf("\\n\\nClient-Creating Socket \\n"); - fprintf(log_client,"Creating client socket \\n"); + host = gethostbyname(my_ip); + printf("\\n\\nClient-Creating Socket \\n"); + fprintf(log_client,"Creating client socket \\n"); ''' create_socket=''' - //Creating socket for client - if ((socket_fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) - { - perror("Client-Error while creating client Socket \\n"); - fprintf(log_client,"Error while creating client socket \\n"); - exit(1); - } - - printf("Client-Client Socket created successfully \\n"); - printf("Client- Socket Id : %d \\n",socket_fd); - fprintf(log_client,"Client-Client Socket created successfully \\n"); - fprintf(log_client,"Client- Socket Id : %d \\n",socket_fd); - - // memset(&server_addr, 0, sizeof(server_addr)); - server_addr.sin_family = AF_INET; - server_addr.sin_port = htons(sock_port); - server_addr.sin_addr = *((struct in_addr *)host->h_addr); - bzero(&(server_addr.sin_zero),8); + //Creating socket for client + if ((socket_fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) + { + perror("Client-Error while creating client Socket \\n"); + fprintf(log_client,"Error while creating client socket \\n"); + exit(1); + } + + printf("Client-Client Socket created successfully \\n"); + printf("Client- Socket Id : %d \\n",socket_fd); + fprintf(log_client,"Client-Client Socket created successfully \\n"); + fprintf(log_client,"Client- Socket Id : %d \\n",socket_fd); + + // memset(&server_addr, 0, sizeof(server_addr)); + server_addr.sin_family = AF_INET; + server_addr.sin_port = htons(sock_port); + server_addr.sin_addr = *((struct in_addr *)host->h_addr); + bzero(&(server_addr.sin_zero),8); ''' connect_server=''' - printf("Client-Connecting to server \\n"); - fprintf(log_client,"Client-Connecting to server \\n"); - //Conneting to server - - int try_limit=10; - while(try_limit>0) - { - if (connect(socket_fd, (struct sockaddr*)&server_addr,sizeof(struct sockaddr)) == -1) - { - sleep(1); - try_limit--; - if(try_limit==0) - { - fprintf(stderr,"Connect- Error:Tried to connect server on port , failed..giving up \\n"); - fprintf(log_client,"Connect- Error:Tried to connect server on port , failed..giving up \\n"); - exit(1); - } - } - else - { - printf("Client-Connected to server \\n"); - fprintf(log_client,"Client-Connected to server \\n"); - break; - } - } + printf("Client-Connecting to server \\n"); + fprintf(log_client,"Client-Connecting to server \\n"); + + //Connecting to server + int try_limit=10; + while(try_limit>0) + { + if (connect(socket_fd, (struct sockaddr*)&server_addr,sizeof(struct sockaddr)) == -1) + { + sleep(1); + try_limit--; + if(try_limit==0) + { + fprintf(stderr,"Connect- Error:Tried to connect server on port , failed..giving up \\n"); + fprintf(log_client,"Connect- Error:Tried to connect server on port , failed..giving up \\n"); + exit(1); + } + } + else + { + printf("Client-Connected to server \\n"); + fprintf(log_client,"Client-Connected to server \\n"); + break; + } + } ''' -time_limit =''' - if(TIME < time_limit) - { - //Formating data for sending it to client - int Ii; - -''' #Assign bit value to every input assign_data_to_input=[] for item in input_port: - assign_data_to_input.append("\t\t\tfor(Ii=0;Ii