Changeset 625 for trunk/kernel/libk

Timestamp:

Apr 10, 2019, 10:09:39 AM (6 years ago)

Author:

alain

Message:

Fix a bug in the vmm_remove_vseg() function: the physical pages
associated to an user DATA vseg were released to the kernel when
the target process descriptor was in the reference cluster.
This physical pages release should be done only when the page
forks counter value is zero.
All other modifications are cosmetic.

Location:

trunk/kernel/libk

Files:

• elf.c (modified) (1 diff)
• elf.h (modified) (1 diff)
• remote_rwlock.c (modified) (1 diff)

trunk/kernel/libk/elf.c

@@ -196 +196 @@
 
 #if DEBUG_ELF_LOAD
-uint32_t cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_ELF_LOAD < cycle )
-printk("\n[%s] found %s vseg / base %x / size %x\n"
+uint32_t   cycle = (uint32_t)hal_get_cycles();
+thread_t * this  = CURRENT_THREAD;
+if( DEBUG_ELF_LOAD < cycle )
+printk("\n[%s] thread[%x,%x] found %s vseg / base %x / size %x\n"
 "  file_size %x / file_offset %x / mapper_xp %l / cycle %d\n",
-__FUNCTION__ , vseg_type_str(vseg->type) , vseg->min , vseg->max - vseg->min ,
+__FUNCTION__ , this->process_pid, this->trdid, 
+vseg_type_str(vseg->type) , vseg->min , vseg->max - vseg->min ,
 vseg->file_size , vseg->file_offset , vseg->mapper_xp );
 #endif

trunk/kernel/libk/elf.h

@@ -228 +228 @@
 
 /****************************************************************************************
- * This function registers in VMM of the process identified by the <process> argument
- * the CODE and DATA vsegs defined in the .elf open file descriptor <file_xp>.
+ * This function registers in the VSL of the process identified by the <process>
+ * argument the CODE and DATA vsegs defined in the .elf file descriptor <file_xp>.
  * The segments are not loaded in memory.
  * It also registers the process entry point in VMM.

trunk/kernel/libk/remote_rwlock.c

@@ -251 +251 @@
         thread_t *  thread_ptr = GET_PTR( thread_xp ); 
 
+printk("\n@@@ in %s : release first waiting writer[%x,%x]\n",
+__FUNCTION__, thread_cxy, thread_ptr );
+
         // remove this waiting thread from waiting list
         xlist_unlink( XPTR( thread_cxy , &thread_ptr->wait_xlist ) );