May 18, 2020 · May 18, 2020 · May 18, 2020 · May 18, 2020 · May 18, 2020
diff --git a/packages/statusbar/src/defaults/memoryUsage.tsx b/packages/statusbar/src/defaults/memoryUsage.tsx

 import { TextItem } from '..';

 import { nbresuse } from '../style/text';

 /**
 * A VDomRenderer for showing memory usage by a kernel.
 */
        this.model.units
      }`;
    }
    return <TextItem title="Current memory usage" source={text} />;
    if (!this.model.usageWarning) {
      return <TextItem title="Current memory usage" source={text} />;
    } else {
      return <TextItem title="Current memory usage" source={text} className={nbresuse} />;
    }
  }
 }

      return this._units;
    }

    /**
     * The warning for memory usage.
     */
    get usageWarning(): boolean {
      return this._warn;
    }

    /**
     * Dispose of the memory usage model.
     */
      const oldCurrentMemory = this._currentMemory;
      const oldMemoryLimit = this._memoryLimit;
      const oldUnits = this._units;
      const oldUsageWarning = this._warn;

      if (value === null) {
        this._metricsAvailable = false;
        this._currentMemory = 0;
        this._memoryLimit = null;
        this._units = 'B';
        this._warn = false;
      } else {
        const numBytes = value.rss;
        const memoryLimit = value.limits.memory
          ? value.limits.memory.rss
          : null;
        const [currentMemory, units] = Private.convertToLargestUnit(numBytes);
        const usageWarning = value.limits.memory.warn;

        this._metricsAvailable = true;
        this._currentMemory = currentMemory;
        this._units = units;
        this._memoryLimit = memoryLimit
          ? memoryLimit / Private.MEMORY_UNIT_LIMITS[units]
          : null;
        this._warn = usageWarning;
      }

      if (
        this._currentMemory !== oldCurrentMemory ||
        this._units !== oldUnits ||
        this._memoryLimit !== oldMemoryLimit ||
        this._metricsAvailable !== oldMetricsAvailable
        this._metricsAvailable !== oldMetricsAvailable ||
        this._warn !== oldUsageWarning
      ) {
        this.stateChanged.emit(void 0);
      }
    private _metricsAvailable: boolean = false;
    private _poll: Poll<Private.IMetricRequestResult | null>;
    private _units: MemoryUnit = 'B';
    private _warn: boolean = false;
  }

  /**
    limits: {
      memory?: {
        rss: number;
        warn?:number;
        warn?:boolean;
      };
    };
  }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,6 +13,8 @@ import { Poll } from '@lumino/polling';

		import { TextItem } from '..';

		import { nbresuse } from '../style/text';

		/**
		* A VDomRenderer for showing memory usage by a kernel.
		*/
Expand DownExpand Up		@@ -43,7 +45,11 @@ export class MemoryUsage extends VDomRenderer<MemoryUsage.Model> {
		this.model.units
		}`;
		}
		return <TextItem title="Current memory usage" source={text} />;
		if (!this.model.usageWarning) {
		return <TextItem title="Current memory usage" source={text} />;
		} else {
		return <TextItem title="Current memory usage" source={text} className={nbresuse} />;
		}
		}
		}

Expand DownExpand Up		@@ -119,6 +125,13 @@ export namespace MemoryUsage {
		return this._units;
		}

		/**
		* The warning for memory usage.
		*/
		get usageWarning(): boolean {
		return this._warn;
		}

		/**
		* Dispose of the memory usage model.
		*/
Expand All		@@ -137,32 +150,37 @@ export namespace MemoryUsage {
		const oldCurrentMemory = this._currentMemory;
		const oldMemoryLimit = this._memoryLimit;
		const oldUnits = this._units;
		const oldUsageWarning = this._warn;

		if (value === null) {
		this._metricsAvailable = false;
		this._currentMemory = 0;
		this._memoryLimit = null;
		this._units = 'B';
		this._warn = false;
		} else {
		const numBytes = value.rss;
		const memoryLimit = value.limits.memory
		? value.limits.memory.rss
		: null;
		const [currentMemory, units] = Private.convertToLargestUnit(numBytes);
		const usageWarning = value.limits.memory.warn;

		this._metricsAvailable = true;
		this._currentMemory = currentMemory;
		this._units = units;
		this._memoryLimit = memoryLimit
		? memoryLimit / Private.MEMORY_UNIT_LIMITS[units]
		: null;
		this._warn = usageWarning;
		}

		if (
		this._currentMemory !== oldCurrentMemory \|\|
		this._units !== oldUnits \|\|
		this._memoryLimit !== oldMemoryLimit \|\|
		this._metricsAvailable !== oldMetricsAvailable
		this._metricsAvailable !== oldMetricsAvailable \|\|
		this._warn !== oldUsageWarning
		) {
		this.stateChanged.emit(void 0);
		}
Expand All		@@ -173,6 +191,7 @@ export namespace MemoryUsage {
		private _metricsAvailable: boolean = false;
		private _poll: Poll<Private.IMetricRequestResult \| null>;
		private _units: MemoryUnit = 'B';
		private _warn: boolean = false;
		}

		/**
Expand DownExpand Up		@@ -271,7 +290,7 @@ namespace Private {
		limits: {
		memory?: {
		rss: number;
		warn?:number;
		warn?:boolean;
		};
		};
		}
Expand Down