Improvements to aggregation code and fucntion library

[com/gs-lite.git] / src / ftacmp / translate_fta.cc

diff --git a/src/ftacmp/translate_fta.cc b/src/ftacmp/translate_fta.cc
index 4ee0bb4..19ff634 100644 (file)
--- a/src/ftacmp/translate_fta.cc
+++ b/src/ftacmp/translate_fta.cc
@@ -169,6 +169,7 @@ int main(int argc, char **argv){
   vector<string> registration_query_names;                     // for lfta.c registration
   map<string, vector<int> > mach_query_names;  // list queries of machine
   vector<int> snap_lengths;                            // for lfta.c registration
+  vector<int> snap_position;                           // for lfta.c registration
   vector<string> interface_names;                      // for lfta.c registration
   vector<string> machine_names;                        // machine of interface
   vector<bool> lfta_reuse_options;                     // for lfta.c registration
@@ -2095,7 +2096,11 @@ for(q=0;q<hfta_sets.size();++q){
                lfta_val[lmach] += generate_lfta_block(split_queries[l]->query_plan[0], Schema, split_queries[l]->get_gid(), Ext_fcns, lfta_schema_embed, ifaces_db,nicprop);
 */
 
-               snap_lengths.push_back(compute_snap_len(split_queries[l]->query_plan[0], Schema));
+               snap_lengths.push_back(compute_snap_len(split_queries[l]->query_plan[0], Schema, "snap"));
+               snap_position.push_back(compute_snap_len(split_queries[l]->query_plan[0], Schema, "index"));
+
+// STOPPED HERE need to figure out how to generate the code that Vlad needs
+//             from snap_postion
 
 // TODO NOTE : I'd like it to be the case that registration_query_names
 //     are the queries to be registered for subsciption.
@@ -2552,7 +2557,10 @@ for(ssi_el=extra_external_libs.begin();ssi_el!=extra_external_libs.end();++ssi_e
 
 
 //                     Find common filter predicates in the LFTAs.
-//                     in addition generate structs to store the temporal attributes unpacked by prefilter
+//                     in addition generate structs to store the
+//                     temporal attributes unpacked by prefilter
+//                     compute & provide interface for per-interface
+//                     record extraction properties
        
        map<string, vector<stream_query *> >::iterator ssqi;
        for(ssqi=lfta_mach_lists.begin(); ssqi!=lfta_mach_lists.end(); ++ssqi){
@@ -2655,10 +2663,13 @@ for(ssi_el=extra_external_libs.begin();ssi_el!=extra_external_libs.end();++ssi_e
                        lfta_prefilter_val[lmach] += "#define PREFILTER_DEFINED 1;\n\n";
 #endif
                map<string, vector<long long int> > lfta_sigs; // used again later
+               map<string, int> lfta_snap_pos; // optimize csv parsing
+                                                                       // compute now, use in get_iface_properties
                for(auto mvsi=lfta_iface_lists.begin(); mvsi!=lfta_iface_lists.end(); ++mvsi){
                        string liface = (*mvsi).first;
                        vector<long long int> empty_list;
                        lfta_sigs[liface] = empty_list;
+                       lfta_snap_pos[liface] = -1;
 
                        vector<col_id_set> lfta_cols;
                        vector<int> lfta_snap_length;
@@ -2672,7 +2683,10 @@ for(ssi_el=extra_external_libs.begin();ssi_el!=extra_external_libs.end();++ssi_e
                                }
                                lfta_sigs[liface].push_back(mask);
                                lfta_cols.push_back(lfta_iface_lists[liface][li]->query_plan[0]->get_colrefs(true,Schema));
-                               lfta_snap_length.push_back(compute_snap_len(lfta_iface_lists[liface][li]->query_plan[0], Schema));
+                               lfta_snap_length.push_back(compute_snap_len(lfta_iface_lists[liface][li]->query_plan[0], Schema, "snap"));
+                               int this_snap_pos = compute_snap_len(lfta_iface_lists[liface][li]->query_plan[0], Schema, "index");
+                               if(this_snap_pos > lfta_snap_pos[liface])
+                                       lfta_snap_pos[liface]  = this_snap_pos;
                        }
 
 //for(li=0;li<mach_lftas.size();++li){
@@ -2749,6 +2763,8 @@ for(ssi_el=extra_external_libs.begin();ssi_el!=extra_external_libs.end();++ssi_e
                                }
                                lfta_val[lmach] += "\";\n";
                        }
+                       lfta_val[lmach] += "\t\t}else if(!strcmp(property_name, \"_max_csv_pos\")){\n";
+                       lfta_val[lmach] += "\t\t\treturn \""+int_to_string(lfta_snap_pos[(*sir)])+"\";\n";
                        lfta_val[lmach] += "\t\t} else\n";
                        lfta_val[lmach] += "\t\t\treturn NULL;\n";
                }
@@ -3079,6 +3095,7 @@ void generate_makefile(vector<string> &input_file_names, int nfiles,
        bool use_proto = false;
        bool use_bsa = false;
        bool use_kafka = false;
+       bool use_ssl = false;   
        int erri;
        string err_str;
        for(ssi=ifaces.begin();ssi!=ifaces.end();++ssi){
@@ -3116,6 +3133,17 @@ void generate_makefile(vector<string> &input_file_names, int nfiles,
 #endif 
                        }
                }
+               ift = ifdb->get_iface_vals(ifmachines[ifnm],ifnm, "ENCRYPTED", erri, err_str);
+               for(int ift_i=0;ift_i<ift.size();ift_i++){
+                       if(ift[ift_i] == "TRUE" || ift[ift_i] == "True" || ift[ift_i] == "true"){       
+#ifdef SSL_ENABLED                             
+                               use_ssl = true;
+#else
+                               fprintf(stderr,"Runtime libraries built without SSL support. Rebuild with SSL_ENABLED defined in gsoptions.h\n");
+                               exit(0);
+#endif 
+                       }
+               }               
        }
 
        fprintf(outfl,
@@ -3136,7 +3164,7 @@ void generate_makefile(vector<string> &input_file_names, int nfiles,
        if(use_pads)
                fprintf(outfl,"-lgscppads -lpads ");
        fprintf(outfl,
-"-lgscprts -lgscphost -lm -lgscpaux -lgscplftaaux  -lclearinghouse -lresolv -lpthread -lgscpinterface -lz");
+"-lgscprts -lgscphost -lm -lgscpaux -lgscplftaaux  -lclearinghouse -lresolv -lpthread -lgscpinterface -lz -lrt");
        if(use_pads)
                fprintf(outfl, " -lpz -lz -lbz ");
        if(libz_exists && libast_exists)
@@ -3152,6 +3180,9 @@ void generate_makefile(vector<string> &input_file_names, int nfiles,
 #endif
 #ifdef KAFKA_ENABLED   
        fprintf(outfl, " -lrdkafka ");
+#endif
+#ifdef SSL_ENABLED     
+       fprintf(outfl, " -lssl -lcrypto ");
 #endif
        fprintf(outfl," -lgscpaux");
 #ifdef GCOV