3 files changed, 6 insertions, 46 deletions
diff --git a/runtime/probes/agg/count1.c b/runtime/probes/agg/count1.c
index 4b0ba1bf..6bf2c39e 100644
--- a/runtime/probes/agg/count1.c
+++ b/runtime/probes/agg/count1.c
@@ -70,21 +70,15 @@ static struct kprobe stp_probes[] = {
 
 #define MAX_STP_ROUTINE (sizeof(stp_probes)/sizeof(struct kprobe))
 
-int init_module(void)
+int probe_start(void)
 {
-  int ret;
-  
-  TRANSPORT_OPEN;
-
   opens = _stp_counter_init();
   reads = _stp_counter_init();
   writes = _stp_counter_init();
   sched = _stp_counter_init();
   idle = _stp_counter_init();
 
-  ret = _stp_register_kprobes (stp_probes, MAX_STP_ROUTINE);
-
-  return ret;
+  return _stp_register_kprobes (stp_probes, MAX_STP_ROUTINE);
 }
 
 static void probe_exit (void)
@@ -106,10 +100,3 @@ static void probe_exit (void)
   _stp_print_flush();
 }
 
-void cleanup_module(void)
-{
-  _stp_transport_close();
-}
-
-MODULE_LICENSE("GPL");
-
diff --git a/runtime/probes/agg/count2.c b/runtime/probes/agg/count2.c
index ea75f4bd..f53a0906 100644
--- a/runtime/probes/agg/count2.c
+++ b/runtime/probes/agg/count2.c
@@ -54,21 +54,15 @@ static struct jprobe stp_probes[] = {
 
 #define MAX_STP_ROUTINE (sizeof(stp_probes)/sizeof(struct jprobe))
 
-int init_module(void)
+int probe_start(void)
 {
-  int ret;
-  
-  TRANSPORT_OPEN;
-
   opens = _stp_counter_init();
   reads = _stp_counter_init();
   writes = _stp_counter_init();
   read_bytes = _stp_counter_init();
   write_bytes = _stp_counter_init();
 
-  ret = _stp_register_jprobes (stp_probes, MAX_STP_ROUTINE);
-
-  return ret;
+  return _stp_register_jprobes (stp_probes, MAX_STP_ROUTINE);
 }
 
 static void probe_exit (void)
@@ -85,11 +79,3 @@ static void probe_exit (void)
   
   _stp_print_flush();
 }
-
-void cleanup_module(void)
-{
-  _stp_transport_close();
-}
-
-MODULE_LICENSE("GPL");
-
diff --git a/runtime/probes/agg/stat1.c b/runtime/probes/agg/stat1.c
index 54e22db5..ad6781e8 100644
--- a/runtime/probes/agg/stat1.c
+++ b/runtime/probes/agg/stat1.c
@@ -51,18 +51,13 @@ static struct jprobe stp_probes[] = {
 
 #define MAX_STP_ROUTINE (sizeof(stp_probes)/sizeof(struct jprobe))
 
-int init_module(void)
+int probe_start(void)
 {
-  int ret;
-  
-  TRANSPORT_OPEN;
-
   opens = _stp_counter_init();
   reads = _stp_stat_init(HIST_LOG,24);
   writes = _stp_stat_init(HIST_LINEAR,0,1000,50);
 
-  ret = _stp_register_jprobes (stp_probes, MAX_STP_ROUTINE);
-  return ret;
+  return _stp_register_jprobes (stp_probes, MAX_STP_ROUTINE);
 }
 
 static void probe_exit (void)
@@ -75,11 +70,3 @@ static void probe_exit (void)
 
   _stp_print_flush();
 }
-
-void cleanup_module(void)
-{
-  _stp_transport_close();
-}
-
-MODULE_LICENSE("GPL");
-