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.439 by root, Mon Jul 14 16:42:49 2008 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 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,2009,2010 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
24use utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
39use Coro::AnyEvent; 42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
43use Coro::AnyEvent; 47use Coro::AnyEvent;
44use Coro::AIO; 48use Coro::AIO;
45use Coro::BDB 1.6; 49use Coro::BDB 1.6;
46use Coro::Storable; 50use Coro::Storable;
47use Coro::Util (); 51use Coro::Util ();
48 52
49use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
50use BDB (); 54use BDB ();
51use Data::Dumper; 55use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 56use Fcntl;
54use YAML (); 57use YAML::XS ();
55use IO::AIO (); 58use IO::AIO ();
56use Time::HiRes; 59use Time::HiRes;
57use Compress::LZF; 60use Compress::LZF;
58use Digest::MD5 (); 61use Digest::MD5 ();
59 62
… …
61 64
62# configure various modules to our taste 65# configure various modules to our taste
63# 66#
64$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
67 75
68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
69 78
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
71 82
72our %COMMAND = (); 83our %COMMAND = ();
73our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
74 85
75our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
76our %EXTCMD = (); 87our %EXTCMD = ();
77our %EXTICMD = (); 88our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
80 91
81our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
83 96
84our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
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;
103
89our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
95our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
96 120
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 123our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
101 125
102our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 129our $DB_ENV;
106 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
107our %CFG; 133our %CFG;
108 134
109our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 136our $RUNTIME;
111our $NOW; 137our $NOW;
… …
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 148our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
124 150
151our @POST_INIT;
152
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
155
125binmode STDOUT; 156binmode STDOUT;
126binmode STDERR; 157binmode STDERR;
127 158
128# read virtual server time, if available 159# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
133} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
134 167
135mkdir $_ 168mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 170
138our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
139 172
140sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
141 189
142############################################################################# 190#############################################################################
143 191
144=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
145 193
… …
187from wherever your confdir points to. 235from wherever your confdir points to.
188 236
189=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
190 238
191These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
192returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
193per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
194 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
195=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
196 249
197This array contains the results of the last C<invoke ()> call. When 250This 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 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call. 252that call.
200 253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
201=back 260=back
202 261
203=cut 262=cut
204 263
205BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
206 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
207 my $msg = join "", @_; 271 my $msg = join "", @_;
208 272
209 $msg .= "\n" 273 $msg .= "\n"
210 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
211 275
212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
213 277
214 LOG llevError, $msg; 278 LOG llevWarn, $msg;
215 }; 279};
216}
217 280
218$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
220 283
221 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 288 return;#d#
224 }#d# 289 }#d#
225 290
226 # kill coroutine otherwise 291 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 292 Coro::terminate
229}; 293};
230
231$SIG{__DIE__} = sub { }; #d#?
232 294
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
243for my $pkg (qw( 305for my $pkg (qw(
244 cf::global cf::attachable 306 cf::global cf::attachable
245 cf::object cf::object::player 307 cf::object cf::object::player
246 cf::client cf::player 308 cf::client cf::player
247 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
248 cf::map cf::party cf::region 311 cf::party cf::region
249)) { 312)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 314}
253 315
254$EV::DIED = sub { 316$EV::DIED = sub {
255 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
256}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
257 324
258############################################################################# 325#############################################################################
259 326
260=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
261 328
… …
282 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
283 $d 350 $d
284 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
285} 352}
286 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
287=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
288 369
289Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
290 371
291=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298 379
299sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
301 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
414=item cf::post_init { BLOCK }
415
416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
417but I<before> the server starts ticking again.
418
419The codeblock will have a single boolean argument to indicate whether this
420is a reload or not.
421
422=cut
423
424sub post_init(&) {
425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
443}
444
302=item cf::lock_wait $string 445=item cf::lock_wait $string
303 446
304Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
305 448
306=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
307 450
308Wait until the given lock is available and then acquires it and returns 451Wait 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, 452a L<Guard> object. If the guard object gets destroyed (goes out of scope,
310for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
311returned. 454returned.
312 455
313Locks are *not* recursive, locking from the same coro twice results in a 456Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro. 457deadlocked coro.
… …
320 463
321Return true if the lock is currently active, i.e. somebody has locked it. 464Return true if the lock is currently active, i.e. somebody has locked it.
322 465
323=cut 466=cut
324 467
325our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 469
328sub lock_wait($) { 470sub lock_wait($) {
329 my ($key) = @_; 471 $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} 472}
342 473
343sub lock_acquire($) { 474sub lock_acquire($) {
344 my ($key) = @_; 475 $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} 476}
358 477
359sub lock_active($) { 478sub lock_active($) {
360 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 480}
364 481
365sub freeze_mainloop { 482sub freeze_mainloop {
366 tick_inhibit_inc; 483 tick_inhibit_inc;
367 484
368 Coro::guard \&tick_inhibit_dec; 485 &Guard::guard (\&tick_inhibit_dec);
369} 486}
370 487
371=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
372 489
373Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
374get spread over timer. 491get spread over time.
375 492
376=cut 493=cut
377 494
378sub periodic($$) { 495sub periodic($$) {
379 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
… …
383 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
384} 501}
385 502
386=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
387 504
388Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
389This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
390of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
391 512
392The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
393used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
394 515
395Useful for short background jobs. 516Useful for short background jobs.
396 517
397=cut 518=cut
398 519
399our @SLOT_QUEUE; 520our @SLOT_QUEUE;
400our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
401 523
402$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
403$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
405 527
406 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
407 530
408 while () { 531 while () {
409 next_job: 532 next_job:
533
410 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
411 if ($avail > 0.01) { 535
412 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
413 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
414 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
415 $job->[2]->send; 540 $job->[2]->send;
416 Coro::cede; 541 Coro::cede;
417 goto next_job; 542 goto next_job;
418 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
419 } 545 }
420 } 546 }
421 547
422 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
423 # we do not use wait_for_tick() as it returns immediately when tick is inactive 549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
424 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
425 $signal->wait; 551 $signal->wait;
426 } else { 552 } else {
553 $busy = 0;
427 Coro::schedule; 554 Coro::schedule;
428 } 555 }
429 } 556 }
430}; 557};
431 558
432sub get_slot($;$$) { 559sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
434 561
435 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
436 563
437 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
438 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
439 567
440 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
441 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
442 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
… …
468=cut 596=cut
469 597
470sub sync_job(&) { 598sub sync_job(&) {
471 my ($job) = @_; 599 my ($job) = @_;
472 600
473 if ($Coro::current == $Coro::main) { 601 if (in_main) {
474 my $time = EV::time; 602 my $time = AE::time;
475 603
476 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
477 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
478 606
479 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
480 608
481 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
482 610
483 my $busy = 1; 611 my $busy = 1;
484 my @res; 612 my @res;
485 613
486 (async { 614 (async {
487 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
488 @res = eval { $job->() }; 616 @res = eval { $job->() };
489 warn $@ if $@; 617 error $@ if $@;
490 undef $busy; 618 undef $busy;
491 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
492 620
493 while ($busy) { 621 while ($busy) {
494 if (Coro::nready) { 622 if (Coro::nready) {
… …
496 } else { 624 } else {
497 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
498 } 626 }
499 } 627 }
500 628
501 my $time = EV::time - $time; 629 my $time = AE::time - $time;
502 630
503 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
504 632
505 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
506 } else { 634 } else {
… …
528 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
529 657
530 $coro 658 $coro
531} 659}
532 660
533=item fork_call { }, $args 661=item fork_call { }, @args
534 662
535Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
536process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
537Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
538never block itself or use any form of event handling. 666never block itself or use any form of event handling.
539 667
540=cut 668=cut
541 669
670sub post_fork {
671 reset_signals;
672}
673
542sub fork_call(&@) { 674sub fork_call(&@) {
543 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
544 676
545 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
546 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
547 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
548 680
549 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
550 reset_signals; 682 cf::post_fork;
551 &$cb 683 &$cb
552 }, @args; 684 } @args;
553 685
554 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
555} 698}
556 699
557=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
558 701
559=cut 702=cut
… …
596within each server. 739within each server.
597 740
598=cut 741=cut
599 742
600sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
601 my ($name) = @_; 747 my ($name) = @_;
602 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
603 749
604 eval { 750 eval {
605 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
615} 761}
616 762
617our $DB; 763our $DB;
618 764
619sub db_init { 765sub db_init {
620 cf::sync_job {
621 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
622 };
623} 767}
624 768
625sub db_get($$) { 769sub db_get($$) {
626 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
627 771
628 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
629 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
630 776
631 $! ? () 777 $! ? ()
632 : $data 778 : $data
633 }
634} 779}
635 780
636sub db_put($$$) { 781sub db_put($$$) {
637 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
638 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
666 811
667 my @data; 812 my @data;
668 my $md5; 813 my $md5;
669 814
670 for (0 .. $#$src) { 815 for (0 .. $#$src) {
671 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
672 or Carp::croak "$src->[$_]: $!";
673 } 817 }
674 818
675 # if processing is expensive, check 819 # if processing is expensive, check
676 # checksum first 820 # checksum first
677 if (1) { 821 if (1) {
… …
694 838
695 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
696 my $data = $process->(\@data); 840 my $data = $process->(\@data);
697 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
698 842
699 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
700 844
701 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
702 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
703 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
704 848
… …
714 858
715=cut 859=cut
716 860
717sub datalog($@) { 861sub datalog($@) {
718 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
719 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
720} 864}
721 865
722=back 866=back
723 867
724=cut 868=cut
725 869
726############################################################################# 870#############################################################################
727 871
728=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
729 873
730Many objects in crossfire are so-called attachable objects. That means you can 874Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
733 877
734In the following description, CLASS can be any of C<global>, C<object> 878In 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 879C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
785=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
786 930
787Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
789 933
790Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 935that are attached at load/instantiate time, thus the need for a name.
792 936
793These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
794 938
795=over 4 939=over 4
… …
919 1063
920 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
921 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
922 1066
923 } elsif (ref $type) { 1067 } elsif (ref $type) {
924 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
925 1069
926 } else { 1070 } else {
927 shift @arg; 1071 shift @arg;
928 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
929 } 1073 }
930 } 1074 }
931} 1075}
932 1076
933sub _object_attach { 1077sub _object_attach {
… …
943 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
944 } 1088 }
945 1089
946 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
947 } else { 1091 } else {
948 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
949 } 1093 }
950 1094
951 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
952} 1096}
953 1097
… …
1012 1156
1013 for (@$callbacks) { 1157 for (@$callbacks) {
1014 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1015 1159
1016 if ($@) { 1160 if ($@) {
1017 warn "$@";
1018 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1019 override; 1162 override;
1020 } 1163 }
1021 1164
1022 return 1 if $override; 1165 return 1 if $override;
1023 } 1166 }
… …
1086 1229
1087sub reattach { 1230sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1232 my ($obj) = @_;
1090 1233
1234 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1235 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1236
1093 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
1094 1238
1095 @$registry = (); 1239 @$registry = ();
1096 1240
… …
1101 for (@$attach) { 1245 for (@$attach) {
1102 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1103 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1104 } 1248 }
1105 } else { 1249 } else {
1106 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1107 } 1251 }
1108 } 1252 }
1109} 1253}
1110 1254
1111cf::attachable->attach ( 1255cf::attachable->attach (
… …
1138 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1139 1283
1140 sync_job { 1284 sync_job {
1141 if (length $$rdata) { 1285 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1143 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1144 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1145 1290
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 aio_fsync $fh if $cf::USE_FSYNC; 1294 if ($cf::USE_FSYNC) {
1295 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;
1296 aio_fsync $fh;
1297 }
1150 aio_close $fh; 1298 aio_close $fh;
1151 1299
1152 if (@$objs) { 1300 if (@$objs) {
1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1301 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1157 aio_fsync $fh if $cf::USE_FSYNC; 1305 if ($cf::USE_FSYNC) {
1306 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;
1307 aio_fsync $fh;
1308 }
1158 aio_close $fh; 1309 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1311 }
1161 } else { 1312 } else {
1162 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1163 } 1314 }
1164 1315
1165 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1320 } else {
1167 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1168 } 1322 }
1169 } else { 1323 } else {
1170 aio_unlink $filename; 1324 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1172 } 1326 }
… …
1196 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs}; 1351 $av = $st->{objs};
1198 } 1352 }
1199 1353
1200 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1201 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1202 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1203 1358
1204 ($data, $av) 1359 ($data, $av)
1205} 1360}
1206 1361
1207=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1263 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1264 1419
1265 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1266} 1421}
1267 1422
1423use File::Glob ();
1424
1268cf::player->attach ( 1425cf::player->attach (
1269 on_command => sub { 1426 on_unknown_command => sub {
1270 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1271 1428
1272 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1273 or return; 1430 or return;
1274 1431
… …
1297 1454
1298 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1299 if $reply; 1456 if $reply;
1300 1457
1301 } else { 1458 } else {
1302 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1303 } 1460 }
1304 1461
1305 cf::override; 1462 cf::override;
1306 }, 1463 },
1307); 1464);
1308 1465
1466# "readahead" all extensions
1467sub cache_extensions {
1468 my $grp = IO::AIO::aio_group;
1469
1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1471 for (grep /\.ext$/, @{$_[0]}) {
1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1473 }
1474 };
1475
1476 $grp
1477}
1478
1309sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1310 cf::sync_job { 1482 cf::sync_job {
1311 my %todo; 1483 my %todo;
1312 1484
1313 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1314 next unless -r $path; 1486 next unless -r $path;
… …
1332 1504
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1507
1336 $ext{source} = 1508 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1338 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1339 . $source 1511 . $source
1340 . "\n};\n1"; 1512 . "\n};\n1";
1341 1513
1342 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1343 } 1515 }
1344 1516
1517 my $pass = 0;
1345 my %done; 1518 my %done;
1346 while (%todo) { 1519 while (%todo) {
1347 my $progress; 1520 my $progress;
1348 1521
1522 ++$pass;
1523
1524 ext:
1349 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1350 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1351 goto skip 1527 next ext
1352 unless exists $done{$_}; 1528 unless exists $done{$_};
1353 } 1529 }
1354 1530
1355 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1356 1532
1357 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1358 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1359 : "$v->{base}: extension inactive.\n";
1360 1537
1361 if (exists $v->{meta}{mandatory}) {
1362 warn $msg;
1363 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1364 } 1539 if exists $v->{meta}{mandatory};
1365 1540
1366 warn $msg; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1543 } else {
1544 $done{$k} = delete $todo{$k};
1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1367 } 1550 }
1368
1369 $done{$k} = delete $todo{$k};
1370 push @EXTS, $v->{pkg};
1371 $progress = 1;
1372 } 1551 }
1373 1552
1374 skip: 1553 unless ($progress) {
1375 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1376 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560 }
1377 } 1561 }
1378 }; 1562 };
1379} 1563}
1380 1564
1381############################################################################# 1565#############################################################################
1382 1566
1383=back 1567=back
1384 1568
1385=head2 CORE EXTENSIONS 1569=head2 CORE EXTENSIONS
1386 1570
1387Functions and methods that extend core crossfire objects. 1571Functions and methods that extend core deliantra objects.
1388 1572
1389=cut 1573=cut
1390 1574
1391package cf::player; 1575package cf::player;
1392 1576
… …
1435 1619
1436sub exists($) { 1620sub exists($) {
1437 my ($login) = @_; 1621 my ($login) = @_;
1438 1622
1439 $cf::PLAYER{$login} 1623 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1624 or !aio_stat path $login
1441} 1625}
1442 1626
1443sub find($) { 1627sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1628 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1629 my $login = $_[0];
… …
1465 $cf::PLAYER{$login} = $pl 1649 $cf::PLAYER{$login} = $pl
1466 } 1650 }
1467 } 1651 }
1468} 1652}
1469 1653
1654cf::player->attach (
1655 on_load => sub {
1656 my ($pl, $path) = @_;
1657
1658 # restore slots saved in save, below
1659 my $slots = delete $pl->{_slots};
1660
1661 $pl->ob->current_weapon ($slots->[0]);
1662 $pl->combat_ob ($slots->[1]);
1663 $pl->ranged_ob ($slots->[2]);
1664 },
1665);
1666
1470sub save($) { 1667sub save($) {
1471 my ($pl) = @_; 1668 my ($pl) = @_;
1472 1669
1473 return if $pl->{deny_save}; 1670 return if $pl->{deny_save};
1474 1671
… …
1479 1676
1480 aio_mkdir playerdir $pl, 0770; 1677 aio_mkdir playerdir $pl, 0770;
1481 $pl->{last_save} = $cf::RUNTIME; 1678 $pl->{last_save} = $cf::RUNTIME;
1482 1679
1483 cf::get_slot 0.01; 1680 cf::get_slot 0.01;
1681
1682 # save slots, to be restored later
1683 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1484 1684
1485 $pl->save_pl ($path); 1685 $pl->save_pl ($path);
1486 cf::cede_to_tick; 1686 cf::cede_to_tick;
1487} 1687}
1488 1688
… …
1520 my ($pl) = @_; 1720 my ($pl) = @_;
1521 1721
1522 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1523 1723
1524 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1725 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1726
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1528 $pl->deactivate; 1728 $pl->deactivate;
1729
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1730 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1531 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1532 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1533 1735
1534 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1535 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1536 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
… …
1590 \@logins 1792 \@logins
1591} 1793}
1592 1794
1593=item $player->maps 1795=item $player->maps
1594 1796
1797=item cf::player::maps $login
1798
1595Returns an arrayref of map paths that are private for this 1799Returns an arrayref of map paths that are private for this
1596player. May block. 1800player. May block.
1597 1801
1598=cut 1802=cut
1599 1803
… …
1616 } 1820 }
1617 1821
1618 \@paths 1822 \@paths
1619} 1823}
1620 1824
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1825=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1826
1623Expand crossfire pod fragments into protocol xml. 1827Expand 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 1828
1714=item $player->ext_reply ($msgid, @msg) 1829=item $player->ext_reply ($msgid, @msg)
1715 1830
1716Sends an ext reply to the player. 1831Sends an ext reply to the player.
1717 1832
… …
1749 1864
1750=cut 1865=cut
1751 1866
1752sub find_by_path($) { 1867sub find_by_path($) {
1753 my ($path) = @_; 1868 my ($path) = @_;
1869
1870 $path =~ s/^~[^\/]*//; # skip ~login
1754 1871
1755 my ($match, $specificity); 1872 my ($match, $specificity);
1756 1873
1757 for my $region (list) { 1874 for my $region (list) {
1758 if ($region->{match} && $path =~ $region->{match}) { 1875 if ($region->{match} && $path =~ $region->{match}) {
… …
1787sub generate_random_map { 1904sub generate_random_map {
1788 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1789 1906
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1907 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791 1908
1792 # mit "rum" bekleckern, nicht
1793 $self->_create_random_map ( 1909 $self->_create_random_map ($rmp);
1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1797 $rmp->{exit_on_final_map},
1798 $rmp->{xsize}, $rmp->{ysize},
1799 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1800 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1801 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1802 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1803 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1804 (cf::region::find $rmp->{region}), $rmp->{custom}
1805 )
1806} 1910}
1807 1911
1808=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1809 1913
1810Register a handler for the map path matching the given regex at the 1914Register a handler for the map path matching the given regex at the
… …
1815 1919
1816sub register { 1920sub register {
1817 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1818 my $pkg = caller; 1922 my $pkg = caller;
1819 1923
1820 no strict;
1821 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1822 1925
1823 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1824} 1927}
1825 1928
1826# also paths starting with '/' 1929# also paths starting with '/'
1827$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1930$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1828 1931
1829sub thawer_merge { 1932sub thawer_merge {
1830 my ($self, $merge) = @_; 1933 my ($self, $merge) = @_;
1831 1934
1832 # we have to keep some variables in memory intact 1935 # we have to keep some variables in memory intact
… …
1837} 1940}
1838 1941
1839sub normalise { 1942sub normalise {
1840 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1841 1944
1842 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1843 1946
1844 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1845 1948
1846 # map plan: 1949 # map plan:
1847 # 1950 #
… …
1862 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1863 $path = "$base/$path"; 1966 $path = "$base/$path";
1864 } 1967 }
1865 1968
1866 for ($path) { 1969 for ($path) {
1867 redo if s{//}{/};
1868 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1869 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1870 } 1972 }
1871 1973
1872 $path 1974 $path
… …
1886 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1887 return $self; 1989 return $self;
1888 } 1990 }
1889 } 1991 }
1890 1992
1891 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1892 () 1994 ()
1893} 1995}
1894 1996
1895sub init { 1997sub init {
1896 my ($self) = @_; 1998 my ($self) = @_;
… …
1928sub uniq_path { 2030sub uniq_path {
1929 my ($self) = @_; 2031 my ($self) = @_;
1930 2032
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2033 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 2034 "$UNIQUEDIR/$path"
1933}
1934
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} 2035}
1943 2036
1944sub decay_objects { 2037sub decay_objects {
1945 my ($self) = @_; 2038 my ($self) = @_;
1946 2039
… …
2028 2121
2029sub find; 2122sub find;
2030sub find { 2123sub find {
2031 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
2032 2125
2126 cf::cede_to_tick;
2127
2033 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
2034 2129
2035 cf::lock_wait "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2132
2038 $cf::MAP{$path} || do { 2133 $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 2134 my $map = new_from_path cf::map $path
2043 or return; 2135 or return;
2044 2136
2045 $map->{last_save} = $cf::RUNTIME; 2137 $map->{last_save} = $cf::RUNTIME;
2046 2138
… …
2058 2150
2059 $cf::MAP{$path} = $map 2151 $cf::MAP{$path} = $map
2060 } 2152 }
2061} 2153}
2062 2154
2063sub pre_load { } 2155sub pre_load { }
2064sub post_load { } 2156#sub post_load { } # XS
2065 2157
2066sub load { 2158sub load {
2067 my ($self) = @_; 2159 my ($self) = @_;
2068 2160
2069 local $self->{deny_reset} = 1; # loading can take a long time 2161 local $self->{deny_reset} = 1; # loading can take a long time
… …
2114 unless ($self->{deny_activate}) { 2206 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2207 $self->decay_objects;
2116 $self->fix_auto_apply; 2208 $self->fix_auto_apply;
2117 $self->update_buttons; 2209 $self->update_buttons;
2118 cf::cede_to_tick; 2210 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2211 $self->activate;
2122 } 2212 }
2123 2213
2124 $self->{last_save} = $cf::RUNTIME; 2214 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2215 $self->last_access ($cf::RUNTIME);
2126 2216
2127 $self->in_memory (cf::MAP_ACTIVE); 2217 $self->in_memory (cf::MAP_ACTIVE);
2128 } 2218 }
2129 2219
2130 $self->post_load; 2220 $self->post_load;
2131}
2132 2221
2222 1
2223}
2224
2225# customize the map for a given player, i.e.
2226# return the _real_ map. used by e.g. per-player
2227# maps to change the path to ~playername/mappath
2133sub customise_for { 2228sub customise_for {
2134 my ($self, $ob) = @_; 2229 my ($self, $ob) = @_;
2135 2230
2136 return find "~" . $ob->name . "/" . $self->{path} 2231 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2232 if $self->per_player;
… …
2153 or next; 2248 or next;
2154 $neigh = find $neigh, $map 2249 $neigh = find $neigh, $map
2155 or next; 2250 or next;
2156 $neigh->load; 2251 $neigh->load;
2157 2252
2253 # now find the diagonal neighbours
2158 push @neigh, 2254 push @neigh,
2159 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2160 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2161 } 2257 }
2162 2258
… …
2169} 2265}
2170 2266
2171sub find_sync { 2267sub find_sync {
2172 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2173 2269
2174 cf::sync_job { find $path, $origin } 2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main;
2272
2273 find $path, $origin
2175} 2274}
2176 2275
2177sub do_load_sync { 2276sub do_load_sync {
2178 my ($map) = @_; 2277 my ($map) = @_;
2179 2278
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2182 2281
2183 cf::sync_job { $map->load }; 2282 $map->load;
2184} 2283}
2185 2284
2186our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2187our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2188 2287
… …
2214 $MAP_PREFETCHER->prio (6); 2313 $MAP_PREFETCHER->prio (6);
2215 2314
2216 () 2315 ()
2217} 2316}
2218 2317
2318# common code, used by both ->save and ->swapout
2219sub save { 2319sub _save {
2220 my ($self) = @_; 2320 my ($self) = @_;
2221
2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
2223 2321
2224 $self->{last_save} = $cf::RUNTIME; 2322 $self->{last_save} = $cf::RUNTIME;
2225 2323
2226 return unless $self->dirty; 2324 return unless $self->dirty;
2227 2325
… …
2247 } else { 2345 } else {
2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2346 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2249 } 2347 }
2250} 2348}
2251 2349
2350sub save {
2351 my ($self) = @_;
2352
2353 my $lock = cf::lock_acquire "map_data:$self->{path}";
2354
2355 $self->_save;
2356}
2357
2252sub swap_out { 2358sub swap_out {
2253 my ($self) = @_; 2359 my ($self) = @_;
2254 2360
2255 # save first because save cedes
2256 $self->save;
2257
2258 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259 2362
2260 return if $self->players;
2261 return if $self->in_memory != cf::MAP_ACTIVE; 2363 return if $self->in_memory != cf::MAP_ACTIVE;
2262 return if $self->{deny_save}; 2364 return if $self->{deny_save};
2365 return if $self->players;
2263 2366
2367 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP;
2264 $self->in_memory (cf::MAP_SWAPPED); 2370 $self->in_memory (cf::MAP_SWAPPED);
2371
2372 # then atomically save
2373 $self->_save;
2374
2375 # then free the map
2376 $self->clear;
2377}
2378
2379sub reset_at {
2380 my ($self) = @_;
2381
2382 # TODO: safety, remove and allow resettable per-player maps
2383 return 1e99 if $self->{deny_reset};
2384
2385 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2386 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2387
2388 $time + $to
2389}
2390
2391sub should_reset {
2392 my ($self) = @_;
2393
2394 $self->reset_at <= $cf::RUNTIME
2395}
2396
2397sub reset {
2398 my ($self) = @_;
2399
2400 my $lock = cf::lock_acquire "map_data:$self->{path}";
2401
2402 return if $self->players;
2403
2404 cf::trace "resetting map ", $self->path, "\n";
2405
2406 $self->in_memory (cf::MAP_SWAPPED);
2407
2408 # need to save uniques path
2409 unless ($self->{deny_save}) {
2410 my $uniq = $self->uniq_path; utf8::encode $uniq;
2411
2412 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2413 if $uniq;
2414 }
2415
2416 delete $cf::MAP{$self->path};
2265 2417
2266 $self->deactivate; 2418 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP; 2419 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear; 2420 $self->clear;
2269}
2270
2271sub reset_at {
2272 my ($self) = @_;
2273
2274 # TODO: safety, remove and allow resettable per-player maps
2275 return 1e99 if $self->{deny_reset};
2276
2277 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2278 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2279
2280 $time + $to
2281}
2282
2283sub should_reset {
2284 my ($self) = @_;
2285
2286 $self->reset_at <= $cf::RUNTIME
2287}
2288
2289sub reset {
2290 my ($self) = @_;
2291
2292 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293
2294 return if $self->players;
2295
2296 warn "resetting map ", $self->path;
2297
2298 $self->in_memory (cf::MAP_SWAPPED);
2299
2300 # need to save uniques path
2301 unless ($self->{deny_save}) {
2302 my $uniq = $self->uniq_path; utf8::encode $uniq;
2303
2304 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2305 if $uniq;
2306 }
2307
2308 delete $cf::MAP{$self->path};
2309
2310 $self->deactivate;
2311 $_->clear_links_to ($self) for values %cf::MAP;
2312 $self->clear;
2313 2421
2314 $self->unlink_save; 2422 $self->unlink_save;
2315 $self->destroy; 2423 $self->destroy;
2316} 2424}
2317 2425
… …
2325 2433
2326 delete $cf::MAP{$self->path}; 2434 delete $cf::MAP{$self->path};
2327 2435
2328 $self->unlink_save; 2436 $self->unlink_save;
2329 2437
2330 bless $self, "cf::map"; 2438 bless $self, "cf::map::wrap";
2331 delete $self->{deny_reset}; 2439 delete $self->{deny_reset};
2332 $self->{deny_save} = 1; 2440 $self->{deny_save} = 1;
2333 $self->reset_timeout (1); 2441 $self->reset_timeout (1);
2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2442 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2335 2443
… …
2392 : normalise $_ 2500 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2501 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2502 ]
2395} 2503}
2396 2504
2505=item cf::map::static_maps
2506
2507Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2508file in the shared directory excluding F</styles> and F</editor>). May
2509block.
2510
2511=cut
2512
2513sub static_maps() {
2514 my @dirs = "";
2515 my @maps;
2516
2517 while (@dirs) {
2518 my $dir = shift @dirs;
2519
2520 next if $dir eq "/styles" || $dir eq "/editor";
2521
2522 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2523 or return;
2524
2525 for (@$files) {
2526 s/\.map$// or next;
2527 utf8::decode $_;
2528 push @maps, "$dir/$_";
2529 }
2530
2531 push @dirs, map "$dir/$_", @$dirs;
2532 }
2533
2534 \@maps
2535}
2536
2397=back 2537=back
2398 2538
2399=head3 cf::object 2539=head3 cf::object
2400 2540
2401=cut 2541=cut
… …
2466 2606
2467our $SAY_CHANNEL = { 2607our $SAY_CHANNEL = {
2468 id => "say", 2608 id => "say",
2469 title => "Map", 2609 title => "Map",
2470 reply => "say ", 2610 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2611 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2612};
2473 2613
2474our $CHAT_CHANNEL = { 2614our $CHAT_CHANNEL = {
2475 id => "chat", 2615 id => "chat",
2476 title => "Chat", 2616 title => "Chat",
… …
2531 2671
2532=item $player_object->enter_link 2672=item $player_object->enter_link
2533 2673
2534Freezes the player and moves him/her to a special map (C<{link}>). 2674Freezes the player and moves him/her to a special map (C<{link}>).
2535 2675
2536The player should be reasonably safe there for short amounts of time. You 2676The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2677for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2678though, as the player cannot control the character while it is on the link
2679map.
2538 2680
2539Will never block. 2681Will never block.
2540 2682
2541=item $player_object->leave_link ($map, $x, $y) 2683=item $player_object->leave_link ($map, $x, $y)
2542 2684
… …
2562sub cf::object::player::enter_link { 2704sub cf::object::player::enter_link {
2563 my ($self) = @_; 2705 my ($self) = @_;
2564 2706
2565 $self->deactivate_recursive; 2707 $self->deactivate_recursive;
2566 2708
2709 ++$self->{_link_recursion};
2710
2567 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2711 return if UNIVERSAL::isa $self->map, "ext::map_link";
2568 2712
2569 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2713 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2570 if $self->map && $self->map->{path} ne "{link}"; 2714 if $self->map && $self->map->{path} ne "{link}";
2571 2715
2572 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2716 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2573} 2717}
2574 2718
2575sub cf::object::player::leave_link { 2719sub cf::object::player::leave_link {
2576 my ($self, $map, $x, $y) = @_; 2720 my ($self, $map, $x, $y) = @_;
2577 2721
… …
2594 ($x, $y) = (-1, -1) 2738 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2739 unless (defined $x) && (defined $y);
2596 2740
2597 # use -1 or undef as default coordinates, not 0, 0 2741 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2742 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2743 if $x <= 0 && $y <= 0;
2600 2744
2601 $map->load; 2745 $map->load;
2602 $map->load_neighbours; 2746 $map->load_neighbours;
2603 2747
2604 return unless $self->contr->active; 2748 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2749
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2751 if ($self->enter_map ($map, $x, $y)) {
2609} 2752 # entering was successful
2753 delete $self->{_link_recursion};
2754 # only activate afterwards, to support waiting in hooks
2755 $self->activate_recursive;
2756 }
2610 2757
2758}
2759
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2760=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2612 2761
2613Moves the player to the given map-path and coordinates by first freezing 2762Moves the player to the given map-path and coordinates by first freezing
2614her, loading and preparing them map, calling the provided $check callback 2763her, loading and preparing them map, calling the provided $check callback
2615that has to return the map if sucecssful, and then unfreezes the player on 2764that 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 2765the new (success) or old (failed) map position. In either case, $done will
… …
2623 2772
2624our $GOTOGEN; 2773our $GOTOGEN;
2625 2774
2626sub cf::object::player::goto { 2775sub cf::object::player::goto {
2627 my ($self, $path, $x, $y, $check, $done) = @_; 2776 my ($self, $path, $x, $y, $check, $done) = @_;
2777
2778 if ($self->{_link_recursion} >= $MAX_LINKS) {
2779 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2780 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2781 ($path, $x, $y) = @$EMERGENCY_POSITION;
2782 }
2628 2783
2629 # do generation counting so two concurrent goto's will be executed in-order 2784 # do generation counting so two concurrent goto's will be executed in-order
2630 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2785 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2631 2786
2632 $self->enter_link; 2787 $self->enter_link;
… …
2656 my $map = eval { 2811 my $map = eval {
2657 my $map = defined $path ? cf::map::find $path : undef; 2812 my $map = defined $path ? cf::map::find $path : undef;
2658 2813
2659 if ($map) { 2814 if ($map) {
2660 $map = $map->customise_for ($self); 2815 $map = $map->customise_for ($self);
2661 $map = $check->($map) if $check && $map; 2816 $map = $check->($map, $x, $y, $self) if $check && $map;
2662 } else { 2817 } else {
2663 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2818 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2664 } 2819 }
2665 2820
2666 $map 2821 $map
… …
2674 if ($gen == $self->{_goto_generation}) { 2829 if ($gen == $self->{_goto_generation}) {
2675 delete $self->{_goto_generation}; 2830 delete $self->{_goto_generation};
2676 $self->leave_link ($map, $x, $y); 2831 $self->leave_link ($map, $x, $y);
2677 } 2832 }
2678 2833
2679 $done->() if $done; 2834 $done->($self) if $done;
2680 })->prio (1); 2835 })->prio (1);
2681} 2836}
2682 2837
2683=item $player_object->enter_exit ($exit_object) 2838=item $player_object->enter_exit ($exit_object)
2684 2839
… …
2772 $self->contr->savebed ($map, $x, $y) 2927 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2928 if $exit->flag (cf::FLAG_DAMNED);
2774 2929
2775 1 2930 1
2776 }) { 2931 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2932 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "I'll try to bring you back to the map you were before. " 2933 . "I'll try to bring you back to the map you were before. "
2779 . "Please report this to the dungeon master!", 2934 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2935 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2936
2782 warn "ERROR in enter_exit: $@"; 2937 error "ERROR in enter_exit: $@";
2783 $self->leave_link; 2938 $self->leave_link;
2784 } 2939 }
2785 })->prio (1); 2940 })->prio (1);
2786} 2941}
2787 2942
… …
2799sub cf::client::send_drawinfo { 2954sub cf::client::send_drawinfo {
2800 my ($self, $text, $flags) = @_; 2955 my ($self, $text, $flags) = @_;
2801 2956
2802 utf8::encode $text; 2957 utf8::encode $text;
2803 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2958 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2959}
2960
2961=item $client->send_big_packet ($pkt)
2962
2963Like C<send_packet>, but tries to compress large packets, and fragments
2964them as required.
2965
2966=cut
2967
2968our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2969
2970sub cf::client::send_big_packet {
2971 my ($self, $pkt) = @_;
2972
2973 # try lzf for large packets
2974 $pkt = "lzf " . Compress::LZF::compress $pkt
2975 if 1024 <= length $pkt and $self->{can_lzf};
2976
2977 # split very large packets
2978 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2979 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2980 $pkt = "frag";
2981 }
2982
2983 $self->send_packet ($pkt);
2804} 2984}
2805 2985
2806=item $client->send_msg ($channel, $msg, $color, [extra...]) 2986=item $client->send_msg ($channel, $msg, $color, [extra...])
2807 2987
2808Send a drawinfo or msg packet to the client, formatting the msg for the 2988Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2812 2992
2813=cut 2993=cut
2814 2994
2815# non-persistent channels (usually the info channel) 2995# non-persistent channels (usually the info channel)
2816our %CHANNEL = ( 2996our %CHANNEL = (
2997 "c/motd" => {
2998 id => "infobox",
2999 title => "MOTD",
3000 reply => undef,
3001 tooltip => "The message of the day",
3002 },
2817 "c/identify" => { 3003 "c/identify" => {
2818 id => "infobox", 3004 id => "infobox",
2819 title => "Identify", 3005 title => "Identify",
2820 reply => undef, 3006 reply => undef,
2821 tooltip => "Items recently identified", 3007 tooltip => "Items recently identified",
… …
2823 "c/examine" => { 3009 "c/examine" => {
2824 id => "infobox", 3010 id => "infobox",
2825 title => "Examine", 3011 title => "Examine",
2826 reply => undef, 3012 reply => undef,
2827 tooltip => "Signs and other items you examined", 3013 tooltip => "Signs and other items you examined",
3014 },
3015 "c/shopinfo" => {
3016 id => "infobox",
3017 title => "Shop Info",
3018 reply => undef,
3019 tooltip => "What your bargaining skill tells you about the shop",
2828 }, 3020 },
2829 "c/book" => { 3021 "c/book" => {
2830 id => "infobox", 3022 id => "infobox",
2831 title => "Book", 3023 title => "Book",
2832 reply => undef, 3024 reply => undef,
… …
2848 id => "infobox", 3040 id => "infobox",
2849 title => "Body Parts", 3041 title => "Body Parts",
2850 reply => undef, 3042 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 3043 tooltip => "Shows which body parts you posess and are available",
2852 }, 3044 },
3045 "c/statistics" => {
3046 id => "infobox",
3047 title => "Statistics",
3048 reply => undef,
3049 tooltip => "Shows your primary statistics",
3050 },
3051 "c/skills" => {
3052 id => "infobox",
3053 title => "Skills",
3054 reply => undef,
3055 tooltip => "Shows your experience per skill and item power",
3056 },
3057 "c/shopitems" => {
3058 id => "infobox",
3059 title => "Shop Items",
3060 reply => undef,
3061 tooltip => "Shows the items currently for sale in this shop",
3062 },
3063 "c/resistances" => {
3064 id => "infobox",
3065 title => "Resistances",
3066 reply => undef,
3067 tooltip => "Shows your resistances",
3068 },
3069 "c/pets" => {
3070 id => "infobox",
3071 title => "Pets",
3072 reply => undef,
3073 tooltip => "Shows information abotu your pets/a specific pet",
3074 },
3075 "c/perceiveself" => {
3076 id => "infobox",
3077 title => "Perceive Self",
3078 reply => undef,
3079 tooltip => "You gained detailed knowledge about yourself",
3080 },
2853 "c/uptime" => { 3081 "c/uptime" => {
2854 id => "infobox", 3082 id => "infobox",
2855 title => "Uptime", 3083 title => "Uptime",
2856 reply => undef, 3084 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 3085 tooltip => "How long the server has been running since last restart",
… …
2866 id => "party", 3094 id => "party",
2867 title => "Party", 3095 title => "Party",
2868 reply => "gsay ", 3096 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party", 3097 tooltip => "Messages and chat related to your party",
2870 }, 3098 },
3099 "c/death" => {
3100 id => "death",
3101 title => "Death",
3102 reply => undef,
3103 tooltip => "Reason for and more info about your most recent death",
3104 },
3105 "c/say" => $SAY_CHANNEL,
3106 "c/chat" => $CHAT_CHANNEL,
2871); 3107);
2872 3108
2873sub cf::client::send_msg { 3109sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 3110 my ($self, $channel, $msg, $color, @extra) = @_;
2875 3111
2876 $msg = $self->pl->expand_cfpod ($msg); 3112 $msg = $self->pl->expand_cfpod ($msg)
3113 unless $color & cf::NDI_VERBATIM;
2877 3114
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 3115 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 3116
2880 # check predefined channels, for the benefit of C 3117 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 3118 if ($CHANNEL{$channel}) {
2882 $channel = $CHANNEL{$channel}; 3119 $channel = $CHANNEL{$channel};
2883 3120
2884 $self->ext_msg (channel_info => $channel) 3121 $self->ext_msg (channel_info => $channel);
2885 if $self->can_msg;
2886
2887 $channel = $channel->{id}; 3122 $channel = $channel->{id};
2888 3123
2889 } elsif (ref $channel) { 3124 } elsif (ref $channel) {
2890 # send meta info to client, if not yet sent 3125 # send meta info to client, if not yet sent
2891 unless (exists $self->{channel}{$channel->{id}}) { 3126 unless (exists $self->{channel}{$channel->{id}}) {
2892 $self->{channel}{$channel->{id}} = $channel; 3127 $self->{channel}{$channel->{id}} = $channel;
2893 $self->ext_msg (channel_info => $channel) 3128 $self->ext_msg (channel_info => $channel);
2894 if $self->can_msg;
2895 } 3129 }
2896 3130
2897 $channel = $channel->{id}; 3131 $channel = $channel->{id};
2898 } 3132 }
2899 3133
2900 return unless @extra || length $msg; 3134 return unless @extra || length $msg;
2901 3135
2902 if ($self->can_msg) {
2903 # default colour, mask it out 3136 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3137 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 3138 if $color & cf::NDI_DEF;
2906 3139
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3140 my $pkt = "msg "
3141 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3142 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2909 } else { 3143 );
2910 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones
2912 for ($msg) {
2913 1 while
2914 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2915 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2916 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2917 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2918 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2919 }
2920 3144
2921 $color &= cf::NDI_COLOR_MASK; 3145 $self->send_big_packet ($pkt);
2922
2923 utf8::encode $msg;
2924
2925 if (0 && $msg =~ /\[/) {
2926 # COMMAND/INFO
2927 $self->send_packet ("drawextinfo $color 10 8 $msg")
2928 } else {
2929 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2930 $self->send_packet ("drawinfo $color $msg")
2931 }
2932 }
2933 }
2934} 3146}
2935 3147
2936=item $client->ext_msg ($type, @msg) 3148=item $client->ext_msg ($type, @msg)
2937 3149
2938Sends an ext event to the client. 3150Sends an ext event to the client.
… …
2941 3153
2942sub cf::client::ext_msg($$@) { 3154sub cf::client::ext_msg($$@) {
2943 my ($self, $type, @msg) = @_; 3155 my ($self, $type, @msg) = @_;
2944 3156
2945 if ($self->extcmd == 2) { 3157 if ($self->extcmd == 2) {
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3158 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2947 } elsif ($self->extcmd == 1) { # TODO: remove 3159 } elsif ($self->extcmd == 1) { # TODO: remove
2948 push @msg, msgtype => "event_$type"; 3160 push @msg, msgtype => "event_$type";
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3162 }
2951} 3163}
2952 3164
2953=item $client->ext_reply ($msgid, @msg) 3165=item $client->ext_reply ($msgid, @msg)
2954 3166
… …
2958 3170
2959sub cf::client::ext_reply($$@) { 3171sub cf::client::ext_reply($$@) {
2960 my ($self, $id, @msg) = @_; 3172 my ($self, $id, @msg) = @_;
2961 3173
2962 if ($self->extcmd == 2) { 3174 if ($self->extcmd == 2) {
2963 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3175 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2964 } elsif ($self->extcmd == 1) { 3176 } elsif ($self->extcmd == 1) {
2965 #TODO: version 1, remove 3177 #TODO: version 1, remove
2966 unshift @msg, msgtype => "reply", msgid => $id; 3178 unshift @msg, msgtype => "reply", msgid => $id;
2967 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2968 } 3180 }
2969} 3181}
2970 3182
2971=item $success = $client->query ($flags, "text", \&cb) 3183=item $success = $client->query ($flags, "text", \&cb)
2972 3184
… …
3043 3255
3044 $ns->ext_reply ($reply, @reply) 3256 $ns->ext_reply ($reply, @reply)
3045 if $reply; 3257 if $reply;
3046 3258
3047 } else { 3259 } else {
3048 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3260 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3049 } 3261 }
3050 3262
3051 cf::override; 3263 cf::override;
3052 }, 3264 },
3053); 3265);
… …
3073 3285
3074 $coro 3286 $coro
3075} 3287}
3076 3288
3077cf::client->attach ( 3289cf::client->attach (
3078 on_destroy => sub { 3290 on_client_destroy => sub {
3079 my ($ns) = @_; 3291 my ($ns) = @_;
3080 3292
3081 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3293 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3082 }, 3294 },
3083); 3295);
… …
3099our $safe_hole = new Safe::Hole; 3311our $safe_hole = new Safe::Hole;
3100 3312
3101$SIG{FPE} = 'IGNORE'; 3313$SIG{FPE} = 'IGNORE';
3102 3314
3103$safe->permit_only (Opcode::opset qw( 3315$safe->permit_only (Opcode::opset qw(
3104 :base_core :base_mem :base_orig :base_math 3316 :base_core :base_mem :base_orig :base_math :base_loop
3105 grepstart grepwhile mapstart mapwhile 3317 grepstart grepwhile mapstart mapwhile
3106 sort time 3318 sort time
3107)); 3319));
3108 3320
3109# here we export the classes and methods available to script code 3321# here we export the classes and methods available to script code
… …
3113The following functions and methods are available within a safe environment: 3325The following functions and methods are available within a safe environment:
3114 3326
3115 cf::object 3327 cf::object
3116 contr pay_amount pay_player map x y force_find force_add destroy 3328 contr pay_amount pay_player map x y force_find force_add destroy
3117 insert remove name archname title slaying race decrease split 3329 insert remove name archname title slaying race decrease split
3330 value
3118 3331
3119 cf::object::player 3332 cf::object::player
3120 player 3333 player
3121 3334
3122 cf::player 3335 cf::player
… …
3128=cut 3341=cut
3129 3342
3130for ( 3343for (
3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3344 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3132 insert remove inv nrof name archname title slaying race 3345 insert remove inv nrof name archname title slaying race
3133 decrease split destroy change_exp)], 3346 decrease split destroy change_exp value msg lore send_msg)],
3134 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
3135 ["cf::player" => qw(peaceful)], 3348 ["cf::player" => qw(peaceful send_msg)],
3136 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
3137) { 3350) {
3138 no strict 'refs';
3139 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
3140 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3141 for @funs; 3353 for @funs;
3142} 3354}
3143 3355
… …
3158 3370
3159 my $qcode = $code; 3371 my $qcode = $code;
3160 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3372 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3161 $qcode =~ s/\n/\\n/g; 3373 $qcode =~ s/\n/\\n/g;
3162 3374
3375 %vars = (_dummy => 0) unless %vars;
3376
3377 my @res;
3163 local $_; 3378 local $_;
3164 local @safe::cf::_safe_eval_args = values %vars;
3165 3379
3166 my $eval = 3380 my $eval =
3167 "do {\n" 3381 "do {\n"
3168 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3382 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3169 . "#line 0 \"{$qcode}\"\n" 3383 . "#line 0 \"{$qcode}\"\n"
3170 . $code 3384 . $code
3171 . "\n}" 3385 . "\n}"
3172 ; 3386 ;
3173 3387
3388 if ($CFG{safe_eval}) {
3174 sub_generation_inc; 3389 sub_generation_inc;
3390 local @safe::cf::_safe_eval_args = values %vars;
3175 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3391 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3176 sub_generation_inc; 3392 sub_generation_inc;
3393 } else {
3394 local @cf::_safe_eval_args = values %vars;
3395 @res = wantarray ? eval eval : scalar eval $eval;
3396 }
3177 3397
3178 if ($@) { 3398 if ($@) {
3179 warn "$@"; 3399 warn "$@",
3180 warn "while executing safe code '$code'\n"; 3400 "while executing safe code '$code'\n",
3181 warn "with arguments " . (join " ", %vars) . "\n"; 3401 "with arguments " . (join " ", %vars) . "\n";
3182 } 3402 }
3183 3403
3184 wantarray ? @res : $res[0] 3404 wantarray ? @res : $res[0]
3185} 3405}
3186 3406
… …
3200=cut 3420=cut
3201 3421
3202sub register_script_function { 3422sub register_script_function {
3203 my ($fun, $cb) = @_; 3423 my ($fun, $cb) = @_;
3204 3424
3205 no strict 'refs'; 3425 $fun = "safe::$fun" if $CFG{safe_eval};
3206 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3426 *$fun = $safe_hole->wrap ($cb);
3207} 3427}
3208 3428
3209=back 3429=back
3210 3430
3211=cut 3431=cut
… …
3220 # for this (global event?) 3440 # for this (global event?)
3221 %ext::player_env::MUSIC_FACE_CACHE = (); 3441 %ext::player_env::MUSIC_FACE_CACHE = ();
3222 3442
3223 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3224 3444
3225 warn "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
3226 3446
3227 my $facedata; 3447 my $facedata = decode_storable load_file $path;
3228 0 < aio_load $path, $facedata
3229 or die "$path: $!";
3230
3231 $facedata = Coro::Storable::thaw $facedata;
3232 3448
3233 $facedata->{version} == 2 3449 $facedata->{version} == 2
3234 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
3235 3451
3236 # patch in the exptable 3452 # patch in the exptable
3453 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3237 $facedata->{resource}{"res/exp_table"} = { 3454 $facedata->{resource}{"res/exp_table"} = {
3238 type => FT_RSRC, 3455 type => FT_RSRC,
3239 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3456 data => $exp_table,
3457 hash => (Digest::MD5::md5 $exp_table),
3240 }; 3458 };
3241 cf::cede_to_tick; 3459 cf::cede_to_tick;
3242 3460
3243 { 3461 {
3244 my $faces = $facedata->{faceinfo}; 3462 my $faces = $facedata->{faceinfo};
… …
3246 while (my ($face, $info) = each %$faces) { 3464 while (my ($face, $info) = each %$faces) {
3247 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3465 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248 3466
3249 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3250 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3251 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3252 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3470 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3471 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3253 3472
3254 cf::cede_to_tick; 3473 cf::cede_to_tick;
3255 } 3474 }
3256 3475
3257 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
… …
3262 3481
3263 if (my $smooth = cf::face::find $info->{smooth}) { 3482 if (my $smooth = cf::face::find $info->{smooth}) {
3264 cf::face::set_smooth $idx, $smooth; 3483 cf::face::set_smooth $idx, $smooth;
3265 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3266 } else { 3485 } else {
3267 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3486 error "smooth face '$info->{smooth}' not found for face '$face'";
3268 } 3487 }
3269 3488
3270 cf::cede_to_tick; 3489 cf::cede_to_tick;
3271 } 3490 }
3272 } 3491 }
… …
3281 3500
3282 cf::anim::invalidate_all; # d'oh 3501 cf::anim::invalidate_all; # d'oh
3283 } 3502 }
3284 3503
3285 { 3504 {
3286 # TODO: for gcfclient pleasure, we should give resources
3287 # that gcfclient doesn't grok a >10000 face index.
3288 my $res = $facedata->{resource}; 3505 my $res = $facedata->{resource};
3289 3506
3290 while (my ($name, $info) = each %$res) { 3507 while (my ($name, $info) = each %$res) {
3291 if (defined $info->{type}) { 3508 if (defined $info->{type}) {
3292 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3509 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3293 my $data;
3294 3510
3295 if ($info->{type} & 1) { 3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3296 # prepend meta info
3297
3298 my $meta = $enc->encode ({
3299 name => $name,
3300 %{ $info->{meta} || {} },
3301 });
3302
3303 $data = pack "(w/a*)*", $meta, $info->{data};
3304 } else {
3305 $data = $info->{data};
3306 }
3307
3308 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3309 cf::face::set_type $idx, $info->{type}; 3512 cf::face::set_type $idx, $info->{type};
3310 } else { 3513 } else {
3311 $RESOURCE{$name} = $info; 3514 $RESOURCE{$name} = $info; # unused
3312 } 3515 }
3313 3516
3314 cf::cede_to_tick; 3517 cf::cede_to_tick;
3315 } 3518 }
3316 } 3519 }
3317 3520
3318 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3521 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3319 3522
3320 1 3523 1
3321} 3524}
3322
3323cf::global->attach (on_resource_update => sub {
3324 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3325 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3326
3327 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3328 my $sound = $soundconf->{compat}[$_]
3329 or next;
3330
3331 my $face = cf::face::find "sound/$sound->[1]";
3332 cf::sound::set $sound->[0] => $face;
3333 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3334 }
3335
3336 while (my ($k, $v) = each %{$soundconf->{event}}) {
3337 my $face = cf::face::find "sound/$v";
3338 cf::sound::set $k => $face;
3339 }
3340 }
3341});
3342 3525
3343register_exticmd fx_want => sub { 3526register_exticmd fx_want => sub {
3344 my ($ns, $want) = @_; 3527 my ($ns, $want) = @_;
3345 3528
3346 while (my ($k, $v) = each %$want) { 3529 while (my ($k, $v) = each %$want) {
… …
3385sub reload_treasures { 3568sub reload_treasures {
3386 load_resource_file "$DATADIR/treasures" 3569 load_resource_file "$DATADIR/treasures"
3387 or die "unable to load treasurelists\n"; 3570 or die "unable to load treasurelists\n";
3388} 3571}
3389 3572
3573sub reload_sound {
3574 trace "loading sound config from $DATADIR/sound\n";
3575
3576 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3577
3578 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3579 my $sound = $soundconf->{compat}[$_]
3580 or next;
3581
3582 my $face = cf::face::find "sound/$sound->[1]";
3583 cf::sound::set $sound->[0] => $face;
3584 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3585 }
3586
3587 while (my ($k, $v) = each %{$soundconf->{event}}) {
3588 my $face = cf::face::find "sound/$v";
3589 cf::sound::set $k => $face;
3590 }
3591}
3592
3390sub reload_resources { 3593sub reload_resources {
3391 warn "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3392 3595
3596 reload_exp_table;
3597 reload_materials;
3393 reload_facedata; 3598 reload_facedata;
3599 reload_sound;
3394 reload_archetypes; 3600 reload_archetypes;
3395 reload_regions; 3601 reload_regions;
3396 reload_treasures; 3602 reload_treasures;
3397 3603
3398 warn "finished reloading resource files\n"; 3604 trace "finished reloading resource files\n";
3399}
3400
3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3406 reload_resources;
3407} 3605}
3408 3606
3409sub reload_config { 3607sub reload_config {
3410 open my $fh, "<:utf8", "$CONFDIR/config" 3608 trace "reloading config file...\n";
3411 or return;
3412 3609
3413 local $/; 3610 my $config = load_file "$CONFDIR/config";
3414 *CFG = YAML::Load <$fh>; 3611 utf8::decode $config;
3612 *CFG = decode_yaml $config;
3415 3613
3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3417 3615
3418 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3616 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3419 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3617 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3420 3618
3421 if (exists $CFG{mlockall}) { 3619 if (exists $CFG{mlockall}) {
… …
3425 }; 3623 };
3426 warn $@ if $@; 3624 warn $@ if $@;
3427 } 3625 }
3428} 3626}
3429 3627
3628sub pidfile() {
3629 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3630 or die "$PIDFILE: $!";
3631 flock $fh, &Fcntl::LOCK_EX
3632 or die "$PIDFILE: flock: $!";
3633 $fh
3634}
3635
3636# make sure only one server instance is running at any one time
3637sub atomic {
3638 my $fh = pidfile;
3639
3640 my $pid = <$fh>;
3641 kill 9, $pid if $pid > 0;
3642
3643 seek $fh, 0, 0;
3644 print $fh $$;
3645}
3646
3647sub main_loop {
3648 trace "EV::loop starting\n";
3649 if (1) {
3650 EV::loop;
3651 }
3652 trace "EV::loop returned\n";
3653 goto &main_loop unless $REALLY_UNLOOP;
3654}
3655
3430sub main { 3656sub main {
3657 cf::init_globals; # initialise logging
3658
3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3662 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3663
3664 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3665
3431 # we must not ever block the main coroutine 3666 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3667 local $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3668 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3669 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3670 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3671 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3672 })->prio (Coro::PRIO_MAX);
3438 }; 3673 };
3439 3674
3440 { 3675 evthread_start IO::AIO::poll_fileno;
3441 my $guard = freeze_mainloop; 3676
3677 cf::sync_job {
3678 cf::incloader::init ();
3679
3680 cf::init_anim;
3681 cf::init_attackmess;
3682 cf::init_dynamic;
3683
3684 cf::load_settings;
3685
3686 reload_resources;
3442 reload_config; 3687 reload_config;
3443 db_init; 3688 db_init;
3689
3690 cf::init_uuid;
3691 cf::init_signals;
3692 cf::init_skills;
3693
3694 cf::init_beforeplay;
3695
3696 atomic;
3697
3444 load_extensions; 3698 load_extensions;
3445 3699
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3700 utime time, time, $RUNTIMEFILE;
3701
3702 # no (long-running) fork's whatsoever before this point(!)
3703 use POSIX ();
3704 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3705
3706 cf::_post_init 0;
3447 } 3707 };
3448 3708
3449 EV::loop; 3709 cf::object::thawer::errors_are_fatal 0;
3710 info "parse errors in files are no longer fatal from this point on.\n";
3711
3712 my $free_main; $free_main = EV::idle sub {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :)
3715 };
3716
3717 goto &main_loop;
3450} 3718}
3451 3719
3452############################################################################# 3720#############################################################################
3453# initialisation and cleanup 3721# initialisation and cleanup
3454 3722
3455# install some emergency cleanup handlers 3723# install some emergency cleanup handlers
3456BEGIN { 3724BEGIN {
3457 our %SIGWATCHER = (); 3725 our %SIGWATCHER = ();
3458 for my $signal (qw(INT HUP TERM)) { 3726 for my $signal (qw(INT HUP TERM)) {
3459 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3727 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3460 cf::cleanup "SIG$signal"; 3728 cf::cleanup "SIG$signal";
3461 }; 3729 };
3462 } 3730 }
3463} 3731}
3464 3732
3465sub write_runtime_sync { 3733sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime"; 3734 my $t0 = AE::time;
3467 3735
3468 # first touch the runtime file to show we are still running: 3736 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3737 # the fsync below can take a very very long time.
3470 3738
3471 IO::AIO::aio_utime $runtime, undef, undef; 3739 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3740
3473 my $guard = cf::lock_acquire "write_runtime"; 3741 my $guard = cf::lock_acquire "write_runtime";
3474 3742
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3743 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3476 or return; 3744 or return;
3477 3745
3478 my $value = $cf::RUNTIME + 90 + 10; 3746 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3747 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3748 # 60 allows for the watchdog to kill the server.
… …
3490 aio_utime $fh, undef, undef; 3758 aio_utime $fh, undef, undef;
3491 3759
3492 close $fh 3760 close $fh
3493 or return; 3761 or return;
3494 3762
3495 aio_rename "$runtime~", $runtime 3763 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3764 and return;
3497 3765
3498 warn "runtime file written.\n"; 3766 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3499 3767
3500 1 3768 1
3501} 3769}
3502 3770
3503our $uuid_lock; 3771our $uuid_lock;
… …
3512 my $uuid = "$LOCALDIR/uuid"; 3780 my $uuid = "$LOCALDIR/uuid";
3513 3781
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3782 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return; 3783 or return;
3516 3784
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3785 my $value = uuid_seq uuid_cur;
3786
3787 unless ($value) {
3788 info "cowardly refusing to write zero uuid value!\n";
3789 return;
3790 }
3791
3792 my $value = uuid_str $value + $uuid_skip;
3518 $uuid_skip = 0; 3793 $uuid_skip = 0;
3519 3794
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3795 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return; 3796 and return;
3522 3797
… …
3528 or return; 3803 or return;
3529 3804
3530 aio_rename "$uuid~", $uuid 3805 aio_rename "$uuid~", $uuid
3531 and return; 3806 and return;
3532 3807
3533 warn "uuid file written ($value).\n"; 3808 trace "uuid file written ($value).\n";
3534 3809
3535 1 3810 1
3536 3811
3537} 3812}
3538 3813
… …
3544} 3819}
3545 3820
3546sub emergency_save() { 3821sub emergency_save() {
3547 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3548 3823
3549 warn "enter emergency perl save\n"; 3824 info "emergency_perl_save: enter\n";
3825
3826 # this is a trade-off: we want to be very quick here, so
3827 # save all maps without fsync, and later call a global sync
3828 # (which in turn might be very very slow)
3829 local $USE_FSYNC = 0;
3550 3830
3551 cf::sync_job { 3831 cf::sync_job {
3832 cf::write_runtime_sync; # external watchdog should not bark
3833
3552 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3555 warn "begin emergency player save\n"; 3837 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3838 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3839 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3840 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3842 $pl->save;
3561 } 3843 }
3562 warn "end emergency player save\n"; 3844 info "emergency_perl_save: end player save\n";
3563 3845
3564 warn "begin emergency map save\n"; 3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 info "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3851 $map->valid or next;
3568 $map->save; 3852 $map->save;
3569 } 3853 }
3570 warn "end emergency map save\n"; 3854 info "emergency_perl_save: end map save\n";
3571 3855
3572 warn "begin emergency database checkpoint\n"; 3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 info "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "end emergency database checkpoint\n"; 3860 info "emergency_perl_save: end database checkpoint\n";
3575 3861
3576 warn "begin write uuid\n"; 3862 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3863 write_uuid_sync 1;
3578 warn "end write uuid\n"; 3864 info "emergency_perl_save: end write uuid\n";
3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 trace "emergency_perl_save: syncing database to disk";
3869 BDB::db_env_txn_checkpoint $DB_ENV;
3870
3871 info "emergency_perl_save: starting sync\n";
3872 IO::AIO::aio_sync sub {
3873 info "emergency_perl_save: finished sync\n";
3874 };
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) {
3880 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3881 }
3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3579 }; 3884 };
3580 3885
3581 warn "leave emergency perl save\n"; 3886 info "emergency_perl_save: leave\n";
3582} 3887}
3583 3888
3584sub post_cleanup { 3889sub post_cleanup {
3585 my ($make_core) = @_; 3890 my ($make_core) = @_;
3586 3891
3892 IO::AIO::flush;
3893
3587 warn Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3895 if $make_core;
3896
3897 my $fh = pidfile;
3898 unlink $PIDFILE if <$fh> == $$;
3899}
3900
3901# a safer delete_package, copied from Symbol
3902sub clear_package($) {
3903 my $pkg = shift;
3904
3905 # expand to full symbol table name if needed
3906 unless ($pkg =~ /^main::.*::$/) {
3907 $pkg = "main$pkg" if $pkg =~ /^::/;
3908 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3909 $pkg .= '::' unless $pkg =~ /::$/;
3910 }
3911
3912 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3913 my $stem_symtab = *{$stem}{HASH};
3914
3915 defined $stem_symtab and exists $stem_symtab->{$leaf}
3916 or return;
3917
3918 # clear all symbols
3919 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3920 for my $name (keys %$leaf_symtab) {
3921 _gv_clear *{"$pkg$name"};
3922# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3923 }
3589} 3924}
3590 3925
3591sub do_reload_perl() { 3926sub do_reload_perl() {
3592 # can/must only be called in main 3927 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3928 unless (in_main) {
3594 warn "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3595 return; 3930 return;
3596 } 3931 }
3597 3932
3598 warn "reloading..."; 3933 return if $RELOAD++;
3599 3934
3600 warn "entering sync_job"; 3935 my $t1 = AE::time;
3601 3936
3937 while ($RELOAD) {
3938 cf::get_slot 0.1, -1, "reload_perl";
3939 info "perl_reload: reloading...";
3940
3941 trace "perl_reload: entering sync_job";
3942
3602 cf::sync_job { 3943 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3944 #cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark
3606 3945
3607 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV;
3609
3610 # if anything goes wrong in here, we should simply crash as we already saved
3611
3612 warn "flushing outstanding aio requests";
3613 for (;;) {
3614 BDB::flush;
3615 IO::AIO::flush;
3616 Coro::cede_notself;
3617 last unless IO::AIO::nreqs || BDB::nreqs;
3618 warn "iterate...";
3619 }
3620
3621 ++$RELOAD;
3622
3623 warn "cancelling all extension coros"; 3946 trace "perl_reload: cancelling all extension coros";
3624 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3625 %EXT_CORO = (); 3948 %EXT_CORO = ();
3626 3949
3627 warn "removing commands"; 3950 trace "perl_reload: removing commands";
3628 %COMMAND = (); 3951 %COMMAND = ();
3629 3952
3630 warn "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3631 %EXTCMD = (); 3954 %EXTCMD = ();
3632 %EXTICMD = (); 3955 %EXTICMD = ();
3633 3956
3634 warn "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3635 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3636 warn "... unloading $pkg"; 3959 trace "... unloading $pkg";
3637 3960
3638 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3639 eval { 3962 eval {
3640 $cb->($pkg); 3963 $cb->($pkg);
3641 1 3964 1
3642 } or warn "$pkg unloaded, but with errors: $@"; 3965 } or error "$pkg unloaded, but with errors: $@";
3966 }
3967
3968 trace "... clearing $pkg";
3969 clear_package $pkg;
3643 } 3970 }
3644 3971
3645 warn "... nuking $pkg";
3646 Symbol::delete_package $pkg;
3647 }
3648
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3650 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3975
3653 warn "... unloading $k"; 3976 trace "... unloading $k";
3654 delete $INC{$k}; 3977 delete $INC{$k};
3655 3978
3656 $k =~ s/\.pm$//; 3979 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g; 3980 $k =~ s/\//::/g;
3658 3981
3659 if (my $cb = $k->can ("unload_module")) { 3982 if (my $cb = $k->can ("unload_module")) {
3660 $cb->(); 3983 $cb->();
3984 }
3985
3986 clear_package $k;
3661 } 3987 }
3662 3988
3663 Symbol::delete_package $k;
3664 }
3665
3666 warn "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3990 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3991 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3992
3670 warn "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3673 3996
3674 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3998 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3677 4000
3678 warn "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3679 4002
3680 warn "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3681 require cf; 4004 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4005 cf::_connect_to_perl_1;
3683 4006
3684 warn "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3685 cf::reload_config; 4008 cf::reload_config;
3686 4009
3687 warn "loading extensions"; 4010 trace "perl_reload: loading extensions";
3688 cf::load_extensions; 4011 cf::load_extensions;
3689 4012
4013 if ($REATTACH_ON_RELOAD) {
3690 warn "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3693 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
4020 }
3696 4021
3697 warn "leaving sync_job"; 4022 cf::_post_init 1;
3698 4023
4024 trace "perl_reload: leaving sync_job";
4025
3699 1 4026 1
3700 } or do { 4027 } or do {
3701 warn $@; 4028 error $@;
3702 cf::cleanup "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
4030 };
4031
4032 --$RELOAD;
3703 }; 4033 }
3704 4034
3705 warn "reloaded"; 4035 $t1 = AE::time - $t1;
4036 info "perl_reload: completed in ${t1}s\n";
3706}; 4037};
3707 4038
3708our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3709 4040
3710sub reload_perl() { 4041sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 4042 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 4043 # coro crashes during coro_state_free->destroy here.
3713 4044
4045 $RELOAD_WATCHER ||= cf::async {
4046 Coro::AIO::aio_wait cache_extensions;
4047
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4048 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 4049 do_reload_perl;
3716 undef $RELOAD_WATCHER; 4050 undef $RELOAD_WATCHER;
4051 };
3717 }; 4052 };
3718} 4053}
3719 4054
3720register_command "reload" => sub { 4055register_command "reload" => sub {
3721 my ($who, $arg) = @_; 4056 my ($who, $arg) = @_;
… …
3727 reload_perl; 4062 reload_perl;
3728 }; 4063 };
3729 } 4064 }
3730}; 4065};
3731 4066
3732unshift @INC, $LIBDIR; 4067#############################################################################
3733 4068
3734my $bug_warning = 0; 4069my $bug_warning = 0;
3735 4070
3736our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3737our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3738 4073
3739sub wait_for_tick { 4074sub wait_for_tick() {
3740 return if tick_inhibit || $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3741 4076
3742 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3743 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3744 $signal->wait; 4079 $signal->wait;
3745} 4080}
3746 4081
3747sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
3748 return if tick_inhibit || $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3749 4084
3750 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
3751 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
3752 $signal->wait; 4087 $signal->wait;
3753} 4088}
… …
3759 return; 4094 return;
3760 } 4095 }
3761 4096
3762 cf::server_tick; # one server iteration 4097 cf::server_tick; # one server iteration
3763 4098
4099 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4100
3764 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4102 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3766 Coro::async_pool { 4103 Coro::async_pool {
3767 $Coro::current->{desc} = "runtime saver"; 4104 $Coro::current->{desc} = "runtime saver";
3768 write_runtime_sync 4105 write_runtime_sync
3769 or warn "ERROR: unable to write runtime file: $!"; 4106 or error "ERROR: unable to write runtime file: $!";
3770 }; 4107 };
3771 } 4108 }
3772 4109
3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3774 $sig->send; 4111 $sig->send;
… …
3782 4119
3783 if (0) { 4120 if (0) {
3784 if ($NEXT_TICK) { 4121 if ($NEXT_TICK) {
3785 my $jitter = $TICK_START - $NEXT_TICK; 4122 my $jitter = $TICK_START - $NEXT_TICK;
3786 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4123 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3787 warn "jitter $JITTER\n";#d# 4124 debug "jitter $JITTER\n";#d#
3788 } 4125 }
3789 } 4126 }
3790} 4127}
3791 4128
3792{ 4129{
3793 # configure BDB 4130 # configure BDB
3794 4131
3795 BDB::min_parallel 8; 4132 BDB::min_parallel 16;
3796 BDB::max_poll_reqs $TICK * 0.1; 4133 BDB::max_poll_reqs $TICK * 0.1;
3797 $AnyEvent::BDB::WATCHER->priority (1); 4134 $AnyEvent::BDB::WATCHER->priority (1);
3798 4135
3799 unless ($DB_ENV) { 4136 unless ($DB_ENV) {
3800 $DB_ENV = BDB::db_env_create; 4137 $DB_ENV = BDB::db_env_create;
… …
3837 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
3838 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
3839 undef $AnyEvent::AIO::WATCHER; 4176 undef $AnyEvent::AIO::WATCHER;
3840} 4177}
3841 4178
3842my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
3843 4181
3844sub _log_backtrace { 4182sub _log_backtrace {
3845 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
3846 4184
3847 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
3848 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3849 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
3850 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
3851 ++$_log_backtrace; 4193 ++$_log_backtrace;
4194 my $perl_bt = Carp::longmess $msg;
3852 async { 4195 async {
3853 $Coro::current->{desc} = "abt $msg"; 4196 $Coro::current->{desc} = "abt $msg";
3854 4197
3855 my @bt = fork_call { 4198 my @bt = fork_call {
3856 @addr = map { sprintf "%x", $_ } @addr; 4199 @addr = map { sprintf "%x", $_ } @addr;
… …
3867 } 4210 }
3868 4211
3869 @funcs 4212 @funcs
3870 }; 4213 };
3871 4214
3872 LOG llevInfo, "[ABT] $msg\n"; 4215 LOG llevInfo, "[ABT] $perl_bt\n";
4216 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 4218 --$_log_backtrace;
3875 }; 4219 };
3876 } else { 4220 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3879 } 4223 }
3880} 4224}
3881 4225
3882# load additional modules 4226# load additional modules
3883use cf::pod; 4227require "cf/$_.pm" for @EXTRA_MODULES;
4228cf::_connect_to_perl_2;
3884 4229
3885END { cf::emergency_save } 4230END { cf::emergency_save }
3886 4231
38871 42321
3888 4233

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines