Merge pull request #2200 from syuilo/use-deque

Use deque instead of linked list

src/daemons/notes-stats.ts

@@ -1,11 +1,11 @@
 import * as childProcess from 'child_process';
+import * as Deque from 'double-ended-queue';
 import Xev from 'xev';
-import Queue from '../misc/queue';
 
 const ev = new Xev();
 
 export default function() {
-	const log = new Queue<any>();
+	const log = new Deque<any>();
 
 	const p = childProcess.fork(__dirname + '/notes-stats-child.js');
 

src/daemons/server-stats.ts

@@ -1,8 +1,8 @@
 import * as os from 'os';
 import * as sysUtils from 'systeminformation';
 import * as diskusage from 'diskusage';
+import * as Deque from 'double-ended-queue';
 import Xev from 'xev';
-import Queue from '../misc/queue';
 const osUtils = require('os-utils');
 
 const ev = new Xev();
@@ -13,7 +13,7 @@ const interval = 1000;
  * Report server stats regularly
  */
 export default function() {
-	const log = new Queue<any>();
+	const log = new Deque<any>();
 
 	ev.on('requestServerStatsLog', id => {
 		ev.emit('serverStatsLog:' + id, log.toArray());

src/misc/queue.ts

@@ -1,33 +0,0 @@
-type Node<T> = { value: T, next: Node<T> };
-
-export default class Queue<T> {
-	private top: Node<T> = null;
-	private rear: Node<T> = null;
-	public length: number = 0;
-
-	public push(value: T): void {
-		const node: Node<T> = { value, next: null };
-		if (this.top === null) {
-			this.top = node;
-			this.rear = node;
-		} else {
-			this.rear.next = node;
-			this.rear = node;
-		}
-		this.length++;
-	}
-
-	public pop(): void {
-		this.top = this.top.next;
-		if (this.top == null) this.rear = null;
-		this.length--;
-	}
-
-	public toArray(): T[] {
-		const arr: T[] = Array<T>(this.length);
-		for (let node = this.top, i = 0; node !== null; node = node.next, i++) {
-			arr[i] = node.value;
-		}
-		return arr;
-	}
-}