change log for rtems (2010-06-24)
rtems-vc at rtems.org
rtems-vc at rtems.org
Thu Jun 24 22:12:38 UTC 2010
*joel*:
2010-06-24 Gedare Bloom <giddyup44 at yahoo.com>
PR 1590/cpukit
* score/Makefile.am, score/include/rtems/score/thread.h,
score/src/threadtickletimeslice.c: Remove _Thread_Reset_timeslice and
replaces its single use with a call to the functionally equivalent
_Thread_Yield_processor().
* score/src/threadresettimeslice.c: Removed.
M 1.2458 cpukit/ChangeLog
M 1.82 cpukit/score/Makefile.am
M 1.94 cpukit/score/include/rtems/score/thread.h
R 1.5 cpukit/score/src/threadresettimeslice.c
M 1.12 cpukit/score/src/threadtickletimeslice.c
diff -u rtems/cpukit/ChangeLog:1.2457 rtems/cpukit/ChangeLog:1.2458
--- rtems/cpukit/ChangeLog:1.2457 Thu Jun 24 14:57:58 2010
+++ rtems/cpukit/ChangeLog Thu Jun 24 16:27:29 2010
@@ -1,3 +1,12 @@
+2010-06-24 Gedare Bloom <giddyup44 at yahoo.com>
+
+ PR 1590/cpukit
+ * score/Makefile.am, score/include/rtems/score/thread.h,
+ score/src/threadtickletimeslice.c: Remove _Thread_Reset_timeslice and
+ replaces its single use with a call to the functionally equivalent
+ _Thread_Yield_processor().
+ * score/src/threadresettimeslice.c: Removed.
+
2010-06-24 Bharath Suri <bharath.s.jois at gmail.com>
PR 1542/filesystem
diff -u rtems/cpukit/score/Makefile.am:1.81 rtems/cpukit/score/Makefile.am:1.82
--- rtems/cpukit/score/Makefile.am:1.81 Thu Jun 17 10:29:44 2010
+++ rtems/cpukit/score/Makefile.am Thu Jun 24 16:27:30 2010
@@ -143,9 +143,9 @@
src/threadclearstate.c src/threadclose.c src/threadcreateidle.c \
src/threaddelayended.c src/threaddispatch.c src/threadevaluatemode.c \
src/threadget.c src/threadhandler.c src/threadinitialize.c \
- src/threadloadenv.c src/threadready.c src/threadresettimeslice.c \
- src/threadreset.c src/threadrestart.c src/threadresume.c \
- src/threadsetpriority.c src/threadsetstate.c src/threadsettransient.c \
+ src/threadloadenv.c src/threadready.c src/threadreset.c \
+ src/threadrestart.c src/threadresume.c src/threadsetpriority.c \
+ src/threadsetstate.c src/threadsettransient.c \
src/threadstackallocate.c src/threadstackfree.c src/threadstart.c \
src/threadstartmultitasking.c src/threadsuspend.c \
src/threadtickletimeslice.c src/threadyieldprocessor.c \
diff -u rtems/cpukit/score/include/rtems/score/thread.h:1.93 rtems/cpukit/score/include/rtems/score/thread.h:1.94
--- rtems/cpukit/score/include/rtems/score/thread.h:1.93 Thu Jun 17 23:20:06 2010
+++ rtems/cpukit/score/include/rtems/score/thread.h Thu Jun 24 16:27:30 2010
@@ -672,16 +672,6 @@
);
/**
- * This routine is invoked upon expiration of the currently
- * executing thread's timeslice. If no other thread's are ready
- * at the priority of the currently executing thread, then the
- * executing thread's timeslice is reset. Otherwise, the
- * currently executing thread is placed at the rear of the
- * FIFO for this priority and a new heir is selected.
- */
-void _Thread_Reset_timeslice( void );
-
-/**
* This routine is invoked as part of processing each clock tick.
* It is responsible for determining if the current thread allows
* timeslicing and, if so, when its timeslice expires.
diff -u rtems/cpukit/score/src/threadtickletimeslice.c:1.11 rtems/cpukit/score/src/threadtickletimeslice.c:1.12
--- rtems/cpukit/score/src/threadtickletimeslice.c:1.11 Wed Dec 2 12:22:19 2009
+++ rtems/cpukit/score/src/threadtickletimeslice.c Thu Jun 24 16:27:30 2010
@@ -80,7 +80,16 @@
case THREAD_CPU_BUDGET_ALGORITHM_EXHAUST_TIMESLICE:
#endif
if ( (int)(--executing->cpu_time_budget) <= 0 ) {
- _Thread_Reset_timeslice();
+
+ /*
+ * A yield performs the ready chain mechanics needed when
+ * resetting a timeslice. If no other thread's are ready
+ * at the priority of the currently executing thread, then the
+ * executing thread's timeslice is reset. Otherwise, the
+ * currently executing thread is placed at the rear of the
+ * FIFO for this priority and a new heir is selected.
+ */
+ _Thread_Yield_processor();
executing->cpu_time_budget = _Thread_Ticks_per_timeslice;
}
break;
*joel*:
2010-06-24 Joel Sherrill <joel.sherrilL at OARcorp.com>
* libfs/src/imfs/imfs_creat.c, libfs/src/imfs/imfs_debug.c,
libfs/src/imfs/imfs_directory.c, libfs/src/imfs/imfs_eval.c,
libfs/src/imfs/imfs_fsunmount.c, libfs/src/imfs/imfs_getchild.c,
libfs/src/imfs/imfs_initsupp.c, libfs/src/imfs/ioman.c,
libfs/src/imfs/memfile.c: Evaluate all assert calls in IMFS. Either
made them conditional on RTEMS_DEBUG or eliminated them.
M 1.2459 cpukit/ChangeLog
M 1.16 cpukit/libfs/src/imfs/imfs_creat.c
M 1.15 cpukit/libfs/src/imfs/imfs_debug.c
M 1.26 cpukit/libfs/src/imfs/imfs_directory.c
M 1.28 cpukit/libfs/src/imfs/imfs_eval.c
M 1.13 cpukit/libfs/src/imfs/imfs_fsunmount.c
M 1.11 cpukit/libfs/src/imfs/imfs_getchild.c
M 1.23 cpukit/libfs/src/imfs/imfs_initsupp.c
M 1.19 cpukit/libfs/src/imfs/ioman.c
M 1.34 cpukit/libfs/src/imfs/memfile.c
diff -u rtems/cpukit/ChangeLog:1.2458 rtems/cpukit/ChangeLog:1.2459
--- rtems/cpukit/ChangeLog:1.2458 Thu Jun 24 16:27:29 2010
+++ rtems/cpukit/ChangeLog Thu Jun 24 16:31:20 2010
@@ -1,3 +1,12 @@
+2010-06-24 Joel Sherrill <joel.sherrilL at OARcorp.com>
+
+ * libfs/src/imfs/imfs_creat.c, libfs/src/imfs/imfs_debug.c,
+ libfs/src/imfs/imfs_directory.c, libfs/src/imfs/imfs_eval.c,
+ libfs/src/imfs/imfs_fsunmount.c, libfs/src/imfs/imfs_getchild.c,
+ libfs/src/imfs/imfs_initsupp.c, libfs/src/imfs/ioman.c,
+ libfs/src/imfs/memfile.c: Evaluate all assert calls in IMFS. Either
+ made them conditional on RTEMS_DEBUG or eliminated them.
+
2010-06-24 Gedare Bloom <giddyup44 at yahoo.com>
PR 1590/cpukit
diff -u rtems/cpukit/libfs/src/imfs/imfs_creat.c:1.15 rtems/cpukit/libfs/src/imfs/imfs_creat.c:1.16
--- rtems/cpukit/libfs/src/imfs/imfs_creat.c:1.15 Tue Jun 8 10:15:31 2010
+++ rtems/cpukit/libfs/src/imfs/imfs_creat.c Thu Jun 24 16:31:21 2010
@@ -17,7 +17,9 @@
#include "config.h"
#endif
-#include <assert.h>
+#if defined(RTEMS_DEBUG)
+ #include <assert.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include "imfs.h"
@@ -99,8 +101,10 @@
break;
default:
- assert(0);
- break;
+ #if defined(RTEMS_DEBUG)
+ assert(0);
+ #endif
+ return;
}
/*
diff -u rtems/cpukit/libfs/src/imfs/imfs_debug.c:1.14 rtems/cpukit/libfs/src/imfs/imfs_debug.c:1.15
--- rtems/cpukit/libfs/src/imfs/imfs_debug.c:1.14 Tue Oct 14 10:06:25 2008
+++ rtems/cpukit/libfs/src/imfs/imfs_debug.c Thu Jun 24 16:31:21 2010
@@ -15,7 +15,9 @@
#include "config.h"
#endif
-#include <assert.h>
+#if defined(RTEMS_DEBUG)
+ #include <assert.h>
+#endif
#include <string.h>
#include <fcntl.h>
#include <errno.h>
@@ -53,7 +55,9 @@
IMFS_jnode_t *the_jnode
)
{
- assert( the_jnode );
+ #if defined(RTEMS_DEBUG)
+ assert( the_jnode );
+ #endif
fprintf(stdout, "%s", the_jnode->name );
switch( the_jnode->type ) {
@@ -90,23 +94,19 @@
case IMFS_HARD_LINK:
fprintf(stdout, " links not printed\n" );
- assert(0);
- break;
+ return;
case IMFS_SYM_LINK:
fprintf(stdout, " links not printed\n" );
- assert(0);
- break;
+ return;
case IMFS_FIFO:
fprintf(stdout, " FIFO not printed\n" );
- assert(0);
- break;
+ return;
default:
fprintf(stdout, " bad type %d\n", the_jnode->type );
- assert(0);
- break;
+ return;
}
puts("");
}
@@ -129,11 +129,11 @@
IMFS_jnode_t *the_jnode;
int i;
- assert( the_directory );
-
- assert( level >= 0 );
-
- assert( the_directory->type == IMFS_DIRECTORY );
+ #if defined(RTEMS_DEBUG)
+ assert( the_directory );
+ assert( level >= 0 );
+ assert( the_directory->type == IMFS_DIRECTORY );
+ #endif
the_chain = &the_directory->info.directory.Entries;
diff -u rtems/cpukit/libfs/src/imfs/imfs_directory.c:1.25 rtems/cpukit/libfs/src/imfs/imfs_directory.c:1.26
--- rtems/cpukit/libfs/src/imfs/imfs_directory.c:1.25 Tue Jun 8 03:50:56 2010
+++ rtems/cpukit/libfs/src/imfs/imfs_directory.c Thu Jun 24 16:31:21 2010
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <assert.h>
#include <dirent.h>
#include "imfs.h"
@@ -179,7 +178,7 @@
* directory
* SEEK_CUR - offset is used as the relative byte offset from the current
* directory position index held in the iop structure
- * SEEK_END - N/A --> This will cause an assert.
+ * SEEK_END - N/A --> This will cause an EINVAL to be returned.
*/
rtems_off64_t imfs_dir_lseek(
diff -u rtems/cpukit/libfs/src/imfs/imfs_eval.c:1.27 rtems/cpukit/libfs/src/imfs/imfs_eval.c:1.28
--- rtems/cpukit/libfs/src/imfs/imfs_eval.c:1.27 Tue Jun 8 05:25:44 2010
+++ rtems/cpukit/libfs/src/imfs/imfs_eval.c Thu Jun 24 16:31:22 2010
@@ -21,7 +21,6 @@
#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
-#include <assert.h>
#include "imfs.h"
#include <rtems/libio_.h>
@@ -83,7 +82,6 @@
int flags_to_test;
if ( !rtems_libio_is_valid_perms( flags ) ) {
- assert( 0 );
rtems_set_errno_and_return_minus_one( EIO );
}
@@ -501,7 +499,6 @@
int result;
if ( !rtems_libio_is_valid_perms( flags ) ) {
- assert( 0 );
rtems_set_errno_and_return_minus_one( EIO );
}
diff -u rtems/cpukit/libfs/src/imfs/imfs_fsunmount.c:1.12 rtems/cpukit/libfs/src/imfs/imfs_fsunmount.c:1.13
--- rtems/cpukit/libfs/src/imfs/imfs_fsunmount.c:1.12 Thu Jun 11 20:53:33 2009
+++ rtems/cpukit/libfs/src/imfs/imfs_fsunmount.c Thu Jun 24 16:31:22 2010
@@ -20,8 +20,6 @@
#include <unistd.h>
#include <stdlib.h>
-#include <assert.h>
-
#include "imfs.h"
#include <rtems/libio_.h>
diff -u rtems/cpukit/libfs/src/imfs/imfs_getchild.c:1.10 rtems/cpukit/libfs/src/imfs/imfs_getchild.c:1.11
--- rtems/cpukit/libfs/src/imfs/imfs_getchild.c:1.10 Wed Jul 2 20:37:38 2008
+++ rtems/cpukit/libfs/src/imfs/imfs_getchild.c Thu Jun 24 16:31:22 2010
@@ -17,8 +17,10 @@
#include "config.h"
#endif
+#if defined(RTEMS_DEBUG)
+ #include <assert.h>
+#endif
#include <errno.h>
-#include <assert.h>
#include <string.h>
#include "imfs.h"
@@ -39,11 +41,13 @@
* the IMFS code.
*/
- assert( directory );
+ #if defined(RTEMS_DEBUG)
+ assert( directory );
+ assert( name );
+ #endif
if ( !name )
return 0;
- assert( name );
if ( !directory )
return 0;
diff -u rtems/cpukit/libfs/src/imfs/imfs_initsupp.c:1.22 rtems/cpukit/libfs/src/imfs/imfs_initsupp.c:1.23
--- rtems/cpukit/libfs/src/imfs/imfs_initsupp.c:1.22 Tue Jun 8 05:25:45 2010
+++ rtems/cpukit/libfs/src/imfs/imfs_initsupp.c Thu Jun 24 16:31:22 2010
@@ -20,8 +20,6 @@
#include <unistd.h>
#include <stdlib.h>
-#include <assert.h>
-
#include "imfs.h"
#include <rtems/libio_.h>
#include <rtems/seterr.h>
diff -u rtems/cpukit/libfs/src/imfs/ioman.c:1.18 rtems/cpukit/libfs/src/imfs/ioman.c:1.19
--- rtems/cpukit/libfs/src/imfs/ioman.c:1.18 Wed Oct 14 11:09:11 2009
+++ rtems/cpukit/libfs/src/imfs/ioman.c Thu Jun 24 16:31:22 2010
@@ -22,8 +22,6 @@
#include <unistd.h>
#include <string.h>
-#include <assert.h>
-
#include <rtems.h>
#include <rtems/libio_.h>
#include <rtems/seterr.h>
diff -u rtems/cpukit/libfs/src/imfs/memfile.c:1.33 rtems/cpukit/libfs/src/imfs/memfile.c:1.34
--- rtems/cpukit/libfs/src/imfs/memfile.c:1.33 Tue Jun 8 03:50:56 2010
+++ rtems/cpukit/libfs/src/imfs/memfile.c Thu Jun 24 16:31:22 2010
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include <string.h>
-#include <assert.h>
#include <errno.h>
#include <rtems.h>
@@ -301,11 +300,13 @@
* Perform internal consistency checks
*/
- assert( the_jnode );
+ #if defined(RTEMS_DEBUG)
+ assert( the_jnode );
+ assert( the_jnode->type == IMFS_MEMORY_FILE );
+ #endif
if ( !the_jnode )
rtems_set_errno_and_return_minus_one( EIO );
- assert( the_jnode->type == IMFS_MEMORY_FILE );
if ( the_jnode->type != IMFS_MEMORY_FILE )
rtems_set_errno_and_return_minus_one( EIO );
@@ -357,11 +358,13 @@
block_p memory;
block_p *block_entry_ptr;
- assert( the_jnode );
+ #if defined(RTEMS_DEBUG)
+ assert( the_jnode );
+ assert( the_jnode->type == IMFS_MEMORY_FILE );
+ #endif
if ( !the_jnode )
rtems_set_errno_and_return_minus_one( EIO );
- assert( the_jnode->type == IMFS_MEMORY_FILE );
if ( the_jnode->type != IMFS_MEMORY_FILE )
rtems_set_errno_and_return_minus_one( EIO );
@@ -402,7 +405,9 @@
block_p ptr;
block_ptr = IMFS_memfile_get_block_pointer( the_jnode, block, 0 );
- assert( block_ptr );
+ #if defined(RTEMS_DEBUG)
+ assert( block_ptr );
+ #endif
if ( block_ptr ) {
ptr = *block_ptr;
*block_ptr = 0;
@@ -431,7 +436,9 @@
* Perform internal consistency checks
*/
- assert( block_table );
+ #if defined(RTEMS_DEBUG)
+ assert( block_table );
+ #endif
if ( !block_table )
return;
@@ -490,11 +497,13 @@
* Perform internal consistency checks
*/
- assert( the_jnode );
+ #if defined(RTEMS_DEBUG)
+ assert( the_jnode );
+ assert( the_jnode->type == IMFS_MEMORY_FILE );
+ #endif
if ( !the_jnode )
rtems_set_errno_and_return_minus_one( EIO );
- assert( the_jnode->type == IMFS_MEMORY_FILE );
if ( the_jnode->type != IMFS_MEMORY_FILE )
rtems_set_errno_and_return_minus_one( EIO );
@@ -584,12 +593,14 @@
* Perform internal consistency checks
*/
- assert( the_jnode );
+ #if defined(RTEMS_DEBUG)
+ assert( the_jnode );
+ assert( the_jnode->type == IMFS_MEMORY_FILE ||
+ assert( dest );
+ #endif
if ( !the_jnode )
rtems_set_errno_and_return_minus_one( EIO );
- assert( the_jnode->type == IMFS_MEMORY_FILE ||
- the_jnode->type == IMFS_LINEAR_FILE );
if ( the_jnode->type != IMFS_MEMORY_FILE &&
the_jnode->type != IMFS_LINEAR_FILE )
rtems_set_errno_and_return_minus_one( EIO );
@@ -598,7 +609,6 @@
* Error checks on arguments
*/
- assert( dest );
if ( !dest )
rtems_set_errno_and_return_minus_one( EINVAL );
@@ -658,7 +668,6 @@
if ( to_copy > my_length )
to_copy = my_length;
block_ptr = IMFS_memfile_get_block_pointer( the_jnode, block, 0 );
- assert( block_ptr );
if ( !block_ptr )
return copied;
memcpy( dest, &(*block_ptr)[ start_offset ], to_copy );
@@ -675,7 +684,6 @@
to_copy = IMFS_MEMFILE_BYTES_PER_BLOCK;
while ( my_length >= IMFS_MEMFILE_BYTES_PER_BLOCK ) {
block_ptr = IMFS_memfile_get_block_pointer( the_jnode, block, 0 );
- assert( block_ptr );
if ( !block_ptr )
return copied;
memcpy( dest, &(*block_ptr)[ 0 ], to_copy );
@@ -689,11 +697,12 @@
* Phase 3: possibly the first part of one block
*/
- assert( my_length < IMFS_MEMFILE_BYTES_PER_BLOCK );
+ #if defined(RTEMS_DEBUG)
+ assert( my_length < IMFS_MEMFILE_BYTES_PER_BLOCK );
+ #endif
if ( my_length ) {
block_ptr = IMFS_memfile_get_block_pointer( the_jnode, block, 0 );
- assert( block_ptr );
if ( !block_ptr )
return copied;
memcpy( dest, &(*block_ptr)[ 0 ], my_length );
@@ -735,11 +744,14 @@
* Perform internal consistency checks
*/
- assert( the_jnode );
+ #if defined(RTEMS_DEBUG)
+ assert( source );
+ assert( the_jnode );
+ assert( the_jnode->type == IMFS_MEMORY_FILE );
+ #endif
if ( !the_jnode )
rtems_set_errno_and_return_minus_one( EIO );
- assert( the_jnode->type == IMFS_MEMORY_FILE );
if ( the_jnode->type != IMFS_MEMORY_FILE )
rtems_set_errno_and_return_minus_one( EIO );
@@ -747,7 +759,6 @@
* Error check arguments
*/
- assert( source );
if ( !source )
rtems_set_errno_and_return_minus_one( EINVAL );
@@ -792,12 +803,19 @@
if ( to_copy > my_length )
to_copy = my_length;
block_ptr = IMFS_memfile_get_block_pointer( the_jnode, block, 0 );
- assert( block_ptr );
if ( !block_ptr )
return copied;
-#if 0
-fprintf(stdout, "write %d at %d in %d: %*s\n", to_copy, start_offset, block, to_copy, src );
-#endif
+ #if 0
+ fprintf(
+ stderr,
+ "write %d at %d in %d: %*s\n",
+ to_copy,
+ start_offset,
+ block,
+ to_copy,
+ src
+ );
+ #endif
memcpy( &(*block_ptr)[ start_offset ], src, to_copy );
src += to_copy;
block++;
@@ -812,12 +830,11 @@
to_copy = IMFS_MEMFILE_BYTES_PER_BLOCK;
while ( my_length >= IMFS_MEMFILE_BYTES_PER_BLOCK ) {
block_ptr = IMFS_memfile_get_block_pointer( the_jnode, block, 0 );
- assert( block_ptr );
if ( !block_ptr )
return copied;
-#if 0
-fprintf(stdout, "write %d in %d: %*s\n", to_copy, block, to_copy, src );
-#endif
+ #if 0
+ fprintf(stdout, "write %d in %d: %*s\n", to_copy, block, to_copy, src );
+ #endif
memcpy( &(*block_ptr)[ 0 ], src, to_copy );
src += to_copy;
block++;
@@ -829,17 +846,18 @@
* Phase 3: possibly the first part of one block
*/
- assert( my_length < IMFS_MEMFILE_BYTES_PER_BLOCK );
+ #if defined(RTEMS_DEBUG)
+ assert( my_length < IMFS_MEMFILE_BYTES_PER_BLOCK );
+ #endif
to_copy = my_length;
if ( my_length ) {
block_ptr = IMFS_memfile_get_block_pointer( the_jnode, block, 0 );
- assert( block_ptr );
if ( !block_ptr )
return copied;
-#if 0
-fprintf(stdout, "write %d in %d: %*s\n", to_copy, block, to_copy, src );
-#endif
+ #if 0
+ fprintf(stdout, "write %d in %d: %*s\n", to_copy, block, to_copy, src );
+ #endif
memcpy( &(*block_ptr)[ 0 ], src, my_length );
my_length = 0;
copied += to_copy;
@@ -900,11 +918,13 @@
* Perform internal consistency checks
*/
- assert( the_jnode );
+ #if defined(RTEMS_DEBUG)
+ assert( the_jnode );
+ assert( the_jnode->type == IMFS_MEMORY_FILE );
+ #endif
if ( !the_jnode )
return NULL;
- assert( the_jnode->type == IMFS_MEMORY_FILE );
if ( the_jnode->type != IMFS_MEMORY_FILE )
return NULL;
@@ -917,10 +937,6 @@
*/
if ( my_block <= LAST_INDIRECT ) {
-#if 0
-fprintf(stdout, "(s %d) ", block );
-fflush(stdout);
-#endif
p = info->indirect;
if ( malloc_it ) {
*joel*:
2010-06-24 Joel Sherrill <joel.sherrilL at OARcorp.com>
* libfs/src/imfs/imfs_creat.c: Fix warning.
M 1.2460 cpukit/ChangeLog
M 1.17 cpukit/libfs/src/imfs/imfs_creat.c
diff -u rtems/cpukit/ChangeLog:1.2459 rtems/cpukit/ChangeLog:1.2460
--- rtems/cpukit/ChangeLog:1.2459 Thu Jun 24 16:31:20 2010
+++ rtems/cpukit/ChangeLog Thu Jun 24 16:37:08 2010
@@ -1,5 +1,9 @@
2010-06-24 Joel Sherrill <joel.sherrilL at OARcorp.com>
+ * libfs/src/imfs/imfs_creat.c: Fix warning.
+
+2010-06-24 Joel Sherrill <joel.sherrilL at OARcorp.com>
+
* libfs/src/imfs/imfs_creat.c, libfs/src/imfs/imfs_debug.c,
libfs/src/imfs/imfs_directory.c, libfs/src/imfs/imfs_eval.c,
libfs/src/imfs/imfs_fsunmount.c, libfs/src/imfs/imfs_getchild.c,
diff -u rtems/cpukit/libfs/src/imfs/imfs_creat.c:1.16 rtems/cpukit/libfs/src/imfs/imfs_creat.c:1.17
--- rtems/cpukit/libfs/src/imfs/imfs_creat.c:1.16 Thu Jun 24 16:31:21 2010
+++ rtems/cpukit/libfs/src/imfs/imfs_creat.c Thu Jun 24 16:37:08 2010
@@ -104,7 +104,7 @@
#if defined(RTEMS_DEBUG)
assert(0);
#endif
- return;
+ break;
}
/*
*joel*:
2010-06-24 Joel Sherrill <joel.sherrilL at OARcorp.com>
* libcsupport/src/read.c, libcsupport/src/write.c: read(2) and write(2)
should return 0 when passed a count of 0 after verifying other
possible errors.
M 1.2461 cpukit/ChangeLog
M 1.16 cpukit/libcsupport/src/read.c
M 1.17 cpukit/libcsupport/src/write.c
diff -u rtems/cpukit/ChangeLog:1.2460 rtems/cpukit/ChangeLog:1.2461
--- rtems/cpukit/ChangeLog:1.2460 Thu Jun 24 16:37:08 2010
+++ rtems/cpukit/ChangeLog Thu Jun 24 16:48:52 2010
@@ -1,5 +1,11 @@
2010-06-24 Joel Sherrill <joel.sherrilL at OARcorp.com>
+ * libcsupport/src/read.c, libcsupport/src/write.c: read(2) and write(2)
+ should return 0 when passed a count of 0 after verifying other
+ possible errors.
+
+2010-06-24 Joel Sherrill <joel.sherrilL at OARcorp.com>
+
* libfs/src/imfs/imfs_creat.c: Fix warning.
2010-06-24 Joel Sherrill <joel.sherrilL at OARcorp.com>
diff -u rtems/cpukit/libcsupport/src/read.c:1.15 rtems/cpukit/libcsupport/src/read.c:1.16
--- rtems/cpukit/libcsupport/src/read.c:1.15 Wed Sep 30 03:20:31 2009
+++ rtems/cpukit/libcsupport/src/read.c Thu Jun 24 16:48:52 2010
@@ -34,10 +34,12 @@
rtems_libio_check_count( count );
rtems_libio_check_permissions( iop, LIBIO_FLAGS_READ );
+ if ( count == 0 )
+ return 0;
+
/*
* Now process the read().
*/
-
if ( !iop->handlers->read_h )
rtems_set_errno_and_return_minus_one( ENOTSUP );
diff -u rtems/cpukit/libcsupport/src/write.c:1.16 rtems/cpukit/libcsupport/src/write.c:1.17
--- rtems/cpukit/libcsupport/src/write.c:1.16 Thu Sep 20 17:25:14 2007
+++ rtems/cpukit/libcsupport/src/write.c Thu Jun 24 16:48:52 2010
@@ -41,10 +41,12 @@
rtems_libio_check_count( count );
rtems_libio_check_permissions( iop, LIBIO_FLAGS_WRITE );
+ if ( count == 0 )
+ return 0;
+
/*
* Now process the write() request.
*/
-
if ( !iop->handlers->write_h )
rtems_set_errno_and_return_minus_one( ENOTSUP );
*joel*:
2010-06-24 Joel Sherrill <joel.sherrilL at OARcorp.com>
* libfs/src/imfs/memfile.c: Fix assert.
M 1.2462 cpukit/ChangeLog
M 1.35 cpukit/libfs/src/imfs/memfile.c
diff -u rtems/cpukit/ChangeLog:1.2461 rtems/cpukit/ChangeLog:1.2462
--- rtems/cpukit/ChangeLog:1.2461 Thu Jun 24 16:48:52 2010
+++ rtems/cpukit/ChangeLog Thu Jun 24 17:01:49 2010
@@ -1,5 +1,9 @@
2010-06-24 Joel Sherrill <joel.sherrilL at OARcorp.com>
+ * libfs/src/imfs/memfile.c: Fix assert.
+
+2010-06-24 Joel Sherrill <joel.sherrilL at OARcorp.com>
+
* libcsupport/src/read.c, libcsupport/src/write.c: read(2) and write(2)
should return 0 when passed a count of 0 after verifying other
possible errors.
diff -u rtems/cpukit/libfs/src/imfs/memfile.c:1.34 rtems/cpukit/libfs/src/imfs/memfile.c:1.35
--- rtems/cpukit/libfs/src/imfs/memfile.c:1.34 Thu Jun 24 16:31:22 2010
+++ rtems/cpukit/libfs/src/imfs/memfile.c Thu Jun 24 17:01:49 2010
@@ -596,6 +596,7 @@
#if defined(RTEMS_DEBUG)
assert( the_jnode );
assert( the_jnode->type == IMFS_MEMORY_FILE ||
+ the_jnode->type != IMFS_LINEAR_FILE );
assert( dest );
#endif
if ( !the_jnode )
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100624/900244ea/attachment-0001.html>
More information about the vc
mailing list