# HG changeset patch # User jlarmour # Date 1079365324 0 # Node ID 40a7aad7873c4fd4a2aee9849554b56428bc8d16 # Parent 0071b7b58596498e4d4168444400a7927fe2d843 * include/kapi.h: Add throw specifications throughout. * src/kapi.cxx: Ditto. diff --git a/packages/services/memalloc/common/current/ChangeLog b/packages/services/memalloc/common/current/ChangeLog --- a/packages/services/memalloc/common/current/ChangeLog +++ b/packages/services/memalloc/common/current/ChangeLog @@ -1,3 +1,8 @@ +2004-02-15 Jonathan Larmour + + * include/kapi.h: Add throw specifications throughout. + * src/kapi.cxx: Ditto. + 2003-10-06 Andrew Lunn * src/dlmalloc.cxx (Cyg_Mempool_dlmalloc_Implementation): Fixed diff --git a/packages/services/memalloc/common/current/include/kapi.h b/packages/services/memalloc/common/current/include/kapi.h --- a/packages/services/memalloc/common/current/include/kapi.h +++ b/packages/services/memalloc/common/current/include/kapi.h @@ -83,16 +83,16 @@ void cyg_mempool_var_create( cyg_int32 size, /* size of memory in bytes */ cyg_handle_t *handle, /* returned handle of memory pool */ cyg_mempool_var *var /* space to put pool structure in */ - ); + ) __THROW; /* Delete variable size memory pool */ -void cyg_mempool_var_delete(cyg_handle_t varpool); +void cyg_mempool_var_delete(cyg_handle_t varpool) __THROW; #ifdef CYGSEM_MEMALLOC_ALLOCATOR_VARIABLE_THREADAWARE /* Allocates a block of length size. This waits if the memory is not currently available. */ -void *cyg_mempool_var_alloc(cyg_handle_t varpool, cyg_int32 size); +void *cyg_mempool_var_alloc(cyg_handle_t varpool, cyg_int32 size) __THROW; # ifdef CYGFUN_KERNEL_THREADS_TIMER @@ -102,7 +102,7 @@ void *cyg_mempool_var_alloc(cyg_handle_t void *cyg_mempool_var_timed_alloc( cyg_handle_t varpool, cyg_int32 size, - cyg_tick_count_t abstime); + cyg_tick_count_t abstime) __THROW; # endif #endif @@ -111,14 +111,14 @@ void *cyg_mempool_var_timed_alloc( available. */ void *cyg_mempool_var_try_alloc( cyg_handle_t varpool, - cyg_int32 size); + cyg_int32 size) __THROW; /* Frees memory back into variable size pool. */ -void cyg_mempool_var_free(cyg_handle_t varpool, void *p); +void cyg_mempool_var_free(cyg_handle_t varpool, void *p) __THROW; /* Returns true if there are any threads waiting for memory in the given memory pool. */ -cyg_bool_t cyg_mempool_var_waiting(cyg_handle_t varpool); +cyg_bool_t cyg_mempool_var_waiting(cyg_handle_t varpool) __THROW; typedef struct { cyg_int32 totalmem; @@ -131,7 +131,7 @@ typedef struct { /* Puts information about a variable memory pool into the structure provided. */ -void cyg_mempool_var_get_info(cyg_handle_t varpool, cyg_mempool_info *info); +void cyg_mempool_var_get_info(cyg_handle_t varpool, cyg_mempool_info *info) __THROW; /* Create a fixed size memory pool */ void cyg_mempool_fix_create( @@ -140,15 +140,15 @@ void cyg_mempool_fix_create( cyg_int32 blocksize, // size of allocation in bytes cyg_handle_t *handle, // handle of memory pool cyg_mempool_fix *fix // space to put pool structure in - ); + ) __THROW; /* Delete fixed size memory pool */ -void cyg_mempool_fix_delete(cyg_handle_t fixpool); +void cyg_mempool_fix_delete(cyg_handle_t fixpool) __THROW; #ifdef CYGSEM_MEMALLOC_ALLOCATOR_FIXED_THREADAWARE /* Allocates a block. This waits if the memory is not currently available. */ -void *cyg_mempool_fix_alloc(cyg_handle_t fixpool); +void *cyg_mempool_fix_alloc(cyg_handle_t fixpool) __THROW; # ifdef CYGFUN_KERNEL_THREADS_TIMER @@ -157,24 +157,24 @@ void *cyg_mempool_fix_alloc(cyg_handle_t available. */ void *cyg_mempool_fix_timed_alloc( cyg_handle_t fixpool, - cyg_tick_count_t abstime); + cyg_tick_count_t abstime) __THROW; # endif #endif /* Allocates a block. NULL is returned if no memory is available. */ -void *cyg_mempool_fix_try_alloc(cyg_handle_t fixpool); +void *cyg_mempool_fix_try_alloc(cyg_handle_t fixpool) __THROW; /* Frees memory back into fixed size pool. */ -void cyg_mempool_fix_free(cyg_handle_t fixpool, void *p); +void cyg_mempool_fix_free(cyg_handle_t fixpool, void *p) __THROW; /* Returns true if there are any threads waiting for memory in the given memory pool. */ -cyg_bool_t cyg_mempool_fix_waiting(cyg_handle_t fixpool); +cyg_bool_t cyg_mempool_fix_waiting(cyg_handle_t fixpool) __THROW; /* Puts information about a variable memory pool into the structure provided. */ -void cyg_mempool_fix_get_info(cyg_handle_t fixpool, cyg_mempool_info *info); +void cyg_mempool_fix_get_info(cyg_handle_t fixpool, cyg_mempool_info *info) __THROW; diff --git a/packages/services/memalloc/common/current/src/kapi.cxx b/packages/services/memalloc/common/current/src/kapi.cxx --- a/packages/services/memalloc/common/current/src/kapi.cxx +++ b/packages/services/memalloc/common/current/src/kapi.cxx @@ -111,7 +111,7 @@ externC void cyg_mempool_var_create( cyg_int32 size, /* size of memory in bytes */ cyg_handle_t *handle, /* returned handle of memory pool */ cyg_mempool_var *var /* space to put pool structure in */ - ) + ) __THROW { CYG_ASSERT_SIZES( cyg_mempool_var, Cyg_Mempool_Variable ); @@ -126,7 +126,7 @@ externC void cyg_mempool_var_create( } /* Delete variable size memory pool */ -externC void cyg_mempool_var_delete(cyg_handle_t varpool) +externC void cyg_mempool_var_delete(cyg_handle_t varpool) __THROW { ((Cyg_Mempool_Variable *)varpool)->~Cyg_Mempool_Variable(); } @@ -134,7 +134,7 @@ externC void cyg_mempool_var_delete(cyg_ /* Allocates a block of length size. This waits if the memory is not currently available. */ #ifdef CYGSEM_MEMALLOC_ALLOCATOR_VARIABLE_THREADAWARE -externC void *cyg_mempool_var_alloc(cyg_handle_t varpool, cyg_int32 size) +externC void *cyg_mempool_var_alloc(cyg_handle_t varpool, cyg_int32 size) __THROW { return ((Cyg_Mempool_Variable *)varpool)->alloc(size); } @@ -147,7 +147,7 @@ externC void *cyg_mempool_var_alloc(cyg_ externC void *cyg_mempool_var_timed_alloc( cyg_handle_t varpool, cyg_int32 size, - cyg_tick_count_t abstime) + cyg_tick_count_t abstime) __THROW { return ((Cyg_Mempool_Variable *)varpool)->alloc(size, abstime); } @@ -159,13 +159,13 @@ externC void *cyg_mempool_var_timed_allo available. */ externC void *cyg_mempool_var_try_alloc( cyg_handle_t varpool, - cyg_int32 size) + cyg_int32 size) __THROW { return ((Cyg_Mempool_Variable *)varpool)->try_alloc(size); } /* Frees memory back into variable size pool. */ -externC void cyg_mempool_var_free(cyg_handle_t varpool, void *p) +externC void cyg_mempool_var_free(cyg_handle_t varpool, void *p) __THROW { cyg_bool b; b = ((Cyg_Mempool_Variable *)varpool)->free((cyg_uint8 *)p, 0); @@ -175,7 +175,7 @@ externC void cyg_mempool_var_free(cyg_ha /* Returns true if there are any threads waiting for memory in the given memory pool. */ -externC cyg_bool_t cyg_mempool_var_waiting(cyg_handle_t varpool) +externC cyg_bool_t cyg_mempool_var_waiting(cyg_handle_t varpool) __THROW { Cyg_Mempool_Variable *v = (Cyg_Mempool_Variable *)varpool; Cyg_Mempool_Status stat; @@ -188,7 +188,7 @@ externC cyg_bool_t cyg_mempool_var_waiti provided. */ externC void cyg_mempool_var_get_info( cyg_handle_t varpool, - cyg_mempool_info *info) + cyg_mempool_info *info) __THROW { Cyg_Mempool_Variable *v = (Cyg_Mempool_Variable *)varpool; Cyg_Mempool_Status stat; @@ -215,7 +215,7 @@ externC void cyg_mempool_fix_create( cyg_int32 blocksize, // size of allocation in bytes cyg_handle_t *handle, // handle of memory pool cyg_mempool_fix *fix // space to put pool structure in - ) + ) __THROW { CYG_ASSERT_SIZES( cyg_mempool_fix, Cyg_Mempool_Fixed ); @@ -231,7 +231,7 @@ externC void cyg_mempool_fix_create( } /* Delete fixed size memory pool */ -externC void cyg_mempool_fix_delete(cyg_handle_t fixpool) +externC void cyg_mempool_fix_delete(cyg_handle_t fixpool) __THROW { ((Cyg_Mempool_Fixed *)fixpool)->~Cyg_Mempool_Fixed(); } @@ -239,7 +239,7 @@ externC void cyg_mempool_fix_delete(cyg_ #ifdef CYGSEM_MEMALLOC_ALLOCATOR_FIXED_THREADAWARE /* Allocates a block. This waits if the memory is not currently available. */ -externC void *cyg_mempool_fix_alloc(cyg_handle_t fixpool) +externC void *cyg_mempool_fix_alloc(cyg_handle_t fixpool) __THROW { return ((Cyg_Mempool_Fixed *)fixpool)->alloc(); } @@ -251,7 +251,7 @@ externC void *cyg_mempool_fix_alloc(cyg_ available. */ externC void *cyg_mempool_fix_timed_alloc( cyg_handle_t fixpool, - cyg_tick_count_t abstime) + cyg_tick_count_t abstime) __THROW { return ((Cyg_Mempool_Fixed *)fixpool)->alloc(abstime); } @@ -260,13 +260,13 @@ externC void *cyg_mempool_fix_timed_allo #endif /* Allocates a block. NULL is returned if no memory is available. */ -externC void *cyg_mempool_fix_try_alloc(cyg_handle_t fixpool) +externC void *cyg_mempool_fix_try_alloc(cyg_handle_t fixpool) __THROW { return ((Cyg_Mempool_Fixed *)fixpool)->try_alloc(); } /* Frees memory back into fixed size pool. */ -externC void cyg_mempool_fix_free(cyg_handle_t fixpool, void *p) +externC void cyg_mempool_fix_free(cyg_handle_t fixpool, void *p) __THROW { cyg_bool b; b = ((Cyg_Mempool_Fixed *)fixpool)->free((cyg_uint8 *)p); @@ -275,7 +275,7 @@ externC void cyg_mempool_fix_free(cyg_ha /* Returns true if there are any threads waiting for memory in the given memory pool. */ -externC cyg_bool_t cyg_mempool_fix_waiting(cyg_handle_t fixpool) +externC cyg_bool_t cyg_mempool_fix_waiting(cyg_handle_t fixpool) __THROW { Cyg_Mempool_Fixed *f = (Cyg_Mempool_Fixed *)fixpool; Cyg_Mempool_Status stat; @@ -288,7 +288,7 @@ externC cyg_bool_t cyg_mempool_fix_waiti provided. */ externC void cyg_mempool_fix_get_info( cyg_handle_t fixpool, - cyg_mempool_info *info) + cyg_mempool_info *info) __THROW { Cyg_Mempool_Fixed *f = (Cyg_Mempool_Fixed *)fixpool; Cyg_Mempool_Status stat; @@ -320,7 +320,7 @@ class Cyg_Check_Mem_Structure_Sizes { int dummy; public: - Cyg_Check_Mem_Structure_Sizes( int x ); + Cyg_Check_Mem_Structure_Sizes( int x ) __THROW; }; @@ -334,7 +334,7 @@ if( sizeof(cstruct) != sizeof(cxxstruct) fmt = fmt; \ } -Cyg_Check_Mem_Structure_Sizes::Cyg_Check_Mem_Structure_Sizes(int x) +Cyg_Check_Mem_Structure_Sizes::Cyg_Check_Mem_Structure_Sizes(int x) __THROW { cyg_bool fail = false;