ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.435 by root, Thu May 29 03:33:20 2008 UTC vs.
Revision 1.495 by root, Tue Nov 10 04:38:45 2009 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
39use Coro::AnyEvent; 44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
43use Coro::AnyEvent; 49use Coro::AnyEvent;
44use Coro::AIO; 50use Coro::AIO;
45use Coro::BDB; 51use Coro::BDB 1.6;
46use Coro::Storable; 52use Coro::Storable;
47use Coro::Util (); 53use Coro::Util ();
48 54
49use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
50use BDB (); 56use BDB ();
51use Data::Dumper; 57use Data::Dumper;
52use Digest::MD5; 58use Digest::MD5;
53use Fcntl; 59use Fcntl;
54use YAML (); 60use YAML::XS ();
55use IO::AIO (); 61use IO::AIO ();
56use Time::HiRes; 62use Time::HiRes;
57use Compress::LZF; 63use Compress::LZF;
58use Digest::MD5 (); 64use Digest::MD5 ();
59 65
61 67
62# configure various modules to our taste 68# configure various modules to our taste
63# 69#
64$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 71Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
72
73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
74
75# make sure c-lzf reinitialises itself
76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
67 78
68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
69 81
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 83
72our %COMMAND = (); 84our %COMMAND = ();
73our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
76our %EXTCMD = (); 88our %EXTCMD = ();
77our %EXTICMD = (); 89our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
80 92
81our $RELOAD; # number of reloads so far 93our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
83 97
84our $CONFDIR = confdir; 98our $CONFDIR = confdir;
85our $DATADIR = datadir; 99our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 103our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 104our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 106our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 107our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 108our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime";
111
95our %RESOURCE; 112our %RESOURCE;
96 113
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 116our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
101 118
102our $BDB_DEADLOCK_WATCHER; 119our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 120our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 121our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 122our $DB_ENV;
106 123
124our @EXTRA_MODULES = qw(pod match mapscript);
125
107our %CFG; 126our %CFG;
108 127
109our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 129our $RUNTIME;
111our $NOW; 130our $NOW;
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 139our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 140our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 141our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
124 143
144our @POST_INIT;
145
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :)
148
125binmode STDOUT; 149binmode STDOUT;
126binmode STDERR; 150binmode STDERR;
127 151
128# read virtual server time, if available 152# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 153unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 154 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
133} 157}
158
159eval "sub TICK() { $TICK } 1" or die;
134 160
135mkdir $_ 161mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 163
138our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
139 165
140sub cf::map::normalise; 166sub cf::map::normalise;
167
168#############################################################################
169
170%REFLECT = ();
171for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_;
173 $REFLECT{$reflect->{class}} = $reflect;
174}
175
176# this is decidedly evil
177$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
141 178
142############################################################################# 179#############################################################################
143 180
144=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
145 182
192returns directly I<after> the tick processing (and consequently, can only wake one process 229returns directly I<after> the tick processing (and consequently, can only wake one process
193per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 230per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
194 231
195=item @cf::INVOKE_RESULTS 232=item @cf::INVOKE_RESULTS
196 233
197This array contains the results of the last C<invoke ()> call. When 234This array contains the results of the last C<invoke ()> call. When
198C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call. 236that call.
200 237
238=item %cf::REFLECT
239
240Contains, for each (C++) class name, a hash reference with information
241about object members (methods, scalars, arrays and flags) and other
242metadata, which is useful for introspection.
243
201=back 244=back
202 245
203=cut 246=cut
204 247
205BEGIN { 248$Coro::State::WARNHOOK = sub {
206 *CORE::GLOBAL::warn = sub {
207 my $msg = join "", @_; 249 my $msg = join "", @_;
208 250
209 $msg .= "\n" 251 $msg .= "\n"
210 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
211 253
212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
213 255
214 LOG llevError, $msg; 256 LOG llevError, $msg;
215 }; 257};
216}
217 258
218$Coro::State::DIEHOOK = sub { 259$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 260 return unless $^S eq 0; # "eq", not "=="
261
262 warn Carp::longmess $_[0];
220 263
221 if ($Coro::current == $Coro::main) {#d# 264 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 266 return;#d#
224 }#d# 267 }#d#
225 268
226 # kill coroutine otherwise 269 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 270 Coro::terminate
229}; 271};
230
231$SIG{__DIE__} = sub { }; #d#?
232 272
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
243for my $pkg (qw( 283for my $pkg (qw(
244 cf::global cf::attachable 284 cf::global cf::attachable
245 cf::object cf::object::player 285 cf::object cf::object::player
246 cf::client cf::player 286 cf::client cf::player
247 cf::arch cf::living 287 cf::arch cf::living
288 cf::map cf::mapspace
248 cf::map cf::party cf::region 289 cf::party cf::region
249)) { 290)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 292}
253 293
254$EV::DIED = sub { 294$EV::DIED = sub {
255 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
256}; 296};
257 297
258############################################################################# 298#############################################################################
259 299
260=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298 338
299sub encode_json($) { $json_coder->encode ($_[0]) } 339sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 340sub decode_json($) { $json_coder->decode ($_[0]) }
301 341
342=item cf::post_init { BLOCK }
343
344Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again.
346
347The cdoeblock will have a single boolean argument to indicate whether this
348is a reload or not.
349
350=cut
351
352sub post_init(&) {
353 push @POST_INIT, shift;
354}
355
302=item cf::lock_wait $string 356=item cf::lock_wait $string
303 357
304Wait until the given lock is available. See cf::lock_acquire. 358Wait until the given lock is available. See cf::lock_acquire.
305 359
306=item my $lock = cf::lock_acquire $string 360=item my $lock = cf::lock_acquire $string
307 361
308Wait until the given lock is available and then acquires it and returns 362Wait until the given lock is available and then acquires it and returns
309a Coro::guard object. If the guard object gets destroyed (goes out of scope, 363a L<Guard> object. If the guard object gets destroyed (goes out of scope,
310for example when the coroutine gets canceled), the lock is automatically 364for example when the coroutine gets canceled), the lock is automatically
311returned. 365returned.
312 366
313Locks are *not* recursive, locking from the same coro twice results in a 367Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro. 368deadlocked coro.
320 374
321Return true if the lock is currently active, i.e. somebody has locked it. 375Return true if the lock is currently active, i.e. somebody has locked it.
322 376
323=cut 377=cut
324 378
325our %LOCK; 379our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 380
328sub lock_wait($) { 381sub lock_wait($) {
329 my ($key) = @_; 382 $LOCKS->wait ($_[0]);
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
335
336 # wait for lock, if any
337 while ($LOCK{$key}) {
338 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule;
340 }
341} 383}
342 384
343sub lock_acquire($) { 385sub lock_acquire($) {
344 my ($key) = @_; 386 $LOCKS->guard ($_[0])
345
346 # wait, to be sure we are not locked
347 lock_wait $key;
348
349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
351
352 Coro::guard {
353 delete $LOCKER{$key};#d#
354 # wake up all waiters, to be on the safe side
355 $_->ready for @{ delete $LOCK{$key} };
356 }
357} 387}
358 388
359sub lock_active($) { 389sub lock_active($) {
360 my ($key) = @_; 390 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 391}
364 392
365sub freeze_mainloop { 393sub freeze_mainloop {
366 tick_inhibit_inc; 394 tick_inhibit_inc;
367 395
368 Coro::guard \&tick_inhibit_dec; 396 &Guard::guard (\&tick_inhibit_dec);
369} 397}
370 398
371=item cf::periodic $interval, $cb 399=item cf::periodic $interval, $cb
372 400
373Like EV::periodic, but randomly selects a starting point so that the actions 401Like EV::periodic, but randomly selects a starting point so that the actions
725 753
726############################################################################# 754#############################################################################
727 755
728=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
729 757
730Many objects in crossfire are so-called attachable objects. That means you can 758Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
733 761
734In the following description, CLASS can be any of C<global>, C<object> 762In the following description, CLASS can be any of C<global>, C<object>
735C<player>, C<client> or C<map> (i.e. the attachable objects in 763C<player>, C<client> or C<map> (i.e. the attachable objects in
785=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
786 814
787Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
789 817
790Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 819that are attached at load/instantiate time, thus the need for a name.
792 820
793These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
794 822
795=over 4 823=over 4
1086 1114
1087sub reattach { 1115sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1117 my ($obj) = @_;
1090 1118
1119 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1120 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1121
1093 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
1094 1123
1095 @$registry = (); 1124 @$registry = ();
1096 1125
1144 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1145 1174
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1176 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 aio_fsync $fh if $cf::USE_FSYNC; 1178 if ($cf::USE_FSYNC) {
1179 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1180 aio_fsync $fh;
1181 }
1150 aio_close $fh; 1182 aio_close $fh;
1151 1183
1152 if (@$objs) { 1184 if (@$objs) {
1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1185 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1186 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
1157 aio_fsync $fh if $cf::USE_FSYNC; 1189 if ($cf::USE_FSYNC) {
1190 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1191 aio_fsync $fh;
1192 }
1158 aio_close $fh; 1193 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1195 }
1161 } else { 1196 } else {
1162 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
1163 } 1198 }
1164 1199
1165 aio_rename "$filename~", $filename; 1200 aio_rename "$filename~", $filename;
1201
1202 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1204 } else {
1167 warn "FATAL: $filename~: $!\n"; 1205 warn "unable to save objects: $filename~: $!\n";
1168 } 1206 }
1169 } else { 1207 } else {
1170 aio_unlink $filename; 1208 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1209 aio_unlink "$filename.pst";
1172 } 1210 }
1263 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
1264 1302
1265 $EXTICMD{$name} = $cb; 1303 $EXTICMD{$name} = $cb;
1266} 1304}
1267 1305
1306use File::Glob ();
1307
1268cf::player->attach ( 1308cf::player->attach (
1269 on_command => sub { 1309 on_command => sub {
1270 my ($pl, $name, $params) = @_; 1310 my ($pl, $name, $params) = @_;
1271 1311
1272 my $cb = $COMMAND{$name} 1312 my $cb = $COMMAND{$name}
1304 1344
1305 cf::override; 1345 cf::override;
1306 }, 1346 },
1307); 1347);
1308 1348
1349# "readahead" all extensions
1350sub cache_extensions {
1351 my $grp = IO::AIO::aio_group;
1352
1353 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1354 for (grep /\.ext$/, @{$_[0]}) {
1355 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1356 }
1357 };
1358
1359 $grp
1360}
1361
1309sub load_extensions { 1362sub load_extensions {
1310 cf::sync_job { 1363 cf::sync_job {
1311 my %todo; 1364 my %todo;
1312 1365
1313 for my $path (<$LIBDIR/*.ext>) { 1366 for my $path (<$LIBDIR/*.ext>) {
1332 1385
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1388
1336 $ext{source} = 1389 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1391 . "#line 1 \"$path\"\n{\n"
1339 . $source 1392 . $source
1340 . "\n};\n1"; 1393 . "\n};\n1";
1341 1394
1342 $todo{$base} = \%ext; 1395 $todo{$base} = \%ext;
1382 1435
1383=back 1436=back
1384 1437
1385=head2 CORE EXTENSIONS 1438=head2 CORE EXTENSIONS
1386 1439
1387Functions and methods that extend core crossfire objects. 1440Functions and methods that extend core deliantra objects.
1388 1441
1389=cut 1442=cut
1390 1443
1391package cf::player; 1444package cf::player;
1392 1445
1435 1488
1436sub exists($) { 1489sub exists($) {
1437 my ($login) = @_; 1490 my ($login) = @_;
1438 1491
1439 $cf::PLAYER{$login} 1492 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1493 or !aio_stat path $login
1441} 1494}
1442 1495
1443sub find($) { 1496sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1497 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1498 my $login = $_[0];
1520 my ($pl) = @_; 1573 my ($pl) = @_;
1521 1574
1522 my $name = $pl->ob->name; 1575 my $name = $pl->ob->name;
1523 1576
1524 $pl->{deny_save} = 1; 1577 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1579
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1581 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score; 1583 $pl->ob->check_score;
1616 } 1669 }
1617 1670
1618 \@paths 1671 \@paths
1619} 1672}
1620 1673
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1674=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1675
1623Expand crossfire pod fragments into protocol xml. 1676Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713 1677
1714=item $player->ext_reply ($msgid, @msg) 1678=item $player->ext_reply ($msgid, @msg)
1715 1679
1716Sends an ext reply to the player. 1680Sends an ext reply to the player.
1717 1681
1930 1894
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1933} 1897}
1934 1898
1935# and all this just because we cannot iterate over
1936# all maps in C++...
1937sub change_all_map_light {
1938 my ($change) = @_;
1939
1940 $_->change_map_light ($change)
1941 for grep $_->outdoor, values %cf::MAP;
1942}
1943
1944sub decay_objects { 1899sub decay_objects {
1945 my ($self) = @_; 1900 my ($self) = @_;
1946 1901
1947 return if $self->{deny_reset}; 1902 return if $self->{deny_reset};
1948 1903
2030sub find { 1985sub find {
2031 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
2032 1987
2033 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
2034 1989
2035 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
2037 1992
2038 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
2043 or return; 1995 or return;
2044 1996
2045 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
2046 1998
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2038 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2039 $f->skip_block;
2088 $self->_load_objects ($f) 2040 $self->_load_objects ($f)
2089 or return; 2041 or return;
2090 2042
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2043 $self->post_load_original
2092 if delete $self->{load_original}; 2044 if delete $self->{load_original};
2093 2045
2094 if (my $uniq = $self->uniq_path) { 2046 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2047 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2048 unless (aio_stat $uniq) {
2114 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2067 $self->decay_objects;
2116 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
2117 $self->update_buttons; 2069 $self->update_buttons;
2118 cf::cede_to_tick; 2070 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2071 $self->activate;
2122 } 2072 }
2123 2073
2124 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
2291 2241
2292 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293 2243
2294 return if $self->players; 2244 return if $self->players;
2295 2245
2296 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2297 2247
2298 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2299 2249
2300 # need to save uniques path 2250 # need to save uniques path
2301 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
2392 : normalise $_ 2342 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2344 ]
2395} 2345}
2396 2346
2347=item cf::map::static_maps
2348
2349Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2350file in the shared directory excluding F</styles> and F</editor>). May
2351block.
2352
2353=cut
2354
2355sub static_maps() {
2356 my @dirs = "";
2357 my @maps;
2358
2359 while (@dirs) {
2360 my $dir = shift @dirs;
2361
2362 next if $dir eq "/styles" || $dir eq "/editor";
2363
2364 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2365 or return;
2366
2367 for (@$files) {
2368 s/\.map$// or next;
2369 utf8::decode $_;
2370 push @maps, "$dir/$_";
2371 }
2372
2373 push @dirs, map "$dir/$_", @$dirs;
2374 }
2375
2376 \@maps
2377}
2378
2397=back 2379=back
2398 2380
2399=head3 cf::object 2381=head3 cf::object
2400 2382
2401=cut 2383=cut
2466 2448
2467our $SAY_CHANNEL = { 2449our $SAY_CHANNEL = {
2468 id => "say", 2450 id => "say",
2469 title => "Map", 2451 title => "Map",
2470 reply => "say ", 2452 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2453 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2454};
2473 2455
2474our $CHAT_CHANNEL = { 2456our $CHAT_CHANNEL = {
2475 id => "chat", 2457 id => "chat",
2476 title => "Chat", 2458 title => "Chat",
2531 2513
2532=item $player_object->enter_link 2514=item $player_object->enter_link
2533 2515
2534Freezes the player and moves him/her to a special map (C<{link}>). 2516Freezes the player and moves him/her to a special map (C<{link}>).
2535 2517
2536The player should be reasonably safe there for short amounts of time. You 2518The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2519for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link
2521map.
2538 2522
2539Will never block. 2523Will never block.
2540 2524
2541=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2542 2526
2594 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2596 2580
2597 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2600 2584
2601 $map->load; 2585 $map->load;
2602 $map->load_neighbours; 2586 $map->load_neighbours;
2603 2587
2604 return unless $self->contr->active; 2588 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2589
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
2592
2593 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive;
2609} 2595}
2610 2596
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2612 2598
2613Moves the player to the given map-path and coordinates by first freezing 2599Moves the player to the given map-path and coordinates by first freezing
2614her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2615that has to return the map if sucecssful, and then unfreezes the player on 2601that has to return the map if sucecssful, and then unfreezes the player on
2616the new (success) or old (failed) map position. In either case, $done will 2602the new (success) or old (failed) map position. In either case, $done will
2617be called at the end of this process. 2603be called at the end of this process.
2604
2605Note that $check will be called with a potentially non-loaded map, so if
2606it needs a loaded map it has to call C<< ->load >>.
2618 2607
2619=cut 2608=cut
2620 2609
2621our $GOTOGEN; 2610our $GOTOGEN;
2622 2611
2769 $self->contr->savebed ($map, $x, $y) 2758 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED); 2759 if $exit->flag (cf::FLAG_DAMNED);
2771 2760
2772 1 2761 1
2773 }) { 2762 }) {
2774 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2775 . "I'll try to bring you back to the map you were before. " 2764 . "I'll try to bring you back to the map you were before. "
2776 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2777 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2778 2767
2779 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
2796sub cf::client::send_drawinfo { 2785sub cf::client::send_drawinfo {
2797 my ($self, $text, $flags) = @_; 2786 my ($self, $text, $flags) = @_;
2798 2787
2799 utf8::encode $text; 2788 utf8::encode $text;
2800 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2790}
2791
2792=item $client->send_big_packet ($pkt)
2793
2794Like C<send_packet>, but tries to compress large packets, and fragments
2795them as required.
2796
2797=cut
2798
2799our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2800
2801sub cf::client::send_big_packet {
2802 my ($self, $pkt) = @_;
2803
2804 # try lzf for large packets
2805 $pkt = "lzf " . Compress::LZF::compress $pkt
2806 if 1024 <= length $pkt and $self->{can_lzf};
2807
2808 # split very large packets
2809 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2810 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2811 $pkt = "frag";
2812 }
2813
2814 $self->send_packet ($pkt);
2801} 2815}
2802 2816
2803=item $client->send_msg ($channel, $msg, $color, [extra...]) 2817=item $client->send_msg ($channel, $msg, $color, [extra...])
2804 2818
2805Send a drawinfo or msg packet to the client, formatting the msg for the 2819Send a drawinfo or msg packet to the client, formatting the msg for the
2809 2823
2810=cut 2824=cut
2811 2825
2812# non-persistent channels (usually the info channel) 2826# non-persistent channels (usually the info channel)
2813our %CHANNEL = ( 2827our %CHANNEL = (
2828 "c/motd" => {
2829 id => "infobox",
2830 title => "MOTD",
2831 reply => undef,
2832 tooltip => "The message of the day",
2833 },
2814 "c/identify" => { 2834 "c/identify" => {
2815 id => "infobox", 2835 id => "infobox",
2816 title => "Identify", 2836 title => "Identify",
2817 reply => undef, 2837 reply => undef,
2818 tooltip => "Items recently identified", 2838 tooltip => "Items recently identified",
2820 "c/examine" => { 2840 "c/examine" => {
2821 id => "infobox", 2841 id => "infobox",
2822 title => "Examine", 2842 title => "Examine",
2823 reply => undef, 2843 reply => undef,
2824 tooltip => "Signs and other items you examined", 2844 tooltip => "Signs and other items you examined",
2845 },
2846 "c/shopinfo" => {
2847 id => "infobox",
2848 title => "Shop Info",
2849 reply => undef,
2850 tooltip => "What your bargaining skill tells you about the shop",
2825 }, 2851 },
2826 "c/book" => { 2852 "c/book" => {
2827 id => "infobox", 2853 id => "infobox",
2828 title => "Book", 2854 title => "Book",
2829 reply => undef, 2855 reply => undef,
2845 id => "infobox", 2871 id => "infobox",
2846 title => "Body Parts", 2872 title => "Body Parts",
2847 reply => undef, 2873 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available", 2874 tooltip => "Shows which body parts you posess and are available",
2849 }, 2875 },
2876 "c/statistics" => {
2877 id => "infobox",
2878 title => "Statistics",
2879 reply => undef,
2880 tooltip => "Shows your primary statistics",
2881 },
2882 "c/skills" => {
2883 id => "infobox",
2884 title => "Skills",
2885 reply => undef,
2886 tooltip => "Shows your experience per skill and item power",
2887 },
2888 "c/shopitems" => {
2889 id => "infobox",
2890 title => "Shop Items",
2891 reply => undef,
2892 tooltip => "Shows the items currently for sale in this shop",
2893 },
2894 "c/resistances" => {
2895 id => "infobox",
2896 title => "Resistances",
2897 reply => undef,
2898 tooltip => "Shows your resistances",
2899 },
2900 "c/pets" => {
2901 id => "infobox",
2902 title => "Pets",
2903 reply => undef,
2904 tooltip => "Shows information abotu your pets/a specific pet",
2905 },
2906 "c/perceiveself" => {
2907 id => "infobox",
2908 title => "Perceive Self",
2909 reply => undef,
2910 tooltip => "You gained detailed knowledge about yourself",
2911 },
2850 "c/uptime" => { 2912 "c/uptime" => {
2851 id => "infobox", 2913 id => "infobox",
2852 title => "Uptime", 2914 title => "Uptime",
2853 reply => undef, 2915 reply => undef,
2854 tooltip => "How long the server has been running since last restart", 2916 tooltip => "How long the server has been running since last restart",
2863 id => "party", 2925 id => "party",
2864 title => "Party", 2926 title => "Party",
2865 reply => "gsay ", 2927 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party", 2928 tooltip => "Messages and chat related to your party",
2867 }, 2929 },
2930 "c/death" => {
2931 id => "death",
2932 title => "Death",
2933 reply => undef,
2934 tooltip => "Reason for and more info about your most recent death",
2935 },
2936 "c/say" => $SAY_CHANNEL,
2937 "c/chat" => $CHAT_CHANNEL,
2868); 2938);
2869 2939
2870sub cf::client::send_msg { 2940sub cf::client::send_msg {
2871 my ($self, $channel, $msg, $color, @extra) = @_; 2941 my ($self, $channel, $msg, $color, @extra) = @_;
2872 2942
2873 $msg = $self->pl->expand_cfpod ($msg); 2943 $msg = $self->pl->expand_cfpod ($msg)
2944 unless $color & cf::NDI_VERBATIM;
2874 2945
2875 $color &= cf::NDI_CLIENT_MASK; # just in case... 2946 $color &= cf::NDI_CLIENT_MASK; # just in case...
2876 2947
2877 # check predefined channels, for the benefit of C 2948 # check predefined channels, for the benefit of C
2878 if ($CHANNEL{$channel}) { 2949 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel}; 2950 $channel = $CHANNEL{$channel};
2880 2951
2881 $self->ext_msg (channel_info => $channel) 2952 $self->ext_msg (channel_info => $channel);
2882 if $self->can_msg;
2883
2884 $channel = $channel->{id}; 2953 $channel = $channel->{id};
2885 2954
2886 } elsif (ref $channel) { 2955 } elsif (ref $channel) {
2887 # send meta info to client, if not yet sent 2956 # send meta info to client, if not yet sent
2888 unless (exists $self->{channel}{$channel->{id}}) { 2957 unless (exists $self->{channel}{$channel->{id}}) {
2889 $self->{channel}{$channel->{id}} = $channel; 2958 $self->{channel}{$channel->{id}} = $channel;
2890 $self->ext_msg (channel_info => $channel) 2959 $self->ext_msg (channel_info => $channel);
2891 if $self->can_msg;
2892 } 2960 }
2893 2961
2894 $channel = $channel->{id}; 2962 $channel = $channel->{id};
2895 } 2963 }
2896 2964
2897 return unless @extra || length $msg; 2965 return unless @extra || length $msg;
2898 2966
2899 if ($self->can_msg) {
2900 # default colour, mask it out 2967 # default colour, mask it out
2901 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2968 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2902 if $color & cf::NDI_DEF; 2969 if $color & cf::NDI_DEF;
2903 2970
2904 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2971 my $pkt = "msg "
2972 . $self->{json_coder}->encode (
2905 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2973 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2906 } else { 2974 );
2907 if ($color >= 0) {
2908 # replace some tags by gcfclient-compatible ones
2909 for ($msg) {
2910 1 while
2911 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2912 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2913 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2914 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2915 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2916 }
2917 2975
2918 $color &= cf::NDI_COLOR_MASK; 2976 $self->send_big_packet ($pkt);
2919
2920 utf8::encode $msg;
2921
2922 if (0 && $msg =~ /\[/) {
2923 # COMMAND/INFO
2924 $self->send_packet ("drawextinfo $color 10 8 $msg")
2925 } else {
2926 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2927 $self->send_packet ("drawinfo $color $msg")
2928 }
2929 }
2930 }
2931} 2977}
2932 2978
2933=item $client->ext_msg ($type, @msg) 2979=item $client->ext_msg ($type, @msg)
2934 2980
2935Sends an ext event to the client. 2981Sends an ext event to the client.
2938 2984
2939sub cf::client::ext_msg($$@) { 2985sub cf::client::ext_msg($$@) {
2940 my ($self, $type, @msg) = @_; 2986 my ($self, $type, @msg) = @_;
2941 2987
2942 if ($self->extcmd == 2) { 2988 if ($self->extcmd == 2) {
2943 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2944 } elsif ($self->extcmd == 1) { # TODO: remove 2990 } elsif ($self->extcmd == 1) { # TODO: remove
2945 push @msg, msgtype => "event_$type"; 2991 push @msg, msgtype => "event_$type";
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 } 2993 }
2948} 2994}
2949 2995
2950=item $client->ext_reply ($msgid, @msg) 2996=item $client->ext_reply ($msgid, @msg)
2951 2997
2955 3001
2956sub cf::client::ext_reply($$@) { 3002sub cf::client::ext_reply($$@) {
2957 my ($self, $id, @msg) = @_; 3003 my ($self, $id, @msg) = @_;
2958 3004
2959 if ($self->extcmd == 2) { 3005 if ($self->extcmd == 2) {
2960 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2961 } elsif ($self->extcmd == 1) { 3007 } elsif ($self->extcmd == 1) {
2962 #TODO: version 1, remove 3008 #TODO: version 1, remove
2963 unshift @msg, msgtype => "reply", msgid => $id; 3009 unshift @msg, msgtype => "reply", msgid => $id;
2964 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2965 } 3011 }
2966} 3012}
2967 3013
2968=item $success = $client->query ($flags, "text", \&cb) 3014=item $success = $client->query ($flags, "text", \&cb)
2969 3015
3110The following functions and methods are available within a safe environment: 3156The following functions and methods are available within a safe environment:
3111 3157
3112 cf::object 3158 cf::object
3113 contr pay_amount pay_player map x y force_find force_add destroy 3159 contr pay_amount pay_player map x y force_find force_add destroy
3114 insert remove name archname title slaying race decrease split 3160 insert remove name archname title slaying race decrease split
3161 value
3115 3162
3116 cf::object::player 3163 cf::object::player
3117 player 3164 player
3118 3165
3119 cf::player 3166 cf::player
3125=cut 3172=cut
3126 3173
3127for ( 3174for (
3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3175 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3129 insert remove inv nrof name archname title slaying race 3176 insert remove inv nrof name archname title slaying race
3130 decrease split destroy)], 3177 decrease split destroy change_exp value msg lore send_msg)],
3131 ["cf::object::player" => qw(player)], 3178 ["cf::object::player" => qw(player)],
3132 ["cf::player" => qw(peaceful)], 3179 ["cf::player" => qw(peaceful send_msg)],
3133 ["cf::map" => qw(trigger)], 3180 ["cf::map" => qw(trigger)],
3134) { 3181) {
3135 no strict 'refs'; 3182 no strict 'refs';
3136 my ($pkg, @funs) = @$_; 3183 my ($pkg, @funs) = @$_;
3137 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3154 my ($code, %vars) = @_; 3201 my ($code, %vars) = @_;
3155 3202
3156 my $qcode = $code; 3203 my $qcode = $code;
3157 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3158 $qcode =~ s/\n/\\n/g; 3205 $qcode =~ s/\n/\\n/g;
3206
3207 %vars = (_dummy => 0) unless %vars;
3159 3208
3160 local $_; 3209 local $_;
3161 local @safe::cf::_safe_eval_args = values %vars; 3210 local @safe::cf::_safe_eval_args = values %vars;
3162 3211
3163 my $eval = 3212 my $eval =
3393 reload_treasures; 3442 reload_treasures;
3394 3443
3395 warn "finished reloading resource files\n"; 3444 warn "finished reloading resource files\n";
3396} 3445}
3397 3446
3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
3403 reload_resources;
3404}
3405
3406sub reload_config { 3447sub reload_config {
3448 warn "reloading config file...\n";
3449
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3450 open my $fh, "<:utf8", "$CONFDIR/config"
3408 or return; 3451 or return;
3409 3452
3410 local $/; 3453 local $/;
3411 *CFG = YAML::Load <$fh>; 3454 *CFG = YAML::XS::Load scalar <$fh>;
3412 3455
3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3414 3457
3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3420 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3421 and die "WARNING: m(un)lockall failed: $!\n"; 3464 and die "WARNING: m(un)lockall failed: $!\n";
3422 }; 3465 };
3423 warn $@ if $@; 3466 warn $@ if $@;
3424 } 3467 }
3468
3469 warn "finished reloading resource files\n";
3470}
3471
3472sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!";
3475 flock $fh, &Fcntl::LOCK_EX
3476 or die "$PIDFILE: flock: $!";
3477 $fh
3478}
3479
3480# make sure only one server instance is running at any one time
3481sub atomic {
3482 my $fh = pidfile;
3483
3484 my $pid = <$fh>;
3485 kill 9, $pid if $pid > 0;
3486
3487 seek $fh, 0, 0;
3488 print $fh $$;
3489}
3490
3491sub main_loop {
3492 warn "EV::loop starting\n";
3493 if (1) {
3494 EV::loop;
3495 }
3496 warn "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP;
3425} 3498}
3426 3499
3427sub main { 3500sub main {
3501 cf::init_globals; # initialise logging
3502
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514
3428 # we must not ever block the main coroutine 3515 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3516 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3517 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3518 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3519 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3520 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3521 })->prio (Coro::PRIO_MAX);
3435 }; 3522 };
3436 3523
3437 { 3524 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3525
3526 cf::sync_job {
3527 cf::load_settings;
3528 cf::load_materials;
3529
3530 reload_resources;
3439 reload_config; 3531 reload_config;
3440 db_init; 3532 db_init;
3533
3534 cf::init_uuid;
3535 cf::init_signals;
3536 cf::init_commands;
3537 cf::init_skills;
3538
3539 cf::init_beforeplay;
3540
3541 atomic;
3542
3441 load_extensions; 3543 load_extensions;
3442 3544
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3545 utime time, time, $RUNTIMEFILE;
3546
3547 # no (long-running) fork's whatsoever before this point(!)
3548 use POSIX ();
3549 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3550
3551 (pop @POST_INIT)->(0) while @POST_INIT;
3444 } 3552 };
3445 3553
3446 EV::loop; 3554 main_loop;
3447} 3555}
3448 3556
3449############################################################################# 3557#############################################################################
3450# initialisation and cleanup 3558# initialisation and cleanup
3451 3559
3458 }; 3566 };
3459 } 3567 }
3460} 3568}
3461 3569
3462sub write_runtime_sync { 3570sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime";
3464
3465 # first touch the runtime file to show we are still running: 3571 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3572 # the fsync below can take a very very long time.
3467 3573
3468 IO::AIO::aio_utime $runtime, undef, undef; 3574 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3575
3470 my $guard = cf::lock_acquire "write_runtime"; 3576 my $guard = cf::lock_acquire "write_runtime";
3471 3577
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3578 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3473 or return; 3579 or return;
3474 3580
3475 my $value = $cf::RUNTIME + 90 + 10; 3581 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3582 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3583 # 60 allows for the watchdog to kill the server.
3487 aio_utime $fh, undef, undef; 3593 aio_utime $fh, undef, undef;
3488 3594
3489 close $fh 3595 close $fh
3490 or return; 3596 or return;
3491 3597
3492 aio_rename "$runtime~", $runtime 3598 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3599 and return;
3494 3600
3495 warn "runtime file written.\n"; 3601 warn "runtime file written.\n";
3496 3602
3497 1 3603 1
3509 my $uuid = "$LOCALDIR/uuid"; 3615 my $uuid = "$LOCALDIR/uuid";
3510 3616
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3617 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3618 or return;
3513 3619
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3620 my $value = uuid_seq uuid_cur;
3621
3622 unless ($value) {
3623 warn "cowardly refusing to write zero uuid value!\n";
3624 return;
3625 }
3626
3627 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3628 $uuid_skip = 0;
3516 3629
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3630 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3631 and return;
3519 3632
3541} 3654}
3542 3655
3543sub emergency_save() { 3656sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3657 my $freeze_guard = cf::freeze_mainloop;
3545 3658
3546 warn "enter emergency perl save\n"; 3659 warn "emergency_perl_save: enter\n";
3547 3660
3548 cf::sync_job { 3661 cf::sync_job {
3662 # this is a trade-off: we want to be very quick here, so
3663 # save all maps without fsync, and later call a global sync
3664 # (which in turn might be very very slow)
3665 local $USE_FSYNC = 0;
3666
3549 # use a peculiar iteration method to avoid tripping on perl 3667 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3668 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3669 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3670 warn "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3671 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3672 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3673 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3674 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3675 $pl->save;
3558 } 3676 }
3559 warn "end emergency player save\n"; 3677 warn "emergency_perl_save: end player save\n";
3560 3678
3561 warn "begin emergency map save\n"; 3679 warn "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3680 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3681 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3682 $map->valid or next;
3565 $map->save; 3683 $map->save;
3566 } 3684 }
3567 warn "end emergency map save\n"; 3685 warn "emergency_perl_save: end map save\n";
3568 3686
3569 warn "begin emergency database checkpoint\n"; 3687 warn "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3688 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3689 warn "emergency_perl_save: end database checkpoint\n";
3572 3690
3573 warn "begin write uuid\n"; 3691 warn "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3692 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3693 warn "emergency_perl_save: end write uuid\n";
3576 }; 3694 };
3577 3695
3696 warn "emergency_perl_save: starting sync()\n";
3697 IO::AIO::aio_sync sub {
3698 warn "emergency_perl_save: finished sync()\n";
3699 };
3700
3578 warn "leave emergency perl save\n"; 3701 warn "emergency_perl_save: leave\n";
3579} 3702}
3580 3703
3581sub post_cleanup { 3704sub post_cleanup {
3582 my ($make_core) = @_; 3705 my ($make_core) = @_;
3583 3706
3584 warn Carp::longmess "post_cleanup backtrace" 3707 warn Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3708 if $make_core;
3709
3710 my $fh = pidfile;
3711 unlink $PIDFILE if <$fh> == $$;
3712}
3713
3714# a safer delete_package, copied from Symbol
3715sub clear_package($) {
3716 my $pkg = shift;
3717
3718 # expand to full symbol table name if needed
3719 unless ($pkg =~ /^main::.*::$/) {
3720 $pkg = "main$pkg" if $pkg =~ /^::/;
3721 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3722 $pkg .= '::' unless $pkg =~ /::$/;
3723 }
3724
3725 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3726 my $stem_symtab = *{$stem}{HASH};
3727
3728 defined $stem_symtab and exists $stem_symtab->{$leaf}
3729 or return;
3730
3731 # clear all symbols
3732 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3733 for my $name (keys %$leaf_symtab) {
3734 _gv_clear *{"$pkg$name"};
3735# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3736 }
3737 warn "cleared package $pkg\n";#d#
3586} 3738}
3587 3739
3588sub do_reload_perl() { 3740sub do_reload_perl() {
3589 # can/must only be called in main 3741 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3742 if ($Coro::current != $Coro::main) {
3591 warn "can only reload from main coroutine"; 3743 warn "can only reload from main coroutine";
3592 return; 3744 return;
3593 } 3745 }
3594 3746
3747 return if $RELOAD++;
3748
3749 my $t1 = EV::time;
3750
3751 while ($RELOAD) {
3595 warn "reloading..."; 3752 warn "reloading...";
3596 3753
3597 warn "entering sync_job"; 3754 warn "entering sync_job";
3598 3755
3599 cf::sync_job { 3756 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark 3757 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3758 cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark 3759 cf::write_runtime_sync; # external watchdog should not bark
3603 3760
3604 warn "syncing database to disk"; 3761 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV; 3762 BDB::db_env_txn_checkpoint $DB_ENV;
3606 3763
3607 # if anything goes wrong in here, we should simply crash as we already saved 3764 # if anything goes wrong in here, we should simply crash as we already saved
3608 3765
3609 warn "flushing outstanding aio requests"; 3766 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs; 3767 while (IO::AIO::nreqs || BDB::nreqs) {
3615 warn "iterate..."; 3768 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = ();
3623
3624 warn "removing commands";
3625 %COMMAND = ();
3626
3627 warn "removing ext/exti commands";
3628 %EXTCMD = ();
3629 %EXTICMD = ();
3630
3631 warn "unloading/nuking all extensions";
3632 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg";
3634
3635 if (my $cb = $pkg->can ("unload")) {
3636 eval {
3637 $cb->($pkg);
3638 1
3639 } or warn "$pkg unloaded, but with errors: $@";
3640 } 3769 }
3641 3770
3642 warn "... nuking $pkg"; 3771 warn "cancelling all extension coros";
3643 Symbol::delete_package $pkg; 3772 $_->cancel for values %EXT_CORO;
3644 } 3773 %EXT_CORO = ();
3645 3774
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3775 warn "removing commands";
3647 while (my ($k, $v) = each %INC) { 3776 %COMMAND = ();
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3777
3778 warn "removing ext/exti commands";
3779 %EXTCMD = ();
3780 %EXTICMD = ();
3781
3782 warn "unloading/nuking all extensions";
3783 for my $pkg (@EXTS) {
3650 warn "... unloading $k"; 3784 warn "... unloading $pkg";
3651 delete $INC{$k};
3652 3785
3653 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g;
3655
3656 if (my $cb = $k->can ("unload_module")) { 3786 if (my $cb = $pkg->can ("unload")) {
3787 eval {
3657 $cb->(); 3788 $cb->($pkg);
3789 1
3790 } or warn "$pkg unloaded, but with errors: $@";
3791 }
3792
3793 warn "... clearing $pkg";
3794 clear_package $pkg;
3658 } 3795 }
3659 3796
3660 Symbol::delete_package $k; 3797 warn "unloading all perl modules loaded from $LIBDIR";
3798 while (my ($k, $v) = each %INC) {
3799 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3800
3801 warn "... unloading $k";
3802 delete $INC{$k};
3803
3804 $k =~ s/\.pm$//;
3805 $k =~ s/\//::/g;
3806
3807 if (my $cb = $k->can ("unload_module")) {
3808 $cb->();
3809 }
3810
3811 clear_package $k;
3661 } 3812 }
3662 3813
3663 warn "getting rid of safe::, as good as possible"; 3814 warn "getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3815 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3816 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 3817
3667 warn "unloading cf.pm \"a bit\""; 3818 warn "unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3819 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3820 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 3821
3671 # don't, removes xs symbols, too, 3822 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3823 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3824 #clear_package __PACKAGE__;
3674 3825
3675 warn "unload completed, starting to reload now"; 3826 warn "unload completed, starting to reload now";
3676 3827
3677 warn "reloading cf.pm"; 3828 warn "reloading cf.pm";
3678 require cf; 3829 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3830 cf::_connect_to_perl_1;
3680 3831
3681 warn "loading config and database again"; 3832 warn "loading config and database again";
3682 cf::reload_config; 3833 cf::reload_config;
3683 3834
3684 warn "loading extensions"; 3835 warn "loading extensions";
3685 cf::load_extensions; 3836 cf::load_extensions;
3686 3837
3838 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 3839 warn "reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3840 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3841 warn "reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3842 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3843 warn "reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3844 reattach $_ for values %PLAYER;
3845 }
3693 3846
3847 warn "running post_init jobs";
3848 (pop @POST_INIT)->(1) while @POST_INIT;
3849
3694 warn "leaving sync_job"; 3850 warn "leaving sync_job";
3695 3851
3696 1 3852 1
3697 } or do { 3853 } or do {
3698 warn $@; 3854 warn $@;
3699 cf::cleanup "error while reloading, exiting."; 3855 cf::cleanup "error while reloading, exiting.";
3700 }; 3856 };
3701 3857
3702 warn "reloaded"; 3858 warn "reloaded";
3859 --$RELOAD;
3860 }
3861
3862 $t1 = EV::time - $t1;
3863 warn "reload completed in ${t1}s\n";
3703}; 3864};
3704 3865
3705our $RELOAD_WATCHER; # used only during reload 3866our $RELOAD_WATCHER; # used only during reload
3706 3867
3707sub reload_perl() { 3868sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3869 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3870 # coro crashes during coro_state_free->destroy here.
3710 3871
3872 $RELOAD_WATCHER ||= cf::async {
3873 Coro::AIO::aio_wait cache_extensions;
3874
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3875 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3876 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3877 undef $RELOAD_WATCHER;
3878 };
3714 }; 3879 };
3715} 3880}
3716 3881
3717register_command "reload" => sub { 3882register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3883 my ($who, $arg) = @_;
3793 BDB::max_poll_reqs $TICK * 0.1; 3958 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 3959 $AnyEvent::BDB::WATCHER->priority (1);
3795 3960
3796 unless ($DB_ENV) { 3961 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 3962 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3963 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 3964 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3965 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3966 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3967 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 3968
3803 cf::sync_job { 3969 cf::sync_job {
3804 eval { 3970 eval {
3843 $msg =~ s/\n//; 4009 $msg =~ s/\n//;
3844 4010
3845 # limit the # of concurrent backtraces 4011 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 4012 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 4013 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg;
3848 async { 4015 async {
3849 $Coro::current->{desc} = "abt $msg"; 4016 $Coro::current->{desc} = "abt $msg";
3850 4017
3851 my @bt = fork_call { 4018 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 4019 @addr = map { sprintf "%x", $_ } @addr;
3863 } 4030 }
3864 4031
3865 @funcs 4032 @funcs
3866 }; 4033 };
3867 4034
3868 LOG llevInfo, "[ABT] $msg\n"; 4035 LOG llevInfo, "[ABT] $perl_bt\n";
4036 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 4037 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 4038 --$_log_backtrace;
3871 }; 4039 };
3872 } else { 4040 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 4041 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 4042 LOG llevInfo, "[ABT] [suppressed]\n";
3875 } 4043 }
3876} 4044}
3877 4045
3878# load additional modules 4046# load additional modules
3879use cf::pod; 4047require "cf/$_.pm" for @EXTRA_MODULES;
4048cf::_connect_to_perl_2;
3880 4049
3881END { cf::emergency_save } 4050END { cf::emergency_save }
3882 4051
38831 40521
3884 4053

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines