You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gu...@apache.org on 2021/07/12 19:50:03 UTC

[incubator-nuttx] branch master updated (e5c2789 -> c3c4053)

This is an automated email from the ASF dual-hosted git repository.

gustavonihei pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.


    from e5c2789  net: Rename IP_TTL to IP_TTL_DEFAULT
     new 7ef29ec  profs: Print StackAlloc by procfs_snprintf
     new c3c4053  fs/profs: Add ordblks in meminfo_progmem

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 fs/procfs/fs_procfsmeminfo.c | 1 +
 fs/procfs/fs_procfsproc.c    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

[incubator-nuttx] 01/02: profs: Print StackAlloc by procfs_snprintf

Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 7ef29ecce64b17d314e93efec336d4a417d139e0
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Mon Jul 12 22:03:23 2021 +0800

    profs: Print StackAlloc by procfs_snprintf
    
    since snprintf return the wrong number in case of insufficient buffer
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 fs/procfs/fs_procfsproc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/procfs/fs_procfsproc.c b/fs/procfs/fs_procfsproc.c
index fd532db..a75b520 100644
--- a/fs/procfs/fs_procfsproc.c
+++ b/fs/procfs/fs_procfsproc.c
@@ -894,7 +894,7 @@ static ssize_t proc_stack(FAR struct proc_file_s *procfile,
 
   /* Show the stack alloc address */
 
-  linesize   = snprintf(procfile->line, STATUS_LINELEN, "%-12s%p\n",
+  linesize   = procfs_snprintf(procfile->line, STATUS_LINELEN, "%-12s%p\n",
                                "StackAlloc:", tcb->stack_alloc_ptr);
   copysize   = procfs_memcpy(procfile->line, linesize, buffer, remaining,
                              &offset);
@@ -1010,7 +1010,7 @@ static ssize_t proc_groupstatus(FAR struct proc_file_s *procfile,
   linesize   = procfs_snprintf(procfile->line, STATUS_LINELEN, "%-12s%d\n",
                                "Members:", group->tg_nmembers);
   copysize   = procfs_memcpy(procfile->line, linesize, buffer,
-                            remaining, &offset);
+                             remaining, &offset);
 
   totalsize += copysize;
   buffer    += copysize;

[incubator-nuttx] 02/02: fs/profs: Add ordblks in meminfo_progmem

Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit c3c4053263cc59fa0ca54d3ef3fdf0b96ebd673a
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Mon Jul 12 22:59:46 2021 +0800

    fs/profs: Add ordblks in meminfo_progmem
    
    forget in commit:
    Author: Jiuzhu Dong <do...@xiaomi.com>
    Date:   Wed Apr 28 11:05:20 2021 +0800
    
        cmd/free: add nused/nfree field in command free
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 fs/procfs/fs_procfsmeminfo.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/procfs/fs_procfsmeminfo.c b/fs/procfs/fs_procfsmeminfo.c
index 711d527..93985e2 100644
--- a/fs/procfs/fs_procfsmeminfo.c
+++ b/fs/procfs/fs_procfsmeminfo.c
@@ -171,6 +171,7 @@ static void meminfo_progmem(FAR struct progmem_info_s *progmem)
             }
 
           progmem->fordblks += pagesize;
+          progmem->ordblks++;
         }
       else if (status != 0)
         {