[PROTO] Merge swap_draft <- tizen_2.2 as generic commit

[platform/core/system/swap-probe.git] / helper / libdaprobe.c

diff --git a/helper/libdaprobe.c b/helper/libdaprobe.c
index a9f131e..e4ba315 100755 (executable)
--- a/helper/libdaprobe.c
+++ b/helper/libdaprobe.c
@@ -670,22 +670,24 @@ int preBlockBegin(void* caller, bool bFiltering, enum DaOptions option)
                }
        }
 
-       if((!user) && bFiltering)
+       if(user)
        {
-               TRACE_STATE_UNSET(TS_ENTER_PROBE_BLOCK);
-               return 0;
+               gProbeDepth++;
+               return 2;       // user call
        }
        else
        {
-               // nothing to do
+               if(bFiltering)
+               {
+                       TRACE_STATE_UNSET(TS_ENTER_PROBE_BLOCK);
+                       return 0;       // not probing
+               }
+               else
+               {
+                       gProbeDepth++;
+                       return 1;       // internal call
+               }
        }
-
-       gProbeDepth++;
-
-       if(user)
-               return 2;       // user call
-       else
-               return 1;       // internal call
 }
 
 int postBlockBegin(int preresult)