Compare commits
5 Commits
e52baafd29
...
9df7f05669
| Author | SHA1 | Date | |
|---|---|---|---|
| 9df7f05669 | |||
| 245d0e2740 | |||
| 1db63e19ed | |||
| b5e6b03ff8 | |||
| d8c2647e75 |
@@ -27,7 +27,8 @@ type HoldEntry = {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* One message offered to the application. A drain waits on it until the first of: `answered()`,
|
* One message offered to the application. A drain waits on it until the first of: `answered()`,
|
||||||
* every listener that took it rejecting, no listener taking it, its deadline, or the link going.
|
* every listener that took it rejecting, no listener taking it or one throwing, a later message on
|
||||||
|
* its sequence number, its deadline, or the link going.
|
||||||
*/
|
*/
|
||||||
export class MessageHold {
|
export class MessageHold {
|
||||||
private readonly entry: HoldEntry;
|
private readonly entry: HoldEntry;
|
||||||
@@ -55,7 +56,7 @@ export class MessageHold {
|
|||||||
if (this.working <= 0) this.answered();
|
if (this.working <= 0) this.answered();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** At once, for a message nobody took: that is not work a shutdown can wait for. */
|
/** At once, for a message nobody took or a listener threw on: that is not work a shutdown can wait for. */
|
||||||
release(): void {
|
release(): void {
|
||||||
this.entry.release();
|
this.entry.release();
|
||||||
}
|
}
|
||||||
@@ -96,7 +97,7 @@ export class HeldMessages {
|
|||||||
return this.held.full || this.held.weight >= this.maxOctets;
|
return this.held.full || this.held.weight >= this.maxOctets;
|
||||||
}
|
}
|
||||||
|
|
||||||
hold(pduObjs: PduObject[], listeners: number): MessageHold {
|
private hold(pduObjs: PduObject[], listeners: number): MessageHold {
|
||||||
const hold = new MessageHold({
|
const hold = new MessageHold({
|
||||||
isHeld: () => this.has(pduObjs),
|
isHeld: () => this.has(pduObjs),
|
||||||
release: () => { this.release(pduObjs); },
|
release: () => { this.release(pduObjs); },
|
||||||
@@ -123,13 +124,15 @@ export class HeldMessages {
|
|||||||
listeners: number,
|
listeners: number,
|
||||||
build: (hold: MessageHold) => T,
|
build: (hold: MessageHold) => T,
|
||||||
emit: (message: T) => boolean,
|
emit: (message: T) => boolean,
|
||||||
): void {
|
): MessageHold {
|
||||||
const hold = this.hold(pduObjs, listeners);
|
const hold = this.hold(pduObjs, listeners);
|
||||||
const message = build(hold);
|
const message = build(hold);
|
||||||
|
|
||||||
this.offered.set(message, hold);
|
this.offered.set(message, hold);
|
||||||
|
|
||||||
if (!emit(message)) hold.release();
|
if (!emit(message)) hold.release();
|
||||||
|
|
||||||
|
return hold;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** One listener gave up on a message; the last one to do so is what releases it. */
|
/** One listener gave up on a message; the last one to do so is what releases it. */
|
||||||
|
|||||||
+16
-11
@@ -5,6 +5,7 @@ import type { Collected, LostGroup } from '../src/reassembly.ts';
|
|||||||
import type { Dlr } from '../src/dlr.ts';
|
import type { Dlr } from '../src/dlr.ts';
|
||||||
import type { ErrorName } from '../src/defs/errors.ts';
|
import type { ErrorName } from '../src/defs/errors.ts';
|
||||||
import type { IncomingDeps } from '../src/incoming-requests.ts';
|
import type { IncomingDeps } from '../src/incoming-requests.ts';
|
||||||
|
import type { MessageHold } from '../src/held-messages.ts';
|
||||||
import type { MessageState } from '../src/defs/constants.ts';
|
import type { MessageState } from '../src/defs/constants.ts';
|
||||||
import type { MessageDlr } from '../src/session.ts';
|
import type { MessageDlr } from '../src/session.ts';
|
||||||
import type { PduObject, PduObjectInput } from '../src/pdu.ts';
|
import type { PduObject, PduObjectInput } from '../src/pdu.ts';
|
||||||
@@ -1518,12 +1519,16 @@ describe('held message bounds', () => {
|
|||||||
return [submitPdu(seqNr)];
|
return [submitPdu(seqNr)];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function offer(held: HeldMessages, seqNr: number): MessageHold {
|
||||||
|
return held.offer(message(seqNr), 1, () => ({}), () => true);
|
||||||
|
}
|
||||||
|
|
||||||
test('is full at its count, and a re-used sequence number replaces rather than adding', () => {
|
test('is full at its count, and a re-used sequence number replaces rather than adding', () => {
|
||||||
const held = new HeldMessages({ log: silentLog, max: 2, maxOctets: 1_000_000, timeout: 10_000 });
|
const held = new HeldMessages({ log: silentLog, max: 2, maxOctets: 1_000_000, timeout: 10_000 });
|
||||||
const first = held.hold(message(1), 1);
|
const first = offer(held, 1);
|
||||||
|
|
||||||
held.hold(message(2), 1);
|
offer(held, 2);
|
||||||
held.hold(message(2), 1);
|
offer(held, 2);
|
||||||
|
|
||||||
assert.equal(held.size, 2);
|
assert.equal(held.size, 2);
|
||||||
assert.equal(held.octetsHeld, 2 * 1026, 'the replaced message leaves its octets with it');
|
assert.equal(held.octetsHeld, 2 * 1026, 'the replaced message leaves its octets with it');
|
||||||
@@ -1537,22 +1542,22 @@ describe('held message bounds', () => {
|
|||||||
test('is full at its octet cap, until a message leaves by any way out', () => {
|
test('is full at its octet cap, until a message leaves by any way out', () => {
|
||||||
let now = 0;
|
let now = 0;
|
||||||
const held = new HeldMessages({ log: silentLog, max: 10, maxOctets: 2000, now: () => now, timeout: 10_000 });
|
const held = new HeldMessages({ log: silentLog, max: 10, maxOctets: 2000, now: () => now, timeout: 10_000 });
|
||||||
const answered = held.hold(message(1), 1);
|
const answered = offer(held, 1);
|
||||||
|
|
||||||
assert.equal(held.full(), false);
|
assert.equal(held.full(), false);
|
||||||
held.hold(message(2), 1);
|
offer(held, 2);
|
||||||
assert.equal(held.full(), true);
|
assert.equal(held.full(), true);
|
||||||
|
|
||||||
answered.release();
|
answered.release();
|
||||||
assert.equal(held.full(), false, 'after a release');
|
assert.equal(held.full(), false, 'after a release');
|
||||||
held.hold(message(3), 1);
|
offer(held, 3);
|
||||||
|
|
||||||
now = 20_000;
|
now = 20_000;
|
||||||
held.sweep();
|
held.sweep();
|
||||||
now = 0;
|
now = 0;
|
||||||
assert.equal(held.full(), false, 'after a sweep');
|
assert.equal(held.full(), false, 'after a sweep');
|
||||||
held.hold(message(4), 1);
|
offer(held, 4);
|
||||||
held.hold(message(5), 1);
|
offer(held, 5);
|
||||||
|
|
||||||
held.clear();
|
held.clear();
|
||||||
assert.equal(held.full(), false, 'after a clear');
|
assert.equal(held.full(), false, 'after a clear');
|
||||||
@@ -1641,11 +1646,11 @@ describe('held message bounds', () => {
|
|||||||
let now = 0;
|
let now = 0;
|
||||||
const held = new HeldMessages({ log: silentLog, max: 10, maxOctets: 1_000_000, now: () => now, timeout: 60 });
|
const held = new HeldMessages({ log: silentLog, max: 10, maxOctets: 1_000_000, now: () => now, timeout: 60 });
|
||||||
|
|
||||||
held.hold(message(1), 1);
|
offer(held, 1);
|
||||||
now = 61;
|
now = 61;
|
||||||
|
|
||||||
// The next message sweeps the one that expired, so only the new one is still waited for.
|
// The next message sweeps the one that expired, so only the new one is still waited for.
|
||||||
held.hold(message(2), 1);
|
offer(held, 2);
|
||||||
|
|
||||||
assert.equal(held.size, 1);
|
assert.equal(held.size, 1);
|
||||||
|
|
||||||
@@ -1657,7 +1662,7 @@ describe('held message bounds', () => {
|
|||||||
let now = 0;
|
let now = 0;
|
||||||
const held = new HeldMessages({ log: silentLog, max: 10, maxOctets: 1_000_000, now: () => now, timeout: 60 });
|
const held = new HeldMessages({ log: silentLog, max: 10, maxOctets: 1_000_000, now: () => now, timeout: 60 });
|
||||||
|
|
||||||
held.hold(message(1), 1);
|
offer(held, 1);
|
||||||
|
|
||||||
const waiting = held.idle(1000, undefined);
|
const waiting = held.idle(1000, undefined);
|
||||||
|
|
||||||
|
|||||||
@@ -265,6 +265,11 @@ and 5. Every seat ranked the session's lifecycle hardest and least wanted to mod
|
|||||||
so `"\x1B("` is detected as GSM, goes out as 0x1B 0x28 and arrives as `{`. From the
|
so `"\x1B("` is detected as GSM, goes out as 0x1B 0x28 and arrives as `{`. From the
|
||||||
2026-09-28 scoring run.
|
2026-09-28 scoring run.
|
||||||
|
|
||||||
|
- [ ] **Count an `sms` listener that throws as one giving up, as a rejection already is.** A
|
||||||
|
synchronous throw makes `Session.emit` return false, and `HeldMessages.offer()` then releases
|
||||||
|
the hold at once, so a drain stops waiting on an async listener still answering beside it.
|
||||||
|
Goal 2. From the stability review of #45.
|
||||||
|
|
||||||
### Throughput — goal 6, and the default window is where we are slowest
|
### Throughput — goal 6, and the default window is where we are slowest
|
||||||
|
|
||||||
- [ ] **Close the gap to jsmpp at `maxOutstanding: 10`.** Measured 2026-09-20 against the same sink,
|
- [ ] **Close the gap to jsmpp at `maxOutstanding: 10`.** Measured 2026-09-20 against the same sink,
|
||||||
|
|||||||
Reference in New Issue
Block a user