2007-07-08 William Cohen <wcohen@redhat.com>

	PR 4529
	* coveragedb.h (db_type): New enum for type column in coverage_element.
	(coverage_element): Remove removed column, change type to int.
	* coveragedb.cxx (has_table, has_index): New.
	(update_coverage_db): Use has_table, has_index.
	(enter_element): Change for new table format.
	(increment_element): Ditto.
	(sql_update_used_probes): Ditto.
	(sql_update_unused_probes): Ditto.
	(sql_update_used_functions): Ditto.
	(sql_update_unused_functions): Ditto.
	(sql_update_used_globals): Ditto.
	(sql_update_unused_globals): Ditto.
	(update_coverage_db): Ditto.
	(print_coverage_info(systemtap_session): Relocate vector.
	(sql_update_used_probes): Ditto.
	(sql_update_unused_probes): Ditto.

1 files changed, 14 insertions, 5 deletions

diff --git a/coveragedb.h b/coveragedb.h
index 5b62ba8b..ccf1911d 100644
--- a/coveragedb.h
+++ b/coveragedb.h
@@ -22,7 +22,8 @@ times executed
 
 if (compiled == 0) object never compiled
 if (compiled > 0) object compiled
-if (removed > 0) object parsed
+
+The following are not currently implemented.
 if (executed == 0) never executed
 if (executed > 0) executed
 
@@ -43,26 +44,34 @@ ratio of executed/total (overall, by file, by line)
 
 */
 
+enum db_type {
+  db_type_probe = 1,
+  db_type_function = 2,
+  db_type_local = 3,
+  db_type_global = 4,
+};
+
 class coverage_element {
 public:
   std::string file;
   int line;
   int col;
-  std::string type;
+  int type;
   std::string name;
   std::string parent;
   int compiled;
-  int removed;
   int executed;
 
   coverage_element() { line = 0; col = 0; 
-	  compiled = 0; removed = 0; executed = 0; }
+	  compiled = 0; executed = 0; }
 
   coverage_element(source_loc &place) {
 	  file = place.file; line = place.line; col = place.column; 
-	  compiled = 0; removed = 0; executed = 0; }
+	  compiled = 0; executed = 0; }
 };
 
+
+
 void print_coverage_info(systemtap_session &s);
 void update_coverage_db(systemtap_session &s);