[NUI] clean up debugging logs

diff --git a/src/Tizen.NUI/src/internal/Common/Disposable.cs b/src/Tizen.NUI/src/internal/Common/Disposable.cs
index 9388d9a..a0a8720 100644 (file)
--- a/src/Tizen.NUI/src/internal/Common/Disposable.cs
+++ b/src/Tizen.NUI/src/internal/Common/Disposable.cs
@@ -117,16 +117,7 @@ namespace Tizen.NUI
                         $" process:{process} thread:{thread}, disposing:{disposing}, isDisposed:{this.disposed}, isDisposeQueued:{this.isDisposeQueued}, me:{me}\n");
                 }
 
-                if (isDisposeQueued)
-                {
-                    Tizen.Log.Fatal("NUI", $"[Disposable]should not be here! (dead code) this will be removed!");
-                    throw new global::System.Exception($"[NUI] should not be here! (dead code) this will be removed!");
-                    Dispose(DisposeTypes.Implicit);
-                }
-                else
-                {
-                    Dispose(DisposeTypes.Explicit);
-                }
+                Dispose(DisposeTypes.Explicit);
             }
             else
             {

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
index 6a90172..1d3d087 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
@@ -424,22 +424,6 @@ namespace Tizen.NUI.BaseComponents
         internal uint GetId()
         {
             uint ret = Interop.Actor.GetId(SwigCPtr);
-
-            //this is temporary debugging code. will be removed in 2 weeks
-            {
-                int minusOne = -1;
-                uint errorRet = (uint)minusOne;
-                if (ret == errorRet || SwigCPtr.Handle == IntPtr.Zero)
-                {
-                    var process = global::System.Diagnostics.Process.GetCurrentProcess().Id;
-                    var thread = global::System.Threading.Thread.CurrentThread.ManagedThreadId;
-                    var me = this.GetType().FullName;
-
-                    Log.Fatal("NUI", $"Error! GetId error OR swigCPtr.Handle == IntPtr.Zero ! please check! \n" +
-                        $" process:{process} thread:{thread}, isDisposed:{this.Disposed}, isDisposeQueued:{this.IsDisposeQueued}, me:{me}\n");
-                }
-            }
-
             if (NDalicPINVOKE.SWIGPendingException.Pending)
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -1180,6 +1164,11 @@ namespace Tizen.NUI.BaseComponents
         [EditorBrowsable(EditorBrowsableState.Never)]
         protected override void ReleaseSwigCPtr(System.Runtime.InteropServices.HandleRef swigCPtr)
         {
+            if (swigCMemOwn)
+            {
+                var me = this.GetType().FullName;
+                Tizen.Log.Error("NUI", $"[ERROR] View.ReleaseSwigCPtr() is called outside of BaseHandle.Dispose(type)! me:{me}\n");
+            }
             Interop.View.DeleteView(swigCPtr);
         }
 

diff --git a/src/Tizen.NUI/src/public/Common/BaseHandle.cs b/src/Tizen.NUI/src/public/Common/BaseHandle.cs
index 904d0a5..0b594fe 100644 (file)
--- a/src/Tizen.NUI/src/public/Common/BaseHandle.cs
+++ b/src/Tizen.NUI/src/public/Common/BaseHandle.cs
@@ -338,16 +338,7 @@ namespace Tizen.NUI
                         $" process:{process} thread:{thread}, disposing:{disposing}, isDisposed:{this.disposed}, isDisposeQueued:{this.isDisposeQueued}, me:{me}\n");
                 }
 
-                if (isDisposeQueued)
-                {
-                    Tizen.Log.Fatal("NUI", $"should not be here! (dead code) this will be removed!");
-                    throw new global::System.Exception($"[NUI] should not be here! (dead code) this will be removed!");
-                    Dispose(DisposeTypes.Implicit);
-                }
-                else
-                {
-                    Dispose(DisposeTypes.Explicit);
-                }
+                Dispose(DisposeTypes.Explicit);
             }
             else
             {
@@ -519,34 +510,6 @@ namespace Tizen.NUI
                 Registry.Unregister(this);
             }
 
-            // this is temporary test code. will be removed laster
-            {
-                if (swigCPtr.Handle != IntPtr.Zero && swigCPtrCopy.Handle != IntPtr.Zero)
-                {
-                    var process = global::System.Diagnostics.Process.GetCurrentProcess().Id;
-                    var thread = global::System.Threading.Thread.CurrentThread.ManagedThreadId;
-                    var me = this.GetType().FullName;
-                    var daliId = "unknown";
-                    var hash = this.GetType().GetHashCode();
-                    var name = "unknown";
-
-                    if (this is BaseComponents.View)
-                    {
-                        daliId = Interop.Actor.GetId(swigCPtrCopy).ToString();
-                        name = Interop.Actor.GetName(swigCPtrCopy);
-                        BaseObject tmp = new BaseObject(Interop.BaseHandle.GetBaseObject(swigCPtrCopy), false);
-                        var refCnt = tmp.ReferenceCount();
-                        tmp.Dispose();
-                        if (refCnt > 2)
-                        {
-                            Log.Error("NUI", $"[ERR] reference count is over than 2. Could be a memory leak. Need to check! \n" +
-                                $" process:{process} thread:{thread}, isDisposed:{this.disposed}, isDisposeQueued:{this.isDisposeQueued}, me:{me} \n" +
-                                $" disposeType:{type}, name:{name}, daliID:{daliId}, hash:{hash}, refCnt:{refCnt}");
-                        }
-                    }
-                }
-            }
-
             if (SwigCPtr.Handle != IntPtr.Zero)
             {
                 if (swigCMemOwn)
@@ -616,12 +579,8 @@ namespace Tizen.NUI
             {
                 if (swigCPtr.Handle == IntPtr.Zero)
                 {
-                    var process = global::System.Diagnostics.Process.GetCurrentProcess().Id;
-                    var thread = global::System.Threading.Thread.CurrentThread.ManagedThreadId;
                     var me = this.GetType().FullName;
-
-                    Log.Fatal("NUI", $"Error! swigCPtr.Handle == IntPtr.Zero ! please check! \n" +
-                        $" process:{process} thread:{thread}, isDisposed:{this.disposed}, isDisposeQueued:{this.isDisposeQueued}, me:{me}\n");
+                    Log.Fatal("NUI", $"Error! swigCPtr.Handle == IntPtr.Zero ! please check! me:{me}\n");
                 }
                 return swigCPtr;
             }