ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-20 05:37:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement var_clear and var_send for imbedded http server JSON variable server. #844 #730.

Browse Source
This commit is contained in:
Penn, John M 047828115 2019-07-22 13:35:43 -05:00
parent 90c1564a0c
commit 0df631c41a
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trick_sims/Cannon/models/mongoose_httpd/include/WSSession.hh
View File

@ -25,6 +25,8 @@ public:
void synchSend(); // This must be called at a frequency greater than or equal to the interval.
void pause();
void unpause();
void clear();
void exit();
int emitError(const char* fmt, ... );
static int bad_ref_int ;

2
trick_sims/Cannon/models/mongoose_httpd/include/WSSessionVariable.hh
View File

@ -28,8 +28,6 @@ private:
REF2 *varInfo;
void *address;
int size;
void *buffer_in;
void *buffer_out;
bool deref;
};
#endif

11
trick_sims/Cannon/models/mongoose_httpd/src/WSSession.cpp
View File

@ -99,6 +99,8 @@ void WSsession::addVariable(char* vname){
}
if ( new_ref != NULL ) {
// This REF2 object will "belong" to the WSsessionVariable, so it has
// the right and responsibility to free() it in its destructor.
WSsessionVariable *sessionVariable = new WSsessionVariable( new_ref ) ;
sessionVariables.push_back( sessionVariable ) ;
}
@ -131,3 +133,12 @@ void WSsession::synchSend() { // This must be called at a frequency greater than
}
void WSsession::pause() { enabled = false;}
void WSsession::unpause() { enabled = true; }
void WSsession::clear() {
std::vector<WSsessionVariable*>::iterator it;
it = sessionVariables.begin();
while (it != sessionVariables.end()) {
delete *it;
it = sessionVariables.erase(it);
}
}
void WSsession::exit() {}

10
trick_sims/Cannon/models/mongoose_httpd/src/WSSessionVariable.cpp
View File

@ -3,8 +3,6 @@
#include <math.h> // for fpclassify
#include <iomanip> // for setprecision
WSsessionVariable::WSsessionVariable(REF2 * ref ) {
varInfo = ref;
address = varInfo->address;
@ -36,21 +34,13 @@ WSsessionVariable::WSsessionVariable(REF2 * ref ) {
size *= get_size((char*)address) ;
}
}
// handle strings: set a max buffer size, the copy size may vary so will be set in copy_sim_data
if (( string_type == TRICK_STRING ) || ( string_type == TRICK_WSTRING )) {
size = MAX_ARRAY_LENGTH ;
}
buffer_in = calloc( size, 1 ) ;
buffer_out = calloc( size, 1 ) ;
}
WSsessionVariable::~WSsessionVariable() {
if (buffer_in != NULL) free( buffer_in );
if (buffer_out != NULL) free( buffer_out );
if (varInfo != NULL) free( varInfo );
}

5
trick_sims/Cannon/models/mongoose_httpd/src/http_server.cpp
View File

@ -115,7 +115,6 @@ int handle_JSON_var_server_msg (WSsession* session, const char* client_msg) {
printf ("No \"cmd\" member found in client message.\n");
status = 1;
} else if (strcmp(cmd, "var_add") == 0) {
//const gchar* var_name = json_object_get_string_member( object, "var_name");
session->addVariable( strdup(var_name) );
printf("session->addVariable(\"%s\")\n", var_name);
} else if ( strcmp(cmd, "var_cycle") == 0 ) {
@ -129,9 +128,9 @@ int handle_JSON_var_server_msg (WSsession* session, const char* client_msg) {
session->unpause();
printf("session->unpause()\n");
} else if ( strcmp(cmd, "var_send") == 0 ) {
//TODO
session->sendValues();
} else if ( strcmp(cmd, "var_clear") == 0 ) {
//TODO
session->clear();
} else if ( strcmp(cmd, "var_exit") == 0 ) {
//TODO
} else {