Fixes for new api (imports) and other ARTist upstream changes

Co-authored-by: Parthipan Ramesh <[email protected]>

Author: schrnz

Manifest.json

@@ -1,8 +1,8 @@
 {
   "manifest_version": 1,
-  "package_name": "saarland.cispa.artist.module.trace",
+  "package_name": "saarland.cispa.artist.modules.trace",
   "name": "Trace Module",
-  "description": "This module logs all called methods.",
+  "description": "This module logs the names of all called methods to logcat. ",
   "author": "Sebastian Weisgerber <[email protected]>, Oliver Schranz <[email protected]>, Parthipan Ramesh <[email protected]>",
   "version": 1
 }

codelib.apk

@@ -25,7 +25,7 @@
 
 #include <string>
 #include <unordered_set>
-#include <artist/env/codelib.h>
+#include <artist/api/modules/codelib.h>
 
 using std::string;
 using std::unordered_set;

src/codelib.h

@@ -22,15 +22,9 @@
 
 #include <atomic>
 
-#include <artist/artist_log.h>
-#include <artist/injection/injection_visitor.h>
-#include <artist/env/java_env.h>
-#include <artist/injection/primitives.h>
-#include <artist/injection/boolean.h>
-#include <artist/injection/integer.h>
-#include <artist/injection/float.h>
-#include <artist/verbose_printer.h>
-#include <artist/injection/char.h>
+#include <artist/api/io/artist_log.h>
+#include <artist/api/env/java_env.h>
+#include <artist/api/injection/primitives.h>
 
 #include "instrumentation_pass.h"
 #include "codelib.h"
@@ -44,21 +38,18 @@ using std::sort;
 
 using art::Target;
 using art::Parameter;
-using art::Char;
 using art::InjectionTarget ;
 
-vector<Injection> HTraceArtist::ProvideInjections() const {
+vector<shared_ptr<const Injection>> HTraceArtist::ProvideInjections() const {
   vector<shared_ptr<const Parameter>> params;
-  auto param = make_shared<const Char>();
-  params.push_back(param);
 
-  vector<const Target> targets;
-  const Target target(Target::GENERIC_TARGET, InjectionTarget::METHOD_END);
+  vector<shared_ptr<const Target>> targets;
+  auto target = make_shared<const Target>(Target::GENERIC_TARGET, InjectionTarget::METHOD_END);
   targets.push_back(target);
 
-  Injection injection(TraceCodeLib::TRACELOG, params, targets);
+  auto injection = make_shared<const Injection>(TraceCodeLib::TRACELOG, params, targets);
 
-  vector<Injection> results;
+  vector<shared_ptr<const Injection>> results;
   results.push_back(injection);
   return results;
 }

src/instrumentation_pass.cc

@@ -23,14 +23,14 @@
 #ifndef ART_MODULES_TRACE_TRACE_ARTIST_H_
 #define ART_MODULES_TRACE_TRACE_ARTIST_H_
 
-#include <artist/injection/universal_artist.h>
+#include <artist/api/injection/injection_artist.h>
 
-using art::HUniversalArtist;
+using art::HInjectionArtist;
 using art::MethodInfo;
 using art::OptimizingCompilerStats;
 using art::Injection;
 
-class HTraceArtist : public HUniversalArtist {
+class HTraceArtist : public HInjectionArtist {
  public:
   explicit HTraceArtist(
       const MethodInfo& method_info,
@@ -39,7 +39,7 @@ class HTraceArtist : public HUniversalArtist {
 #endif
       const char* pass_name = "TraceArtist"
       , OptimizingCompilerStats* stats = nullptr)
-      : HUniversalArtist(method_info
+      : HInjectionArtist(method_info
 #ifdef BUILD_MARSHMALLOW
       , is_in_ssa_form
 #endif
@@ -48,7 +48,7 @@ class HTraceArtist : public HUniversalArtist {
     // Nothing
   }
 
-  vector<Injection> ProvideInjections() const OVERRIDE;
+  vector<shared_ptr<const Injection>> ProvideInjections() const OVERRIDE;
 };
 
 #endif  // ART_MODULES_TRACE_TRACE_ARTIST_H_

src/instrumentation_pass.h

@@ -19,7 +19,7 @@
  *
  */
 
-#include <artist/filtering/method_name_filters.h>
+#include <artist/api/filtering/method_name_filters.h>
 
 #include "module.h"
 #include "instrumentation_pass.h"
@@ -28,22 +28,35 @@
 using std::make_shared;
 using std::unique_ptr;
 
-shared_ptr <HArtist> TraceModule::createPass(const MethodInfo &method_info) const {
-    return make_shared<HTraceArtist>(method_info);
+using art::MethodNameBlacklist;
+using art::FilesystemHelper;
+
+
+HArtist *TraceModule::createPass(const MethodInfo &method_info) const {
+  return new(method_info.GetGraph()->GetArena()) HTraceArtist(method_info);
 }
 
 shared_ptr<const CodeLib> TraceModule::createCodeLib() const {
-    return make_shared<TraceCodeLib>();
+  return make_shared<TraceCodeLib>();
 }
 
 // skip android support lib ui methods since they bloat up the log
-unique_ptr <Filter> TraceModule::getMethodFilter() const {
-    const vector<const string> ui = {"android.support."};
-    return unique_ptr<Filter>(new art::BlacklistFilter(ui));
+unique_ptr<Filter> TraceModule::getMethodFilter() const {
+  const vector<const string> blackListDefinition = {
+      "android.support.",
+  };
+  return unique_ptr<Filter>(new MethodNameBlacklist(blackListDefinition));
 }
 
-// the class factories
+TraceModule::TraceModule(shared_ptr<const FilesystemHelper> fs) : Module(fs) {}
+
 
-extern "C" shared_ptr <art::Module> create() {
-    return make_shared<TraceModule>();
+// the class factory
+
+extern "C" shared_ptr <art::Module> create(shared_ptr<const FilesystemHelper> fshelper) {
+  return make_shared<TraceModule>(fshelper);
 }
+
+extern "C" art::ModuleId get_id() {
+  return "saarland.cispa.artist.modules.trace";
+}

src/module.cc

@@ -22,19 +22,21 @@
 #ifndef  ART_MODULES_TRACE_TRACE_MODULE_H_
 #define  ART_MODULES_TRACE_TRACE_MODULE_H_
 
-#include <artist/modules/module.h>
+#include <artist/api/modules/module.h>
 
 using art::Module;
 using art::HArtist;
 using art::MethodInfo;
 using art::CodeLib;
 using art::Filter;
+using art::FilesystemHelper;
 
 class TraceModule : public Module {
-    shared_ptr<HArtist> createPass(const MethodInfo& method_info) const OVERRIDE;
-    shared_ptr<const CodeLib> createCodeLib() const OVERRIDE;
+  HArtist* createPass(const MethodInfo& method_info) const OVERRIDE;
+  shared_ptr<const CodeLib> createCodeLib() const OVERRIDE;
 
- public:
+public:
+  explicit TraceModule(shared_ptr<const FilesystemHelper> fs);
   unique_ptr<Filter> getMethodFilter() const OVERRIDE;
 };