Changeset 433 for trunk/kernel/syscalls/sys_write.c

Timestamp:

Feb 14, 2018, 3:40:19 PM (6 years ago)

Author:

alain

Message:

blip

File:

• trunk/kernel/syscalls/sys_write.c (modified) (6 diffs)

trunk/kernel/syscalls/sys_write.c

@@ -46 +46 @@
     reg_t        save_sr;         // required to enable IRQs during syscall
 
-#if CONFIG_WRITE_DEBUG
+        thread_t   * this = CURRENT_THREAD;
+        process_t  * process = this->process;
+
+#if CONFIG_DEBUG_SYS_WRITE
 uint32_t     tm_start;
 uint32_t     tm_end;
 tm_start = hal_get_cycles();
+if( CONFIG_DEBUG_SYS_WRITE < tm_start )
+printk("\n[DBG] %s : thread %x / process %x / vaddr %x / count %d / cycle %d\n",
+__FUNCTION__, this, process->pid, vaddr, count, (uint32_t)tm_start );
 #endif
-
-        thread_t   * this = CURRENT_THREAD;
-        process_t  * process = this->process;
  
     // check file_id argument
         if( file_id >= CONFIG_PROCESS_FILE_MAX_NR )
         {
-        printk("\n[ERROR] in %s : illegal file descriptor index\n", __FUNCTION__ );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : illegal file descriptor index\n", __FUNCTION__ );
+#endif
         this->errno = EBADFD;
                 return -1;
@@ -68 +74 @@
     if ( error )
     {
-        printk("\n[ERROR] in %s : user buffer unmapped = %x\n",
-        __FUNCTION__ , (intptr_t)vaddr );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : user buffer unmapped = %x\n", __FUNCTION__ , (intptr_t)vaddr );
+#endif
                 this->errno = EINVAL;
                 return -1;
@@ -82 +90 @@
     if( file_xp == XPTR_NULL )
     {
-        printk("\n[ERROR] in %s : undefined file descriptor index = %d in process %x\n",
-        __FUNCTION__ , file_id , process->pid );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : undefined file descriptor index = %d in process %x\n",
+__FUNCTION__ , file_id , process->pid );
+#endif
                 this->errno = EBADFD;
                 return -1;
@@ -103 +114 @@
         if( (attr & FD_ATTR_WRITE_ENABLE) == 0 )
             {
-            printk("\n[ERROR] in %s : file %d not writable in process %x\n",
-            __FUNCTION__ , file_id , process->pid );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : file %d not writable in process %x\n",
+__FUNCTION__ , file_id , process->pid );
+#endif
                     this->errno = EBADFD;
                     return -1;
@@ -131 +145 @@
     if( nbytes != count )
     {
-        printk("\n[ERROR] in %s cannot write data to file %d in process %x\n",
-        __FUNCTION__ , file_id , process->pid );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s cannot write data to file %d in process %x\n",
+__FUNCTION__ , file_id , process->pid );
+#endif
         this->errno = error;
         return -1;
@@ -142 +159 @@
     hal_fence();
 
-#if CONFIG_WRITE_DEBUG
+#if CONFIG_DEBUG_SYS_WRITE
 tm_end = hal_get_cycles();
-printk("\n[DBG] %s : core[%x,%d] / thread %x in process %x / cycle %d\n"
+if( CONFIG_DEBUG_SYS_WRITE < tm_end )
+printk("\n[DBG] %s : thread %x in process %x / cycle %d\n"
 "nbytes = %d / first byte = %c / file_id = %d / cost = %d\n",
-__FUNCTION__ , local_cxy , this->core->lid , this->trdid , this->process->pid ,
-(uint32_t)tm_start , nbytes , *((char *)(intptr_t)paddr) , file_id , 
-(uint32_t)(tm_end - tm_start) );
+__FUNCTION__, this, process->pid, (uint32_t)tm_start,
+nbytes, *((char *)(intptr_t)paddr) , file_id , (uint32_t)(tm_end - tm_start) );
 #endif
  
-#if (CONFIG_WRITE_DEBUG & 0x1)
-printk("\n@@@@@@@@@@@@ timing to write character %c\n"
-" - enter_sys_write    = %d\n"
-" - exit_sys_write     = %d\n",
-*((char *)(intptr_t)paddr) , (uint32_t)tm_start , (uint32_t)tm_end );
-#endif
-
         return nbytes;