acassis commented on a change in pull request #5418: URL: https://github.com/apache/incubator-nuttx/pull/5418#discussion_r800225053
########## File path: include/sys/sysinfo.h ########## @@ -0,0 +1,78 @@ +/**************************************************************************** + * include/sys/sysinfo.h + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +#ifndef __INCLUDE_SYS_SYSINFO_H +#define __INCLUDE_SYS_SYSINFO_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/compiler.h> + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +#define SI_LOAD_SHIFT 16 + +/**************************************************************************** + * Type Definitions + ****************************************************************************/ + +struct sysinfo +{ + unsigned long uptime; + unsigned long loads[3]; + unsigned long totalram; + unsigned long freeram; + unsigned long sharedram; + unsigned long bufferram; + unsigned long totalswap; + unsigned long freeswap; + unsigned short procs; + unsigned short pad; + unsigned long totalhigh; + unsigned long freehigh; + unsigned mem_unit; + char __reserved[256]; +}; Review comment: Please include the comments, like in the man pages: ``` struct sysinfo { long uptime; /* Seconds since boot */ unsigned long loads[3]; /* 1, 5, and 15 minute load averages */ unsigned long totalram; /* Total usable main memory size */ unsigned long freeram; /* Available memory size */ unsigned long sharedram; /* Amount of shared memory */ unsigned long bufferram; /* Memory used by buffers */ unsigned long totalswap; /* Total swap space size */ unsigned long freeswap; /* Swap space still available */ unsigned short procs; /* Number of current processes */ unsigned long totalhigh; /* Total high memory size */ unsigned long freehigh; /* Available high memory size */ unsigned int mem_unit; /* Memory unit size in bytes */ char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding to 64 bytes */ }; ``` ########## File path: sched/sched/sched_sysinfo.c ########## @@ -0,0 +1,100 @@ +/**************************************************************************** + * sched/sched/sched_sysinfo.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <sys/sysinfo.h> +#include <sys/types.h> +#include <errno.h> +#include <string.h> + +#include <nuttx/clock.h> +#include <nuttx/kmalloc.h> +#include <nuttx/pgalloc.h> + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: sysinfo + * + * Description: + * sysinfo() returns certain statistics on memory and swap usage, + * as well as the load average. + * + ****************************************************************************/ + +int sysinfo(FAR struct sysinfo *info) +{ +#ifdef CONFIG_SCHED_CPULOAD + struct cpuload_s cpuload; +#endif +#ifdef CONFIG_MM_PGALLOC + struct pginfo_s pginfo; +#endif + struct mallinfo minfo; + + if (info == NULL) + { + set_errno(EINVAL); + return -1; + } + + memset(info, 0, sizeof(*info)); + +#ifdef CONFIG_SCHED_CPULOAD + clock_cpuload(0, &cpuload); + + info->loads[0] = ((cpuload.total - cpuload.active) << + SI_LOAD_SHIFT) / cpuload.total; + info->loads[1] = info->loads[0]; + info->loads[2] = info->loads[0]; Review comment: Should it have the logic for 5 and 15 minutes, case the current running time is more than 5 or more than 15 minutes? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
