From ecbbf77d1755a847c33a0d99b4a75414b79f3329 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Wed, 24 May 2006 06:14:22 +0000
Subject: [PATCH] Removed "xtrn_polls_before_yield", this is now handled in
exec/sbbsexec.ini (and it's yield interval, in milliseconds, now).
---
src/sbbs3/ctrl/MainFormUnit.cpp | 3 ---
src/sbbs3/ctrl/TelnetCfgDlgUnit.cpp | 6 +----
src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm | 38 +++++++----------------------
src/sbbs3/ctrl/TelnetCfgDlgUnit.h | 4 +--
src/sbbs3/main.cpp | 1 -
src/sbbs3/sbbs_ini.c | 6 -----
src/sbbs3/startup.h | 3 +--
src/sbbs3/xtrn.cpp | 8 +++---
8 files changed, 16 insertions(+), 53 deletions(-)
diff --git a/src/sbbs3/ctrl/MainFormUnit.cpp b/src/sbbs3/ctrl/MainFormUnit.cpp
index f5548ab7e5..6c43f4c482 100644
--- a/src/sbbs3/ctrl/MainFormUnit.cpp
+++ b/src/sbbs3/ctrl/MainFormUnit.cpp
@@ -1978,9 +1978,6 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender)
if(Registry->ValueExists("LastNode"))
bbs_startup.last_node=Registry->ReadInteger("LastNode");
- if(Registry->ValueExists("ExternalYield"))
- bbs_startup.xtrn_polls_before_yield=Registry->ReadInteger("ExternalYield");
-
if(Registry->ValueExists("OutbufHighwaterMark"))
bbs_startup.outbuf_highwater_mark=Registry->ReadInteger("OutbufHighwaterMark");
else
diff --git a/src/sbbs3/ctrl/TelnetCfgDlgUnit.cpp b/src/sbbs3/ctrl/TelnetCfgDlgUnit.cpp
index 22e6a2ddf9..7778b67ce1 100644
--- a/src/sbbs3/ctrl/TelnetCfgDlgUnit.cpp
+++ b/src/sbbs3/ctrl/TelnetCfgDlgUnit.cpp
@@ -6,7 +6,7 @@
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
* *
- * Copyright 2003 Rob Swindell - http://www.synchro.net/copyright.html *
+ * Copyright 2006 Rob Swindell - http://www.synchro.net/copyright.html *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
@@ -82,8 +82,6 @@ void __fastcall TTelnetCfgDlg::FormShow(TObject *Sender)
FirstNodeEdit->Text=AnsiString((int)MainForm->bbs_startup.first_node);
LastNodeEdit->Text=AnsiString((int)MainForm->bbs_startup.last_node);
- XtrnYieldEdit->Text=AnsiString(
- (int)MainForm->bbs_startup.xtrn_polls_before_yield);
AutoStartCheckBox->Checked=MainForm->SysAutoStart;
AnswerSoundEdit->Text=AnsiString(MainForm->bbs_startup.answer_sound);
HangupSoundEdit->Text=AnsiString(MainForm->bbs_startup.hangup_sound);
@@ -159,8 +157,6 @@ void __fastcall TTelnetCfgDlg::OKBtnClick(TObject *Sender)
MainForm->bbs_startup.first_node=FirstNodeEdit->Text.ToIntDef(1);
MainForm->bbs_startup.last_node=LastNodeEdit->Text.ToIntDef(1);
- MainForm->bbs_startup.xtrn_polls_before_yield
- =XtrnYieldEdit->Text.ToIntDef(10);
MainForm->SysAutoStart=AutoStartCheckBox->Checked;
SAFECOPY(MainForm->bbs_startup.answer_sound
diff --git a/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm b/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm
index 2a7f6ffb94..0d06fac76f 100644
--- a/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm
+++ b/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm
@@ -17,8 +17,8 @@ object TelnetCfgDlg: TTelnetCfgDlg
Top = 4
Width = 342
Height = 229
- ActivePage = SoundTabSheet
- TabIndex = 3
+ ActivePage = GeneralTabSheet
+ TabIndex = 0
TabOrder = 0
object GeneralTabSheet: TTabSheet
Caption = 'General'
@@ -38,14 +38,6 @@ object TelnetCfgDlg: TTelnetCfgDlg
AutoSize = False
Caption = 'Last Node'
end
- object XtrnPollsLabel: TLabel
- Left = 9
- Top = 76
- Width = 91
- Height = 25
- AutoSize = False
- Caption = 'External Yield'
- end
object AutoStartCheckBox: TCheckBox
Left = 182
Top = 12
@@ -55,7 +47,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
Caption = 'Auto Startup'
ParentShowHint = False
ShowHint = True
- TabOrder = 5
+ TabOrder = 4
end
object FirstNodeEdit: TEdit
Left = 105
@@ -76,7 +68,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
Caption = 'Minimize Externals'
ParentShowHint = False
ShowHint = True
- TabOrder = 6
+ TabOrder = 5
end
object LastNodeEdit: TEdit
Left = 105
@@ -97,7 +89,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
Caption = 'Hostname Lookup'
ParentShowHint = False
ShowHint = True
- TabOrder = 3
+ TabOrder = 2
end
object QWKEventsCheckBox: TCheckBox
Left = 182
@@ -108,7 +100,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
Caption = 'QWK Msg Events'
ParentShowHint = False
ShowHint = True
- TabOrder = 7
+ TabOrder = 6
end
object JavaScriptCheckBox: TCheckBox
Left = 182
@@ -119,19 +111,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
Caption = 'JavaScript Support'
ParentShowHint = False
ShowHint = True
- TabOrder = 8
- end
- object XtrnYieldEdit: TEdit
- Left = 105
- Top = 76
- Width = 48
- Height = 24
- Hint =
- 'Number of polls before yielding time-slices for external DOS/FOS' +
- 'SIL programs'
- ParentShowHint = False
- ShowHint = True
- TabOrder = 2
+ TabOrder = 7
end
object IdentityCheckBox: TCheckBox
Left = 9
@@ -142,7 +122,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
Caption = 'Identity Lookup'
ParentShowHint = False
ShowHint = True
- TabOrder = 4
+ TabOrder = 3
end
object EventsCheckBox: TCheckBox
Left = 182
@@ -153,7 +133,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
Caption = 'Events Enabled'
ParentShowHint = False
ShowHint = True
- TabOrder = 9
+ TabOrder = 8
end
end
object TelnetTabSheet: TTabSheet
diff --git a/src/sbbs3/ctrl/TelnetCfgDlgUnit.h b/src/sbbs3/ctrl/TelnetCfgDlgUnit.h
index bb1fa75f5f..0a1e03519a 100644
--- a/src/sbbs3/ctrl/TelnetCfgDlgUnit.h
+++ b/src/sbbs3/ctrl/TelnetCfgDlgUnit.h
@@ -6,7 +6,7 @@
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
* *
- * Copyright 2000 Rob Swindell - http://www.synchro.net/copyright.html *
+ * Copyright 2006 Rob Swindell - http://www.synchro.net/copyright.html *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
@@ -91,8 +91,6 @@ __published:
TCheckBox *RLogin2ndNameCheckBox;
TCheckBox *QWKEventsCheckBox;
TCheckBox *JavaScriptCheckBox;
- TLabel *XtrnPollsLabel;
- TEdit *XtrnYieldEdit;
TCheckBox *IdentityCheckBox;
TCheckBox *EventsCheckBox;
void __fastcall FormShow(TObject *Sender);
diff --git a/src/sbbs3/main.cpp b/src/sbbs3/main.cpp
index da51c9d26b..9348b9c204 100644
--- a/src/sbbs3/main.cpp
+++ b/src/sbbs3/main.cpp
@@ -3828,7 +3828,6 @@ void DLLCALL bbs_thread(void* arg)
/* Setup intelligent defaults */
if(startup->telnet_port==0) startup->telnet_port=IPPORT_TELNET;
if(startup->rlogin_port==0) startup->rlogin_port=513;
- if(startup->xtrn_polls_before_yield==0) startup->xtrn_polls_before_yield=10;
if(startup->outbuf_drain_timeout==0) startup->outbuf_drain_timeout=10;
if(startup->sem_chk_freq==0) startup->sem_chk_freq=2;
if(startup->temp_dir[0]) backslash(startup->temp_dir);
diff --git a/src/sbbs3/sbbs_ini.c b/src/sbbs3/sbbs_ini.c
index 46ca213e39..037a58683d 100644
--- a/src/sbbs3/sbbs_ini.c
+++ b/src/sbbs3/sbbs_ini.c
@@ -315,9 +315,6 @@ void sbbs_read_ini(
bbs->sem_chk_freq
=iniGetShortInt(list,section,strSemFileCheckFrequency,global->sem_chk_freq);
- bbs->xtrn_polls_before_yield
- =iniGetInteger(list,section,"ExternalYield",10);
-
/* JavaScript operating parameters */
sbbs_get_js_settings(list, section, &bbs->js, &global->js);
@@ -754,9 +751,6 @@ BOOL sbbs_write_ini(
else if(!iniSetBitField(lp,section,strLogMask,log_mask_bits,bbs->log_mask,&style))
break;
- if(!iniSetInteger(lp,section,"ExternalYield",bbs->xtrn_polls_before_yield,&style))
- break;
-
/* JavaScript operating parameters */
if(!sbbs_set_js_settings(lp,section,&bbs->js,&global->js,&style))
break;
diff --git a/src/sbbs3/startup.h b/src/sbbs3/startup.h
index 55f47954e1..8344dd25dd 100644
--- a/src/sbbs3/startup.h
+++ b/src/sbbs3/startup.h
@@ -8,7 +8,7 @@
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
* *
- * Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html *
+ * Copyright 2006 Rob Swindell - http://www.synchro.net/copyright.html *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
@@ -81,7 +81,6 @@ typedef struct {
DWORD telnet_interface;
DWORD options; /* See BBS_OPT definitions */
DWORD rlogin_interface;
- DWORD xtrn_polls_before_yield;
RingBuf** node_spybuf; /* Spy output buffer (each node) */
RingBuf** node_inbuf; /* User input buffer (each node) */
sem_t** node_spysem; /* Spy output semaphore (each node) */
diff --git a/src/sbbs3/xtrn.cpp b/src/sbbs3/xtrn.cpp
index 47173e5fc6..b443361c0d 100644
--- a/src/sbbs3/xtrn.cpp
+++ b/src/sbbs3/xtrn.cpp
@@ -526,8 +526,8 @@ int sbbs_t::external(const char* cmdline, long mode, const char* startup_dir)
i|=SBBSEXEC_MODE_DOS_IN;
if(mode&EX_OUTR)
i|=SBBSEXEC_MODE_DOS_OUT;
- sprintf(str," NT %u %u %u"
- ,cfg.node_num,i,startup->xtrn_polls_before_yield);
+ sprintf(str," NT %u %u"
+ ,cfg.node_num,i);
strcat(fullcmdline,str);
sprintf(str,"sbbsexec_hungup%d",cfg.node_num);
@@ -589,8 +589,8 @@ int sbbs_t::external(const char* cmdline, long mode, const char* startup_dir)
if(mode&EX_OUTR)
start.mode|=SBBSEXEC_MODE_DOS_OUT;
- sprintf(str," 95 %u %u %u"
- ,cfg.node_num,start.mode,startup->xtrn_polls_before_yield);
+ sprintf(str," 95 %u %u"
+ ,cfg.node_num,start.mode);
strcat(fullcmdline,str);
if(!DeviceIoControl(
--
GitLab