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

Move the memory check to a place where it is called once only per plot

This commit is contained in:
Holger Vogt 2026-04-24 15:21:34 +02:00
parent 215dd0e136
commit 08accebcd3
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/frontend/outitf.c
View File

@ -111,16 +111,40 @@ OUTpBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr,
int numNames, IFuid *dataNames, int dataType, runDesc **plotPtr)
{
char *name;
int ret, n;
runDesc* plot;
if (ft_curckt->ci_ckt == circuitPtr)
name = ft_curckt->ci_name;
else
name = "circuit name";
return (beginPlot(analysisPtr, circuitPtr, name,
ret = beginPlot(analysisPtr, circuitPtr, name,
analName, refName, refType, numNames,
dataNames, dataType, FALSE,
plotPtr));
plotPtr);
plot = *plotPtr;
n = plot->numData;
#ifndef __APPLE__
if (!cp_getvar("no_mem_check", CP_BOOL, NULL, 0)) {
/* Estimate the required memory */
int timesteps = vlength2delta(0);
size_t memrequ = (size_t)n * timesteps * sizeof(double);
size_t memavail = getAvailableMemorySize();
if (memrequ > memavail) {
fprintf(stderr, "\nError: memory required (%zu Bytes), made of\n"
" %d nodes and approximately %d time steps,\n"
" is more than the memory available (%zu Bytes)!\n",
memrequ, n, timesteps, memavail);
fprintf(stderr, "Setting the output memory is not possible.\n");
controlled_exit(1);
}
}
#endif
return ret;
}
@ -556,25 +580,6 @@ OUTpD_memory(runDesc *run, IFvalue *refValue, IFvalue *valuePtr)
{
int i, n = run->numData;
#ifndef __APPLE__
if (!cp_getvar("no_mem_check", CP_BOOL, NULL, 0)) {
/* Estimate the required memory */
int timesteps = vlength2delta(0);
size_t memrequ = (size_t)n * timesteps * sizeof(double);
size_t memavail = getAvailableMemorySize();
if (memrequ > memavail) {
fprintf(stderr, "\nError: memory required (%zu Bytes), made of\n"
" %d nodes and approximately %d time steps,\n"
" is more than the memory available (%zu Bytes)!\n",
memrequ, n, timesteps, memavail);
fprintf(stderr, "Setting the output memory is not possible.\n");
controlled_exit(1);
}
}
#endif
for (i = 0; i < n; i++) {
dataDesc *d;