gnustep/libs-ec
0
0
Fork 0
mirror of https://github.com/gnustep/libs-ec.git synced 2025-02-21 02:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ignore MemoryMaximum settings which are not at lewast 20% larger than the initial memory usage. Raise an alarm while the configuration is wrong.

Browse source
This commit is contained in:
Richard Frith-Macdonald 2023-01-21 19:45:49 +00:00
parent 97b7d55f3a
commit 6711fa677f
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
EcProcess.m
View file

@ -392,7 +392,7 @@ static NSTimeInterval initAt = 0.0;
static NSTimeInterval beganQuitting = 0.0; // Start of orderly shutdown static NSTimeInterval beganQuitting = 0.0; // Start of orderly shutdown
static BOOL ecQuitHandled = NO; // Has ecHandleQuit run? static BOOL ecQuitHandled = NO; // Has ecHandleQuit run?
static NSTimeInterval ecQuitLimit = 180.0; // Time allowed for quit static NSTimeInterval ecQuitLimit = 180.0; // Time allowed for quit
static NSInteger ecQuitStatus = 0; // Status for the quit static NSInteger ecQuitStatus = 0; // Status for the quit
static NSString *ecQuitReason = nil; // Reason for the quit static NSString *ecQuitReason = nil; // Reason for the quit
/* Test to see if the process is trying to quit gracefully. /* Test to see if the process is trying to quit gracefully.
@ -6300,10 +6300,20 @@ With two parameters ('maximum' and a number),\n\
if (minMax > (memMaximum * 1024 * 1024)) if (minMax > (memMaximum * 1024 * 1024))
{ {
unsigned long oldMaximum = (unsigned long)memMaximum;
memMaximum = 0; memMaximum = 0;
if (nil == raised) if (nil == raised)
{ {
EcAlarm *a; EcAlarm *a;
NSString *repair;
NSString *additional;
repair = [NSString stringWithFormat:
@"Reconfigure MemoryMaximum to good value (at least %luMiB)",
(unsigned long)(minMax / (1024 * 1024))];
additional = [NSString stringWithFormat:
@"configurated (%luMiB) ignored", oldMaximum];
a = [EcAlarm alarmForManagedObject: nil a = [EcAlarm alarmForManagedObject: nil
at: nil at: nil
@ -6311,8 +6321,8 @@ With two parameters ('maximum' and a number),\n\
probableCause: EcAlarmConfigurationOrCustomizationError probableCause: EcAlarmConfigurationOrCustomizationError
specificProblem: @"MemoryMaximum too low" specificProblem: @"MemoryMaximum too low"
perceivedSeverity: EcAlarmSeverityMajor perceivedSeverity: EcAlarmSeverityMajor
proposedRepairAction: @"Reconfigure MemoryMaximum to good value" proposedRepairAction: repair
additionalText: @"configuration ignored"]; additionalText: additional];
ASSIGN(raised, a); ASSIGN(raised, a);
[self alarm: raised]; [self alarm: raised];
} }