luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#includes modified

This commit is contained in:
Jim Monte 2020-04-25 19:52:39 +02:00 committed by Holger Vogt
parent 72fad42dd0
commit de9b6ccf81
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/frontend/resource.c
View File

@ -61,13 +61,15 @@ static void fprintmem(FILE *stream, unsigned long long memory);
#if defined(HAVE_WIN32) || defined(HAVE__PROC_MEMINFO) #if defined(HAVE_WIN32) || defined(HAVE__PROC_MEMINFO)
static int get_procm(struct proc_mem *memall); static int get_procm(struct proc_mem *memall);
static int get_sysmem(struct sys_mem *memall);
struct sys_mem mem_t, mem_t_act; struct sys_mem mem_t, mem_t_act;
struct proc_mem mem_ng, mem_ng_act; struct proc_mem mem_ng, mem_ng_act;
#endif #endif
#if defined(HAVE_WIN32) && defined(SHARED_MODULE) && defined(__MINGW32__)
static int get_sysmem(struct sys_mem *memall);
#endif
void void
init_rlimits(void) init_rlimits(void)
@ -431,10 +433,13 @@ static int get_procm(struct proc_mem *memall) {
} else } else
return 0; return 0;
#else #else
/* Use Windows GlobalMemoryStatus or /proc/memory to obtain size of memory - not accurate */ /* Use Windows GlobalMemoryStatus or /proc/memory to obtain size of memory -
get_sysmem(&mem_t_act); /* size is the difference between free memory at start time and now */ * not accurate */
get_sysmem(&mem_t_act); /* size is the difference between free memory at
* start time and now */
if (mem_t.free > mem_t_act.free) /* it can happen that that ngspice is */ if (mem_t.free > mem_t_act.free) /* it can happen that that ngspice is */
memall->size = (mem_t.free - mem_t_act.free); /* to small compared to os memory usage */ memall->size = (mem_t.free - mem_t_act.free); /* too small compared to
* os memory usage */
else else
memall->size = 0; /* sure, it is more */ memall->size = 0; /* sure, it is more */
memall->resident = 0; memall->resident = 0;
@ -476,8 +481,8 @@ static int get_procm(struct proc_mem *memall) {
} }
static int #if defined(HAVE_WIN32) && defined(SHARED_MODULE) && defined(__MINGW32__)
get_sysmem(struct sys_mem *memall) static int get_sysmem(struct sys_mem *memall)
{ {
#ifdef HAVE_WIN32 #ifdef HAVE_WIN32
#if (_WIN32_WINNT >= 0x0500) #if (_WIN32_WINNT >= 0x0500)
@ -542,6 +547,7 @@ get_sysmem(struct sys_mem *memall)
#endif #endif
return 1; return 1;
} }
#endif
#else #else

2
src/frontend/resource.h
View File

@ -6,6 +6,8 @@
#ifndef ngspice_RESOURCE_H #ifndef ngspice_RESOURCE_H
#define ngspice_RESOURCE_H #define ngspice_RESOURCE_H
#include "ngspice/wordlist.h"
extern unsigned long long getMemorySize(void); extern unsigned long long getMemorySize(void);
extern unsigned long long getPeakRSS(void); extern unsigned long long getPeakRSS(void);
extern unsigned long long getCurrentRSS(void); extern unsigned long long getCurrentRSS(void);