Re: [ECOS] New memory allocation debug feature

["Øyvind Harboe" <oyvind.harboe@zylin.com>]

[-- Attachment #1: Type: text/plain, Size: 849 bytes --]

Quoting Andrew Lunn <andrew@lunn.ch>:

> > > You also need to provide an implementation in libtarget.a for when the
> > > application does not have such a function. eg all the test programs
> > > will not provide this function, so will fail to link when your new
> > > option is enabled. So please add a week function which does nothing,
> > > or maybe throws an CYG_FAIL().
> > 
> > Hmmm... Can this be done without adding a new source file? 
> 
> Can you declare a function using C calling convention in a C++ file? I
> don't know, im a C programmer. If you can, i suggest you add it to the
> end of malloc.cxx

I found it easiest to just add a new debug.cxx file.

New patch attached.

> > You should try emacs. 

I use emacs all the time, but from different computers, so I find that I don't 
want to spend the time configuring it.




Øyvind


[-- Attachment #2: memdebug.txt --]
[-- Type: text/plain, Size: 10303 bytes --]

Index: common/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/memalloc/common/current/ChangeLog,v
retrieving revision 1.30
diff -w -u -r1.30 ChangeLog
--- common/current/ChangeLog	15 Mar 2004 15:42:04 -0000	1.30
+++ common/current/ChangeLog	18 Jun 2004 15:01:06 -0000
@@ -1,3 +1,8 @@
+2004-06-17  Oyvind Harboe  <oyvind.harboe@zylin.com>
+
+	* Added cyg_memalloc_alloc_fail() fn which is invoked before return NULL
+	from failed allocations. Useful breakpoint site.
+
 2004-02-15  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* include/kapi.h: Add throw specifications throughout.
Index: common/current/cdl/memalloc.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/memalloc/common/current/cdl/memalloc.cdl,v
retrieving revision 1.12
diff -w -u -r1.12 memalloc.cdl
--- common/current/cdl/memalloc.cdl	6 Oct 2003 16:41:07 -0000	1.12
+++ common/current/cdl/memalloc.cdl	18 Jun 2004 15:01:06 -0000
@@ -56,7 +56,7 @@
         interface. It also contains some sample implementations."
     include_dir   cyg/memalloc
     compile       dlmalloc.cxx memfixed.cxx memvar.cxx \
-                  sepmeta.cxx
+                  sepmeta.cxx debug.cxx
 
 # ====================================================================
 
@@ -239,6 +239,14 @@
             forces a NULL pointer to be returned."
     }       
 
+    cdl_option CYGSEM_MEMALLOC_INVOKE_OUTOFMEMORY {
+        display       "invoke user supplied cyg_memalloc_alloc_fail() function when running out of memory"
+        default_value 0
+        description   "
+            Whenever the system runs out of memory, it invokes this function before either
+	    going to sleep(waiting for memory to become available) or returning failure."
+    }       
+
     cdl_component CYGPKG_MEMALLOC_MALLOC_ALLOCATORS {
         display      "malloc() and supporting allocators"
         flavor        bool
Index: common/current/include/common.hxx
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/memalloc/common/current/include/common.hxx,v
retrieving revision 1.3
diff -w -u -r1.3 common.hxx
--- common/current/include/common.hxx	23 May 2002 23:08:43 -0000	1.3
+++ common/current/include/common.hxx	18 Jun 2004 15:01:14 -0000
@@ -131,5 +131,14 @@
 typedef cyg_uint16 cyg_mempool_status_flag_t;
 
 
+#if CYGSEM_MEMALLOC_INVOKE_OUTOFMEMORY
+// breakpoint site for out of memory conditions
+__externC void cyg_memalloc_alloc_fail();
+#else
+// this will compile away to nothing with optimisations turned on.
+inline void cyg_memalloc_alloc_fail() {
+}
+#endif
+
 #endif /* ifndef CYGONCE_MEMALLOC_COMMON_HXX */
 /* EOF common.hxx */
Index: common/current/include/memjoin.inl
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/memalloc/common/current/include/memjoin.inl,v
retrieving revision 1.6
diff -w -u -r1.6 memjoin.inl
--- common/current/include/memjoin.inl	5 Feb 2003 01:10:12 -0000	1.6
+++ common/current/include/memjoin.inl	18 Jun 2004 15:01:15 -0000
@@ -178,6 +178,10 @@
     }
 
     CYG_REPORT_RETVAL( ptr );
+
+    if (ptr==NULL) {
+	cyg_memalloc_alloc_fail();
+    }
     return ptr;
 } // Cyg_Mempool_Joined<T>::try_alloc()
 
@@ -214,6 +218,7 @@
     ret = pool->resize_alloc( alloc_ptr, newsize, oldsize );
 
     CYG_REPORT_RETVAL( ret );
+
     return ret;    
 } // Cyg_Mempool_Joined<T>::resize_alloc()
 
Index: common/current/include/mempolt2.inl
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/memalloc/common/current/include/mempolt2.inl,v
retrieving revision 1.3
diff -w -u -r1.3 mempolt2.inl
--- common/current/include/mempolt2.inl	23 May 2002 23:08:43 -0000	1.3
+++ common/current/include/mempolt2.inl	18 Jun 2004 15:01:15 -0000
@@ -116,6 +116,8 @@
 
     Mempolt2WaitInfo waitinfo( size );
 
+    cyg_memalloc_alloc_fail();
+
     self->set_wait_info( (CYG_ADDRWORD)&waitinfo );
     self->set_sleep_reason( Cyg_Thread::WAIT );
     self->sleep();
@@ -187,6 +189,9 @@
     // straight to unlock.
     
     if( Cyg_Thread::NONE == self->get_wake_reason() ) {
+
+	cyg_memalloc_alloc_fail();
+
         self->set_wait_info( (CYG_ADDRWORD)&waitinfo );
         self->sleep();
         queue.enqueue( self );
@@ -251,6 +256,11 @@
 
     // Unlock the scheduler and maybe switch threads
     Cyg_Scheduler::unlock();
+  
+    if (ret==NULL) {
+	cyg_memalloc_alloc_fail();
+    }
+
     return ret;
 }
     
@@ -283,6 +293,11 @@
 
     // Unlock the scheduler and maybe switch threads
     Cyg_Scheduler::unlock();
+
+    if (ret==NULL) {
+	cyg_memalloc_alloc_fail();
+    }
+
     return ret;
 }
     
Index: common/current/include/mempoolt.inl
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/memalloc/common/current/include/mempoolt.inl,v
retrieving revision 1.3
diff -w -u -r1.3 mempoolt.inl
--- common/current/include/mempoolt.inl	23 May 2002 23:08:43 -0000	1.3
+++ common/current/include/mempoolt.inl	18 Jun 2004 15:01:16 -0000
@@ -111,6 +111,9 @@
     cyg_uint8 *ret;
     cyg_bool result = true;
     while( result && (NULL == (ret = pool.alloc( size ))) ) {
+
+	cyg_memalloc_alloc_fail();
+
         self->set_sleep_reason( Cyg_Thread::WAIT );
         self->sleep();
         queue.enqueue( self );
@@ -182,6 +185,8 @@
         result = false;
             
     while( result && (NULL == (ret = pool.alloc( size ))) ) {
+	cyg_memalloc_alloc_fail();
+
         self->set_sleep_reason( Cyg_Thread::TIMEOUT );
         self->sleep();
         queue.enqueue( self );
@@ -248,6 +253,10 @@
     // Unlock the scheduler and maybe switch threads
     Cyg_Scheduler::unlock();
     CYG_REPORT_RETVAL( ret );
+
+    if (ret==NULL) {
+	cyg_memalloc_alloc_fail();
+    }
     return ret;
 }
     
Index: common/current/include/mfiximpl.inl
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/memalloc/common/current/include/mfiximpl.inl,v
retrieving revision 1.3
diff -w -u -r1.3 mfiximpl.inl
--- common/current/include/mfiximpl.inl	23 May 2002 23:08:44 -0000	1.3
+++ common/current/include/mfiximpl.inl	18 Jun 2004 15:01:16 -0000
@@ -122,8 +122,10 @@
 {
     // size parameter is not used
     CYG_UNUSED_PARAM( cyg_int32, size );
-    if ( 0 >= freeblocks )
+    if ( 0 >= freeblocks ) {
+	cyg_memalloc_alloc_fail();
         return NULL;
+    }
     cyg_int32 i = firstfree;
     cyg_uint8 *p = NULL;
     do {
@@ -172,8 +174,10 @@
 
     if (newsize == blocksize)
         return alloc_ptr;
-    else
+    else {
+	cyg_memalloc_alloc_fail();
         return NULL;
+    }
 } // resize_alloc()
 
 
Index: common/current/include/mvarimpl.inl
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/memalloc/common/current/include/mvarimpl.inl,v
retrieving revision 1.5
diff -w -u -r1.5 mvarimpl.inl
--- common/current/include/mvarimpl.inl	23 May 2002 23:08:44 -0000	1.5
+++ common/current/include/mvarimpl.inl	18 Jun 2004 15:01:16 -0000
@@ -275,6 +275,9 @@
     cyg_uint8 *ptr = memdq2alloc( dq );
     CYG_ASSERT( ((CYG_ADDRESS)ptr & (alignment-1)) == 0,
                 "returned memory not aligned" );
+    if (ptr==NULL) {
+    	cyg_memalloc_alloc_fail();
+    }
     return ptr;
 }
 
@@ -358,6 +361,9 @@
         ret = alloc_ptr;
     }
         
+    if (ret==NULL) {
+	cyg_memalloc_alloc_fail();
+    }
     return ret;
 
 } // resize_alloc()
Index: common/current/include/sepmetaimpl.inl
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/memalloc/common/current/include/sepmetaimpl.inl,v
retrieving revision 1.4
diff -w -u -r1.4 sepmetaimpl.inl
--- common/current/include/sepmetaimpl.inl	23 May 2002 23:08:44 -0000	1.4
+++ common/current/include/sepmetaimpl.inl	18 Jun 2004 15:01:17 -0000
@@ -374,8 +374,10 @@
     size = (size + alignment - 1) & -alignment;
 
     struct memdq *dq = find_free_dq( size );
-    if (NULL == dq)
+    if (NULL == dq) {	
+	cyg_memalloc_alloc_fail();
         return NULL;
+    }
 
     cyg_int32 dqsize = dq->memnext->mem - dq->mem;
 
@@ -399,8 +401,11 @@
 
         // first get a memdq
 
-        if ( NULL == freemetahead ) // out of metadata. 
+        if ( NULL == freemetahead ) {
+ 	    // out of metadata. 
+	    cyg_memalloc_alloc_fail();
             return NULL;
+	}
 
         // FIXME: since we don't search all the way for an exact fit
         // first we may be able to find an exact fit later and therefore
@@ -496,7 +501,10 @@
             prevmemsize = dq->mem - dq->memprev->mem;
         }
         if (nextmemsize + prevmemsize + currsize < newsize)
+	{
+  	    cyg_memalloc_alloc_fail();
             return NULL; // can't fit it
+	}
 
         // expand forwards
         if ( nextmemsize != 0 ) {
@@ -560,8 +568,10 @@
         } else {
             // if its already allocated we need to create a new free list
             // entry
-            if (NULL == freemetahead)
+            if (NULL == freemetahead) {
+		cyg_memalloc_alloc_fail();
                 return NULL;  // can't do it
+	    }
 
             struct memdq *fdq = freemetahead;
             freemetahead = fdq->next;
Index: common/current/src/dlmalloc.cxx
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/memalloc/common/current/src/dlmalloc.cxx,v
retrieving revision 1.8
diff -w -u -r1.8 dlmalloc.cxx
--- common/current/src/dlmalloc.cxx	6 Oct 2003 18:25:57 -0000	1.8
+++ common/current/src/dlmalloc.cxx	18 Jun 2004 15:01:18 -0000
@@ -217,6 +217,8 @@
 #include <cyg/memalloc/dlmalloc.hxx>
 //#include <cyg/infra/diag.h>
 
+
+
 /*
     Debugging:
 
@@ -1273,6 +1275,7 @@
       //diag_printf("chunksize(top)=%ld, nb=%d, remainder=%ld\n", chunksize(top),
       //            nb, remainder_size);
       MALLOC_UNLOCK;
+      cyg_memalloc_alloc_fail();
       return NULL; /* propagate failure */
   }
 
@@ -1558,6 +1561,7 @@
 
     // couldn't resize the allocation any direction, so return failure
     MALLOC_UNLOCK;
+    cyg_memalloc_alloc_fail();
     return NULL;
   }
 

[-- Attachment #3: debug.cxx --]
[-- Type: text/plain, Size: 2842 bytes --]

//========================================================================
//
//      debug.cxx
//
//      default implementation of out of memory debug breakpoint site
//
//========================================================================
//####ECOSGPLCOPYRIGHTBEGIN####
// -------------------------------------------
// This file is part of eCos, the Embedded Configurable Operating System.
// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
//
// eCos is free software; you can redistribute it and/or modify it under
// the terms of the GNU General Public License as published by the Free
// Software Foundation; either version 2 or (at your option) any later version.
//
// eCos is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
// for more details.
//
// You should have received a copy of the GNU General Public License along
// with eCos; if not, write to the Free Software Foundation, Inc.,
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
//
// As a special exception, if other files instantiate templates or use macros
// or inline functions from this file, or you compile this file and link it
// with other works to produce a work based on this file, this file does not
// by itself cause the resulting work to be covered by the GNU General Public
// License. However the source code for this file must still be made available
// in accordance with section (3) of the GNU General Public License.
//
// This exception does not invalidate any other reasons why a work based on
// this file might be covered by the GNU General Public License.
//
// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
// at http://sources.redhat.com/ecos/ecos-license/
// -------------------------------------------
//####ECOSGPLCOPYRIGHTEND####
//========================================================================
//#####DESCRIPTIONBEGIN####
//
// Author(s):     oyvind
// Contributors:  
// Date:          2000-06-17
// Purpose:       
// Description:   Memory usage debugging
// Usage:       
//
//####DESCRIPTIONEND####
//
//========================================================================

// CONFIGURATION

#include <pkgconf/memalloc.h>   // Configuration header

#include <cyg/infra/cyg_type.h>    // Common type definitions and support
#include <cyg/infra/cyg_trac.h>    // Common tracing support
#include <cyg/infra/cyg_ass.h>     // Common assertion support
#include <string.h>                // For memset() and memmove()
#include <stdlib.h>                // header for this file

#if CYGSEM_MEMALLOC_INVOKE_OUTOFMEMORY
__externC void cyg_memalloc_alloc_fail()
{
  // handy breakpoint site.
}
#endif

// EOF debug.cxx

[-- Attachment #4: Type: text/plain, Size: 148 bytes --]

-- 
Before posting, please read the FAQ: http://ecos.sourceware.org/fom/ecos
and search the list archive: http://ecos.sourceware.org/ml/ecos-discuss