From: vlad shkapenyuk Date: Fri, 4 Oct 2019 18:25:14 +0000 (-0400) Subject: Added additional UFAFs, fixed gsprintconsole_ves to handle float measruement intervals X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=083c44074f33f33368f66739afac9c11a51feb08;p=com%2Fgs-lite.git Added additional UFAFs, fixed gsprintconsole_ves to handle float measruement intervals Signed-off-by: vlad shkapenyuk Change-Id: I2b266eba37bbe1a8bd2ea420c7b270211be64ce4 --- diff --git a/cfg/external_fcns.def b/cfg/external_fcns.def index 0dabc6e..674c5c6 100644 --- a/cfg/external_fcns.def +++ b/cfg/external_fcns.def @@ -24,8 +24,11 @@ /////////////////////////////////////////////////////////// uint FUN [LFTA_LEGAL, COST FREE] EQ (uint, uint); + uint FUN [LFTA_LEGAL, COST FREE] EQ (ullong, ullong); uint FUN [LFTA_LEGAL, COST FREE] GEQ (uint, uint); + uint FUN [LFTA_LEGAL, COST FREE] GEQ (ullong, ullong); uint FUN [LFTA_LEGAL, COST FREE] LEQ (uint, uint); + uint FUN [LFTA_LEGAL, COST FREE] LEQ (ullong, ullong); /////////////////////////////////////////////////////////// diff --git a/include/hfta/hfta_udaf.h b/include/hfta/hfta_udaf.h index 6b576cf..9f8e6c8 100644 --- a/include/hfta/hfta_udaf.h +++ b/include/hfta/hfta_udaf.h @@ -82,6 +82,13 @@ void FIRST_HFTA_AGGR_UPDATE_(gs_uint32_t* scratch, gs_uint32_t val); void FIRST_HFTA_AGGR_OUTPUT_(gs_uint32_t* res, gs_uint32_t* scratch); void FIRST_HFTA_AGGR_DESTROY_(gs_uint32_t* scratch); +void FIRST_HFTA_AGGR_INIT_(gs_uint64_t* scratch); +void FIRST_HFTA_AGGR_REINIT_(gs_uint64_t* scratch); +void FIRST_HFTA_AGGR_UPDATE_(gs_uint64_t* scratch, gs_uint64_t val); +void FIRST_HFTA_AGGR_OUTPUT_(gs_uint64_t* res, gs_uint64_t* scratch); +void FIRST_HFTA_AGGR_DESTROY_(gs_uint64_t* scratch); + + void FIRST_ULL_HFTA_AGGR_INIT_(gs_uint64_t* scratch); void FIRST_ULL_HFTA_AGGR_REINIT_(gs_uint64_t* scratch); void FIRST_ULL_HFTA_AGGR_UPDATE_(gs_uint64_t* scratch, gs_uint64_t val); @@ -120,6 +127,12 @@ void LAST_HFTA_AGGR_UPDATE_(gs_uint32_t* scratch, gs_uint32_t val); void LAST_HFTA_AGGR_OUTPUT_(gs_uint32_t* res, gs_uint32_t* scratch); void LAST_HFTA_AGGR_DESTROY_(gs_uint32_t* scratch); +void LAST_HFTA_AGGR_INIT_(gs_uint64_t* scratch); +void LAST_HFTA_AGGR_REINIT_(gs_uint64_t* scratch); +void LAST_HFTA_AGGR_UPDATE_(gs_uint64_t* scratch, gs_uint64_t val); +void LAST_HFTA_AGGR_OUTPUT_(gs_uint64_t* res, gs_uint64_t* scratch); +void LAST_HFTA_AGGR_DESTROY_(gs_uint64_t* scratch); + void LAST_ULL_HFTA_AGGR_INIT_(gs_uint64_t* scratch); void LAST_ULL_HFTA_AGGR_REINIT_(gs_uint64_t* scratch); void LAST_ULL_HFTA_AGGR_UPDATE_(gs_uint64_t* scratch, gs_uint64_t val); diff --git a/src/lib/gscphftaaux/hfta_udaf.cc b/src/lib/gscphftaaux/hfta_udaf.cc index 0660739..aa44d24 100644 --- a/src/lib/gscphftaaux/hfta_udaf.cc +++ b/src/lib/gscphftaaux/hfta_udaf.cc @@ -277,20 +277,31 @@ gs_float_t extr_avg_fcn(vstring *v){ void FIRST_HFTA_AGGR_INIT_(gs_uint32_t* scratch) { *scratch = UINT_MAX; // we will encode uninitialized value of UINT_MAX } - void FIRST_HFTA_AGGR_REINIT_(gs_uint32_t* scratch) { } - void FIRST_HFTA_AGGR_UPDATE_(gs_uint32_t* scratch, gs_uint32_t val) { if (*scratch == UINT_MAX) *scratch = val; } - void FIRST_HFTA_AGGR_OUTPUT_(gs_uint32_t* res, gs_uint32_t* scratch) { *res = *scratch; } - void FIRST_HFTA_AGGR_DESTROY_(gs_uint32_t* scratch) { } +void FIRST_HFTA_AGGR_INIT_(gs_uint64_t* scratch) { + *scratch = UINT_MAX; // we will encode uninitialized value of UINT_MAX +} +void FIRST_HFTA_AGGR_REINIT_(gs_uint64_t* scratch) { } +void FIRST_HFTA_AGGR_UPDATE_(gs_uint64_t* scratch, gs_uint64_t val) { + if (*scratch == UINT_MAX) + *scratch = val; +} +void FIRST_HFTA_AGGR_OUTPUT_(gs_uint64_t* res, gs_uint64_t* scratch) { + *res = *scratch; +} +void FIRST_HFTA_AGGR_DESTROY_(gs_uint64_t* scratch) { } + + + void FIRST_ULL_HFTA_AGGR_INIT_(gs_uint64_t* scratch) { *scratch = UINT_MAX; // we will encode uninitialized value of UINT_MAX } @@ -393,19 +404,28 @@ void FIRST_STR_hfta_HFTA_AGGR_DESTROY_(vstring* scratch) { } // hfta only void LAST_HFTA_AGGR_INIT_(gs_uint32_t* scratch) { } - void LAST_HFTA_AGGR_REINIT_(gs_uint32_t* scratch) { } - void LAST_HFTA_AGGR_UPDATE_(gs_uint32_t* scratch, gs_uint32_t val) { *scratch = val; } - void LAST_HFTA_AGGR_OUTPUT_(gs_uint32_t* res, gs_uint32_t* scratch) { *res = *scratch; } - void LAST_HFTA_AGGR_DESTROY_(gs_uint32_t* scratch) { } + +void LAST_HFTA_AGGR_INIT_(gs_uint64_t* scratch) { } +void LAST_HFTA_AGGR_REINIT_(gs_uint64_t* scratch) { } +void LAST_HFTA_AGGR_UPDATE_(gs_uint64_t* scratch, gs_uint64_t val) { + *scratch = val; +} +void LAST_HFTA_AGGR_OUTPUT_(gs_uint64_t* res, gs_uint64_t* scratch) { + *res = *scratch; +} +void LAST_HFTA_AGGR_DESTROY_(gs_uint64_t* scratch) { } + + + void LAST_ULLHFTA_AGGR_INIT_(gs_uint64_t* scratch) { } void LAST_ULL_HFTA_AGGR_REINIT_(gs_uint64_t* scratch) { } diff --git a/src/tools/gsprintconsole_ves.c b/src/tools/gsprintconsole_ves.c index 30ddab8..053f746 100644 --- a/src/tools/gsprintconsole_ves.c +++ b/src/tools/gsprintconsole_ves.c @@ -48,6 +48,9 @@ static char linebuf[MAXLINE]; int listensockfd=0; int fd=0; +// how frequently we will log stats (expressed in tuples posted) +#define STAT_FREQUENCY 30 + // Not all systems have timersub defined so make sure its ther #ifndef timersub @@ -178,6 +181,9 @@ int main(int argc, char* argv[]) { gs_uint32_t tlimit = 0; // time limit in seconds time_t start_time, curr_time; + + gs_uint64_t post_success_cnt = 0ULL; + gs_uint64_t post_failure_cnt = 0ULL; gsopenlog(argv[0]); @@ -384,7 +390,7 @@ int main(int argc, char* argv[]) { long unsigned int lineno=0; long unsigned int seqno=0; - unsigned int measurement_interval; + double measurement_interval; while((code=ftaapp_get_tuple(&rfta_id,&rsize,rbuf,2*MAXTUPLESZ,0))>=0) { lineno++; if (dump) // -D in command line @@ -463,7 +469,7 @@ int main(int argc, char* argv[]) { else pos += snprintf(linebuf+pos,MAXLINE-pos," \"%s\": \"%d\"",field_names[y], ar.r.i); if(y==measurement_interval_pos) - measurement_interval = (unsigned int)ar.r.i; + measurement_interval = (double)ar.r.i; break; case UINT_TYPE: if(ves_version < 7) @@ -471,7 +477,7 @@ int main(int argc, char* argv[]) { else pos += snprintf(linebuf+pos,MAXLINE-pos," \"%s\": \"%u\"",field_names[y], ar.r.ui); if(y==measurement_interval_pos) - measurement_interval = (unsigned int)ar.r.ui; + measurement_interval = (double)ar.r.ui; break; case IP_TYPE: if(ves_version < 7) @@ -521,7 +527,7 @@ int main(int argc, char* argv[]) { else pos += snprintf(linebuf+pos,MAXLINE-pos,"\"%s\": \"%u\"}",field_names[y], ar.r.ui); if(y==measurement_interval_pos) - measurement_interval = (unsigned int)ar.r.ui; + measurement_interval = (double)ar.r.ui; break; case BOOL_TYPE: if(ves_version < 7){ @@ -544,7 +550,7 @@ int main(int argc, char* argv[]) { else pos += snprintf(linebuf+pos,MAXLINE-pos,"\"%s\": \"%llu\"",field_names[y], ar.r.ul); if(y==measurement_interval_pos) - measurement_interval = (unsigned int)ar.r.ul; + measurement_interval = (double)ar.r.ul; break; case LLONG_TYPE: if(ves_version < 7) @@ -552,13 +558,15 @@ int main(int argc, char* argv[]) { else pos += snprintf(linebuf+pos,MAXLINE-pos,"\"%s\": \"%lld\"",field_names[y], ar.r.l); if(y==measurement_interval_pos) - measurement_interval = (unsigned int)ar.r.l; + measurement_interval = (double)ar.r.l; break; case FLOAT_TYPE: if(ves_version < 7) pos += snprintf(linebuf+pos,MAXLINE-pos,"{\"name\": \"%s\", \"value\": \"%f\"}",field_names[y], ar.r.f); else pos += snprintf(linebuf+pos,MAXLINE-pos,"\"%s\": \"%f\"",field_names[y], ar.r.f); + if(y==measurement_interval_pos) + measurement_interval = (double)ar.r.f; break; case TIMEVAL_TYPE: { @@ -609,12 +617,12 @@ int main(int argc, char* argv[]) { } if(ves_version < 7){ snprintf(linebuf+pos, MAXLINE-pos, - "], \"measurementInterval\": %u, \"measurementsForVfScalingVersion\": 1" + "], \"measurementInterval\": %f, \"measurementsForVfScalingVersion\": 1" "}}}\n", measurement_interval ); }else{ snprintf(linebuf+pos, MAXLINE-pos, - "}, \"measurementInterval\": %u, \"measurementFieldsVersion\": \"4.0\"" + "}, \"measurementInterval\": %f, \"measurementFieldsVersion\": \"4.0\"" "}}}\n", measurement_interval ); } @@ -623,13 +631,18 @@ int main(int argc, char* argv[]) { }else{ http_post_request_hdr(curl_endpoint, curl_url, linebuf, &http_code, curl_auth); if(http_code != 200 && http_code != 202){ + post_failure_cnt++; gslog(LOG_WARNING, "http return code is %d\n",http_code); - } + } else { + post_success_cnt++; + } + if (((post_success_cnt+post_failure_cnt) % STAT_FREQUENCY) == 0) + gslog(LOG_WARNING, "%s: successful ves posts - %llu, failed ves posts - %llu\n", argv[0], post_success_cnt, post_failure_cnt); } if (verbose!=0) fflush(stdout); } else { if (rfta_id.streamid != fta_id.streamid) - fprintf(stderr,"Got unkown streamid %llu \n",rfta_id.streamid); + fprintf(stderr,"Got unknown streamid %llu \n",rfta_id.streamid); } // whenever we receive a temp tuple check if we reached time limit