[REFACTOR] redesign and rename detach_selected_probes()

detach_selected_probes() --> unset_kernel_probes()

diff --git a/driver/ec.c b/driver/ec.c
index 8bd2238..54470e1 100644 (file)
--- a/driver/ec.c
+++ b/driver/ec.c
@@ -204,7 +204,7 @@ int ec_user_attach (void)
                // FIXME: SAFETY CHECK
                if (result)
                {               // return to safe state
-                       detach_selected_probes ();
+                       unset_kernel_probes();
 
                        spin_lock_irqsave (&ec_spinlock, spinlock_flags);       // make other CPUs wait
                        ec_info.ec_state = EC_STATE_IDLE;
@@ -249,7 +249,7 @@ int ec_user_activate (void)
                // FIXME: SAFETY CHECK
                if (result)
                {               // return to safe state
-                       detach_selected_probes ();
+                       unset_kernel_probes();
 
                        spin_lock_irqsave (&ec_spinlock, spinlock_flags);       // make other CPUs wait
                        ec_info.ec_state = EC_STATE_IDLE;
@@ -293,7 +293,7 @@ int ec_user_stop (void)
                spin_unlock_irqrestore (&ec_spinlock, spinlock_flags);  // open our data for other CPUs
 
                ret = deinst_usr_space_proc ();
-               result = detach_selected_probes ();
+               result = unset_kernel_probes();
                if (result == 0)
                        result = ret;
 

diff --git a/driver/probes_manager.c b/driver/probes_manager.c
index 2d7d050..5ef0954 100644 (file)
--- a/driver/probes_manager.c
+++ b/driver/probes_manager.c
@@ -40,7 +40,7 @@ probes_manager_init (void)
 void
 probes_manager_down (void)
 {
-       detach_selected_probes ();
+       unset_kernel_probes();
        uninit_helper();
        storage_down ();
 }
@@ -88,7 +88,7 @@ int set_kernel_probes(void)
                if (ret) {
                        /* return into safe state */
                        /* FIXME: unset for installed probes */
-                       detach_selected_probes();
+                       unset_kernel_probes();
                        break;
                }
        }
@@ -96,14 +96,13 @@ int set_kernel_probes(void)
        return ret;
 }
 
-int
-detach_selected_probes (void)
+int unset_kernel_probes(void)
 {
        kernel_probe_t *p;
        struct hlist_node *node;
 
-       swap_hlist_for_each_entry_rcu (p, node, &kernel_probes, hlist)
-               unregister_kernel_probe (p);
+       swap_hlist_for_each_entry_rcu(p, node, &kernel_probes, hlist)
+               unregister_kernel_probe(p);
 
        return 0;
 }

diff --git a/driver/probes_manager.h b/driver/probes_manager.h
index f0dd482..e58b918 100644 (file)
--- a/driver/probes_manager.h
+++ b/driver/probes_manager.h
@@ -36,7 +36,7 @@ extern int reset_probes(void);
 extern int remove_probe (unsigned long addr);
 
 int set_kernel_probes(void);
-extern int detach_selected_probes(void);
+int unset_kernel_probes(void);
 
 extern unsigned long def_jprobe_event_pre_handler (kernel_probe_t * probe, struct pt_regs *regs);
 extern void def_jprobe_event_handler (unsigned long arg1, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5, unsigned long arg6);

diff --git a/driver/storage.c b/driver/storage.c
index 602844d..bacb0b7 100644 (file)
--- a/driver/storage.c
+++ b/driver/storage.c
@@ -339,7 +339,7 @@ int SetBufferSize(unsigned int nSize) {
                EPRINTF("Invalid buffer size!");
                return -1;
        }
-       detach_selected_probes ();
+       unset_kernel_probes();
        if(UninitializeBuffer() == -1)
                EPRINTF("Cannot uninitialize buffer!");
        if(InitializeBuffer(nSize) == -1) {
@@ -375,7 +375,7 @@ int ResetBuffer(void) {
 
        ResetSingleBuffer();
 
-       detach_selected_probes ();
+       unset_kernel_probes();
 
        spin_lock_irqsave (&ec_spinlock, spinlock_flags);
        ec_info.buffer_effect = ec_info.buffer_size;