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.539 by root, Tue May 4 22:49:21 2010 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
71 80
72our %COMMAND = (); 81our %COMMAND = ();
73our %COMMAND_TIME = (); 82our %COMMAND_TIME = ();
… …
76our %EXTCMD = (); 85our %EXTCMD = ();
77our %EXTICMD = (); 86our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 87our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 88our %EXT_MAP = (); # pluggable maps
80 89
81our $RELOAD; # number of reloads so far 90our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 91our @EVENT;
92our @REFLECT; # set by XS
93our %REFLECT; # set by us
83 94
84our $CONFDIR = confdir; 95our $CONFDIR = confdir;
85our $DATADIR = datadir; 96our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 97our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 98our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 99our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 100our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 101our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 102our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 103our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 104our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 105our $BDBDIR = "$LOCALDIR/db";
106our $PIDFILE = "$LOCALDIR/pid";
107our $RUNTIMEFILE = "$LOCALDIR/runtime";
108
95our %RESOURCE; 109our %RESOURCE; # unused
110
111our $OUTPUT_RATE_MIN = 3000;
112our $OUTPUT_RATE_MAX = 1000000;
113
114our $MAX_LINKS = 32; # how many chained exits to follow
115our $VERBOSE_IO = 1;
96 116
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 117our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 118our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 119our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 120our $USE_FSYNC = 1; # use fsync to write maps - default on
101 121
102our $BDB_DEADLOCK_WATCHER; 122our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 123our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 124our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 125our $DB_ENV;
106 126
127our @EXTRA_MODULES = qw(pod match mapscript);
128
107our %CFG; 129our %CFG;
108 130
109our $UPTIME; $UPTIME ||= time; 131our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 132our $RUNTIME;
111our $NOW; 133our $NOW;
… …
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 142our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 143our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 144our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 145our $TICK_START; # for load detecting purposes
124 146
147our @POST_INIT;
148
149our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
150our $REALLY_UNLOOP; # never set to true, please :)
151
125binmode STDOUT; 152binmode STDOUT;
126binmode STDERR; 153binmode STDERR;
127 154
128# read virtual server time, if available 155# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 156unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 157 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 158 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 159 $RUNTIME = <$fh> + 0.;
133} 160}
161
162eval "sub TICK() { $TICK } 1" or die;
134 163
135mkdir $_ 164mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 165 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 166
138our $EMERGENCY_POSITION; 167our $EMERGENCY_POSITION;
139 168
140sub cf::map::normalise; 169sub cf::map::normalise;
170
171sub in_main() {
172 $Coro::current == $Coro::main
173}
174
175#############################################################################
176
177%REFLECT = ();
178for (@REFLECT) {
179 my $reflect = JSON::XS::decode_json $_;
180 $REFLECT{$reflect->{class}} = $reflect;
181}
182
183# this is decidedly evil
184$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
141 185
142############################################################################# 186#############################################################################
143 187
144=head2 GLOBAL VARIABLES 188=head2 GLOBAL VARIABLES
145 189
… …
192returns directly I<after> the tick processing (and consequently, can only wake one process 236returns directly I<after> the tick processing (and consequently, can only wake one process
193per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 237per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
194 238
195=item @cf::INVOKE_RESULTS 239=item @cf::INVOKE_RESULTS
196 240
197This array contains the results of the last C<invoke ()> call. When 241This 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 242C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call. 243that call.
200 244
245=item %cf::REFLECT
246
247Contains, for each (C++) class name, a hash reference with information
248about object members (methods, scalars, arrays and flags) and other
249metadata, which is useful for introspection.
250
201=back 251=back
202 252
203=cut 253=cut
204 254
205BEGIN { 255sub error(@) { LOG llevError, join "", @_ }
206 *CORE::GLOBAL::warn = sub { 256sub warn (@) { LOG llevWarn , join "", @_ }
257sub info (@) { LOG llevInfo , join "", @_ }
258sub debug(@) { LOG llevDebug, join "", @_ }
259sub trace(@) { LOG llevTrace, join "", @_ }
260
261$Coro::State::WARNHOOK = sub {
207 my $msg = join "", @_; 262 my $msg = join "", @_;
208 263
209 $msg .= "\n" 264 $msg .= "\n"
210 unless $msg =~ /\n$/; 265 unless $msg =~ /\n$/;
211 266
212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 267 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
213 268
214 LOG llevError, $msg; 269 LOG llevWarn, $msg;
215 }; 270};
216}
217 271
218$Coro::State::DIEHOOK = sub { 272$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 273 return unless $^S eq 0; # "eq", not "=="
220 274
221 if ($Coro::current == $Coro::main) {#d# 275 error Carp::longmess $_[0];
276
277 if (in_main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 278 error "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 279 return;#d#
224 }#d# 280 }#d#
225 281
226 # kill coroutine otherwise 282 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 283 Coro::terminate
229}; 284};
230
231$SIG{__DIE__} = sub { }; #d#?
232 285
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 286@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 287@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 288@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 289@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
243for my $pkg (qw( 296for my $pkg (qw(
244 cf::global cf::attachable 297 cf::global cf::attachable
245 cf::object cf::object::player 298 cf::object cf::object::player
246 cf::client cf::player 299 cf::client cf::player
247 cf::arch cf::living 300 cf::arch cf::living
301 cf::map cf::mapspace
248 cf::map cf::party cf::region 302 cf::party cf::region
249)) { 303)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 304 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 305}
253 306
254$EV::DIED = sub { 307$EV::DIED = sub {
255 warn "error in event callback: @_"; 308 Carp::cluck "error in event callback: @_";
256}; 309};
257 310
258############################################################################# 311#############################################################################
259 312
260=head2 UTILITY FUNCTIONS 313=head2 UTILITY FUNCTIONS
… …
297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 350our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298 351
299sub encode_json($) { $json_coder->encode ($_[0]) } 352sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 353sub decode_json($) { $json_coder->decode ($_[0]) }
301 354
355=item cf::post_init { BLOCK }
356
357Execute the given codeblock, I<after> all extensions have been (re-)loaded,
358but I<before> the server starts ticking again.
359
360The cdoeblock will have a single boolean argument to indicate whether this
361is a reload or not.
362
363=cut
364
365sub post_init(&) {
366 push @POST_INIT, shift;
367}
368
302=item cf::lock_wait $string 369=item cf::lock_wait $string
303 370
304Wait until the given lock is available. See cf::lock_acquire. 371Wait until the given lock is available. See cf::lock_acquire.
305 372
306=item my $lock = cf::lock_acquire $string 373=item my $lock = cf::lock_acquire $string
307 374
308Wait until the given lock is available and then acquires it and returns 375Wait 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, 376a L<Guard> object. If the guard object gets destroyed (goes out of scope,
310for example when the coroutine gets canceled), the lock is automatically 377for example when the coroutine gets canceled), the lock is automatically
311returned. 378returned.
312 379
313Locks are *not* recursive, locking from the same coro twice results in a 380Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro. 381deadlocked coro.
… …
320 387
321Return true if the lock is currently active, i.e. somebody has locked it. 388Return true if the lock is currently active, i.e. somebody has locked it.
322 389
323=cut 390=cut
324 391
325our %LOCK; 392our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 393
328sub lock_wait($) { 394sub lock_wait($) {
329 my ($key) = @_; 395 $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} 396}
342 397
343sub lock_acquire($) { 398sub lock_acquire($) {
344 my ($key) = @_; 399 $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} 400}
358 401
359sub lock_active($) { 402sub lock_active($) {
360 my ($key) = @_; 403 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 404}
364 405
365sub freeze_mainloop { 406sub freeze_mainloop {
366 tick_inhibit_inc; 407 tick_inhibit_inc;
367 408
368 Coro::guard \&tick_inhibit_dec; 409 &Guard::guard (\&tick_inhibit_dec);
369} 410}
370 411
371=item cf::periodic $interval, $cb 412=item cf::periodic $interval, $cb
372 413
373Like EV::periodic, but randomly selects a starting point so that the actions 414Like EV::periodic, but randomly selects a starting point so that the actions
374get spread over timer. 415get spread over time.
375 416
376=cut 417=cut
377 418
378sub periodic($$) { 419sub periodic($$) {
379 my ($interval, $cb) = @_; 420 my ($interval, $cb) = @_;
… …
396 437
397=cut 438=cut
398 439
399our @SLOT_QUEUE; 440our @SLOT_QUEUE;
400our $SLOT_QUEUE; 441our $SLOT_QUEUE;
442our $SLOT_DECAY = 0.9;
401 443
402$SLOT_QUEUE->cancel if $SLOT_QUEUE; 444$SLOT_QUEUE->cancel if $SLOT_QUEUE;
403$SLOT_QUEUE = Coro::async { 445$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager"); 446 $Coro::current->desc ("timeslot manager");
405 447
406 my $signal = new Coro::Signal; 448 my $signal = new Coro::Signal;
449 my $busy;
407 450
408 while () { 451 while () {
409 next_job: 452 next_job:
453
410 my $avail = cf::till_tick; 454 my $avail = cf::till_tick;
411 if ($avail > 0.01) { 455
412 for (0 .. $#SLOT_QUEUE) { 456 for (0 .. $#SLOT_QUEUE) {
413 if ($SLOT_QUEUE[$_][0] < $avail) { 457 if ($SLOT_QUEUE[$_][0] <= $avail) {
458 $busy = 0;
414 my $job = splice @SLOT_QUEUE, $_, 1, (); 459 my $job = splice @SLOT_QUEUE, $_, 1, ();
415 $job->[2]->send; 460 $job->[2]->send;
416 Coro::cede; 461 Coro::cede;
417 goto next_job; 462 goto next_job;
418 } 463 } else {
464 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
419 } 465 }
420 } 466 }
421 467
422 if (@SLOT_QUEUE) { 468 if (@SLOT_QUEUE) {
423 # we do not use wait_for_tick() as it returns immediately when tick is inactive 469 # we do not use wait_for_tick() as it returns immediately when tick is inactive
424 push @cf::WAIT_FOR_TICK, $signal; 470 push @cf::WAIT_FOR_TICK, $signal;
425 $signal->wait; 471 $signal->wait;
426 } else { 472 } else {
473 $busy = 0;
427 Coro::schedule; 474 Coro::schedule;
428 } 475 }
429 } 476 }
430}; 477};
431 478
432sub get_slot($;$$) { 479sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main; 480 return if tick_inhibit || $Coro::current == $Coro::main;
434 481
435 my ($time, $pri, $name) = @_; 482 my ($time, $pri, $name) = @_;
436 483
437 $time = $TICK * .6 if $time > $TICK * .6; 484 $time = clamp $time, 0.01, $TICK * .6;
485
438 my $sig = new Coro::Signal; 486 my $sig = new Coro::Signal;
439 487
440 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 488 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
441 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 489 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
442 $SLOT_QUEUE->ready; 490 $SLOT_QUEUE->ready;
… …
468=cut 516=cut
469 517
470sub sync_job(&) { 518sub sync_job(&) {
471 my ($job) = @_; 519 my ($job) = @_;
472 520
473 if ($Coro::current == $Coro::main) { 521 if (in_main) {
474 my $time = EV::time; 522 my $time = AE::time;
475 523
476 # this is the main coro, too bad, we have to block 524 # this is the main coro, too bad, we have to block
477 # till the operation succeeds, freezing the server :/ 525 # till the operation succeeds, freezing the server :/
478 526
479 LOG llevError, Carp::longmess "sync job";#d# 527 #LOG llevError, Carp::longmess "sync job";#d#
480 528
481 my $freeze_guard = freeze_mainloop; 529 my $freeze_guard = freeze_mainloop;
482 530
483 my $busy = 1; 531 my $busy = 1;
484 my @res; 532 my @res;
485 533
486 (async { 534 (async {
487 $Coro::current->desc ("sync job coro"); 535 $Coro::current->desc ("sync job coro");
488 @res = eval { $job->() }; 536 @res = eval { $job->() };
489 warn $@ if $@; 537 error $@ if $@;
490 undef $busy; 538 undef $busy;
491 })->prio (Coro::PRIO_MAX); 539 })->prio (Coro::PRIO_MAX);
492 540
493 while ($busy) { 541 while ($busy) {
494 if (Coro::nready) { 542 if (Coro::nready) {
… …
496 } else { 544 } else {
497 EV::loop EV::LOOP_ONESHOT; 545 EV::loop EV::LOOP_ONESHOT;
498 } 546 }
499 } 547 }
500 548
501 my $time = EV::time - $time; 549 my $time = AE::time - $time;
502 550
503 $TICK_START += $time; # do not account sync jobs to server load 551 $TICK_START += $time; # do not account sync jobs to server load
504 552
505 wantarray ? @res : $res[0] 553 wantarray ? @res : $res[0]
506 } else { 554 } else {
… …
550 reset_signals; 598 reset_signals;
551 &$cb 599 &$cb
552 }, @args; 600 }, @args;
553 601
554 wantarray ? @res : $res[-1] 602 wantarray ? @res : $res[-1]
603}
604
605sub objinfo {
606 (
607 "counter value" => cf::object::object_count,
608 "objects created" => cf::object::create_count,
609 "objects destroyed" => cf::object::destroy_count,
610 "freelist size" => cf::object::free_count,
611 "allocated objects" => cf::object::objects_size,
612 "active objects" => cf::object::actives_size,
613 )
555} 614}
556 615
557=item $coin = coin_from_name $name 616=item $coin = coin_from_name $name
558 617
559=cut 618=cut
… …
596within each server. 655within each server.
597 656
598=cut 657=cut
599 658
600sub db_table($) { 659sub db_table($) {
660 cf::error "db_get called from main context"
661 if $Coro::current == $Coro::main;
662
601 my ($name) = @_; 663 my ($name) = @_;
602 my $db = BDB::db_create $DB_ENV; 664 my $db = BDB::db_create $DB_ENV;
603 665
604 eval { 666 eval {
605 $db->set_flags (BDB::CHKSUM); 667 $db->set_flags (BDB::CHKSUM);
… …
615} 677}
616 678
617our $DB; 679our $DB;
618 680
619sub db_init { 681sub db_init {
620 cf::sync_job {
621 $DB ||= db_table "db"; 682 $DB ||= db_table "db";
622 };
623} 683}
624 684
625sub db_get($$) { 685sub db_get($$) {
626 my $key = "$_[0]/$_[1]"; 686 my $key = "$_[0]/$_[1]";
627 687
628 cf::sync_job { 688 cf::error "db_get called from main context"
689 if $Coro::current == $Coro::main;
690
629 BDB::db_get $DB, undef, $key, my $data; 691 BDB::db_get $DB, undef, $key, my $data;
630 692
631 $! ? () 693 $! ? ()
632 : $data 694 : $data
633 }
634} 695}
635 696
636sub db_put($$$) { 697sub db_put($$$) {
637 BDB::dbreq_pri 4; 698 BDB::dbreq_pri 4;
638 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 699 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
694 755
695 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
696 my $data = $process->(\@data); 757 my $data = $process->(\@data);
697 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
698 759
699 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
700 761
701 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
702 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
703 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
704 765
… …
714 775
715=cut 776=cut
716 777
717sub datalog($@) { 778sub datalog($@) {
718 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
719 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
720} 781}
721 782
722=back 783=back
723 784
724=cut 785=cut
725 786
726############################################################################# 787#############################################################################
727 788
728=head2 ATTACHABLE OBJECTS 789=head2 ATTACHABLE OBJECTS
729 790
730Many objects in crossfire are so-called attachable objects. That means you can 791Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 792attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 793to it. All such attachable objects support the following methods.
733 794
734In the following description, CLASS can be any of C<global>, C<object> 795In 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 796C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
785=item cf::CLASS::attachment $name, ... 846=item cf::CLASS::attachment $name, ...
786 847
787Register an attachment by C<$name> through which attachable objects of the 848Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 849given CLASS can refer to this attachment.
789 850
790Some classes such as crossfire maps and objects can specify attachments 851Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 852that are attached at load/instantiate time, thus the need for a name.
792 853
793These calls expect any number of the following handler/hook descriptions: 854These calls expect any number of the following handler/hook descriptions:
794 855
795=over 4 856=over 4
… …
919 980
920 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
921 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
922 983
923 } elsif (ref $type) { 984 } elsif (ref $type) {
924 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
925 986
926 } else { 987 } else {
927 shift @arg; 988 shift @arg;
928 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
929 } 990 }
930 } 991 }
931} 992}
932 993
933sub _object_attach { 994sub _object_attach {
… …
943 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
944 } 1005 }
945 1006
946 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
947 } else { 1008 } else {
948 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
949 } 1010 }
950 1011
951 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
952} 1013}
953 1014
… …
1012 1073
1013 for (@$callbacks) { 1074 for (@$callbacks) {
1014 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1015 1076
1016 if ($@) { 1077 if ($@) {
1017 warn "$@";
1018 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1019 override; 1079 override;
1020 } 1080 }
1021 1081
1022 return 1 if $override; 1082 return 1 if $override;
1023 } 1083 }
… …
1086 1146
1087sub reattach { 1147sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1148 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1149 my ($obj) = @_;
1090 1150
1151 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1152 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1153
1093 my $registry = $obj->registry; 1154 my $registry = $obj->registry;
1094 1155
1095 @$registry = (); 1156 @$registry = ();
1096 1157
… …
1101 for (@$attach) { 1162 for (@$attach) {
1102 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1103 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1104 } 1165 }
1105 } else { 1166 } else {
1106 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1107 } 1168 }
1108 } 1169 }
1109} 1170}
1110 1171
1111cf::attachable->attach ( 1172cf::attachable->attach (
… …
1138 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1139 1200
1140 sync_job { 1201 sync_job {
1141 if (length $$rdata) { 1202 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1143 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1144 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1145 1207
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1209 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 aio_fsync $fh if $cf::USE_FSYNC; 1211 if ($cf::USE_FSYNC) {
1212 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;
1213 aio_fsync $fh;
1214 }
1150 aio_close $fh; 1215 aio_close $fh;
1151 1216
1152 if (@$objs) { 1217 if (@$objs) {
1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1218 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1219 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1157 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 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;
1224 aio_fsync $fh;
1225 }
1158 aio_close $fh; 1226 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1228 }
1161 } else { 1229 } else {
1162 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
1163 } 1231 }
1164 1232
1165 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1234
1235 $filename =~ s%/[^/]+$%%;
1236 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1237 } else {
1167 warn "FATAL: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1168 } 1239 }
1169 } else { 1240 } else {
1170 aio_unlink $filename; 1241 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1172 } 1243 }
… …
1196 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs}; 1268 $av = $st->{objs};
1198 } 1269 }
1199 1270
1200 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1201 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1202 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1203 1275
1204 ($data, $av) 1276 ($data, $av)
1205} 1277}
1206 1278
1207=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
… …
1263 my ($name, $cb) = @_; 1335 my ($name, $cb) = @_;
1264 1336
1265 $EXTICMD{$name} = $cb; 1337 $EXTICMD{$name} = $cb;
1266} 1338}
1267 1339
1340use File::Glob ();
1341
1268cf::player->attach ( 1342cf::player->attach (
1269 on_command => sub { 1343 on_unknown_command => sub {
1270 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1271 1345
1272 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1273 or return; 1347 or return;
1274 1348
… …
1297 1371
1298 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1299 if $reply; 1373 if $reply;
1300 1374
1301 } else { 1375 } else {
1302 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1303 } 1377 }
1304 1378
1305 cf::override; 1379 cf::override;
1306 }, 1380 },
1307); 1381);
1308 1382
1383# "readahead" all extensions
1384sub cache_extensions {
1385 my $grp = IO::AIO::aio_group;
1386
1387 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1388 for (grep /\.ext$/, @{$_[0]}) {
1389 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1390 }
1391 };
1392
1393 $grp
1394}
1395
1309sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1310 cf::sync_job { 1399 cf::sync_job {
1311 my %todo; 1400 my %todo;
1312 1401
1313 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1314 next unless -r $path; 1403 next unless -r $path;
… …
1332 1421
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1424
1336 $ext{source} = 1425 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1426 "package $pkg; use common::sense;\n"
1338 . "#line 1 \"$path\"\n{\n" 1427 . "#line 1 \"$path\"\n{\n"
1339 . $source 1428 . $source
1340 . "\n};\n1"; 1429 . "\n};\n1";
1341 1430
1342 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1343 } 1432 }
1344 1433
1434 my $pass = 0;
1345 my %done; 1435 my %done;
1346 while (%todo) { 1436 while (%todo) {
1347 my $progress; 1437 my $progress;
1348 1438
1439 ++$pass;
1440
1441 ext:
1349 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1350 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1351 goto skip 1444 next ext
1352 unless exists $done{$_}; 1445 unless exists $done{$_};
1353 } 1446 }
1354 1447
1355 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1356 1449
1357 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1358 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1359 : "$v->{base}: extension inactive.\n"; 1454 undef $@; # work around perl 5.10.0 utf-8 caching bug
1360 1455
1361 if (exists $v->{meta}{mandatory}) {
1362 warn $msg;
1363 cf::cleanup "mandatory extension failed to load, exiting."; 1456 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1364 } 1457 if exists $v->{meta}{mandatory};
1365 1458
1366 warn $msg; 1459 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1460 delete $todo{$k};
1461 } else {
1462 $done{$k} = delete $todo{$k};
1463 push @EXTS, $v->{pkg};
1464 $progress = 1;
1465
1466 info "$v->{base}: extension inactive.\n"
1467 unless $active;
1367 } 1468 }
1368
1369 $done{$k} = delete $todo{$k};
1370 push @EXTS, $v->{pkg};
1371 $progress = 1;
1372 } 1469 }
1373 1470
1374 skip: 1471 unless ($progress) {
1375 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1472 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1376 unless $progress; 1473
1474 while (my ($k, $v) = each %todo) {
1475 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1476 if exists $v->{meta}{mandatory};
1477 }
1478 }
1377 } 1479 }
1378 }; 1480 };
1379} 1481}
1380 1482
1381############################################################################# 1483#############################################################################
1382 1484
1383=back 1485=back
1384 1486
1385=head2 CORE EXTENSIONS 1487=head2 CORE EXTENSIONS
1386 1488
1387Functions and methods that extend core crossfire objects. 1489Functions and methods that extend core deliantra objects.
1388 1490
1389=cut 1491=cut
1390 1492
1391package cf::player; 1493package cf::player;
1392 1494
… …
1435 1537
1436sub exists($) { 1538sub exists($) {
1437 my ($login) = @_; 1539 my ($login) = @_;
1438 1540
1439 $cf::PLAYER{$login} 1541 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1542 or !aio_stat path $login
1441} 1543}
1442 1544
1443sub find($) { 1545sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1546 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1547 my $login = $_[0];
… …
1465 $cf::PLAYER{$login} = $pl 1567 $cf::PLAYER{$login} = $pl
1466 } 1568 }
1467 } 1569 }
1468} 1570}
1469 1571
1572cf::player->attach (
1573 on_load => sub {
1574 my ($pl, $path) = @_;
1575
1576 # restore slots saved in save, below
1577 my $slots = delete $pl->{_slots};
1578
1579 $pl->ob->current_weapon ($slots->[0]);
1580 $pl->combat_ob ($slots->[1]);
1581 $pl->ranged_ob ($slots->[2]);
1582 },
1583);
1584
1470sub save($) { 1585sub save($) {
1471 my ($pl) = @_; 1586 my ($pl) = @_;
1472 1587
1473 return if $pl->{deny_save}; 1588 return if $pl->{deny_save};
1474 1589
… …
1479 1594
1480 aio_mkdir playerdir $pl, 0770; 1595 aio_mkdir playerdir $pl, 0770;
1481 $pl->{last_save} = $cf::RUNTIME; 1596 $pl->{last_save} = $cf::RUNTIME;
1482 1597
1483 cf::get_slot 0.01; 1598 cf::get_slot 0.01;
1599
1600 # save slots, to be restored later
1601 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1484 1602
1485 $pl->save_pl ($path); 1603 $pl->save_pl ($path);
1486 cf::cede_to_tick; 1604 cf::cede_to_tick;
1487} 1605}
1488 1606
… …
1520 my ($pl) = @_; 1638 my ($pl) = @_;
1521 1639
1522 my $name = $pl->ob->name; 1640 my $name = $pl->ob->name;
1523 1641
1524 $pl->{deny_save} = 1; 1642 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1643 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1644
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1645 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1646 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1647 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1531 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1648 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1532 $pl->ns->destroy if $pl->ns; 1649 $pl->ns->destroy if $pl->ns;
1533 1650
1534 my $path = playerdir $pl; 1651 my $path = playerdir $pl;
1535 my $temp = "$path~$cf::RUNTIME~deleting~"; 1652 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1590 \@logins 1707 \@logins
1591} 1708}
1592 1709
1593=item $player->maps 1710=item $player->maps
1594 1711
1712=item cf::player::maps $login
1713
1595Returns an arrayref of map paths that are private for this 1714Returns an arrayref of map paths that are private for this
1596player. May block. 1715player. May block.
1597 1716
1598=cut 1717=cut
1599 1718
… …
1616 } 1735 }
1617 1736
1618 \@paths 1737 \@paths
1619} 1738}
1620 1739
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1740=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1741
1623Expand crossfire pod fragments into protocol xml. 1742Expand 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 1743
1714=item $player->ext_reply ($msgid, @msg) 1744=item $player->ext_reply ($msgid, @msg)
1715 1745
1716Sends an ext reply to the player. 1746Sends an ext reply to the player.
1717 1747
… …
1749 1779
1750=cut 1780=cut
1751 1781
1752sub find_by_path($) { 1782sub find_by_path($) {
1753 my ($path) = @_; 1783 my ($path) = @_;
1784
1785 $path =~ s/^~[^\/]*//; # skip ~login
1754 1786
1755 my ($match, $specificity); 1787 my ($match, $specificity);
1756 1788
1757 for my $region (list) { 1789 for my $region (list) {
1758 if ($region->{match} && $path =~ $region->{match}) { 1790 if ($region->{match} && $path =~ $region->{match}) {
… …
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1822 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791 1823
1792 # mit "rum" bekleckern, nicht 1824 # mit "rum" bekleckern, nicht
1793 $self->_create_random_map ( 1825 $self->_create_random_map (
1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1826 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1827 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1828 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1797 $rmp->{exit_on_final_map}, 1829 $rmp->{exit_on_final_map},
1798 $rmp->{xsize}, $rmp->{ysize}, 1830 $rmp->{xsize}, $rmp->{ysize},
1799 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1831 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1800 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1832 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1815 1847
1816sub register { 1848sub register {
1817 my (undef, $regex, $prio) = @_; 1849 my (undef, $regex, $prio) = @_;
1818 my $pkg = caller; 1850 my $pkg = caller;
1819 1851
1820 no strict;
1821 push @{"$pkg\::ISA"}, __PACKAGE__; 1852 push @{"$pkg\::ISA"}, __PACKAGE__;
1822 1853
1823 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1824} 1855}
1825 1856
1826# also paths starting with '/' 1857# also paths starting with '/'
1827$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1828 1859
1829sub thawer_merge { 1860sub thawer_merge {
1830 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1831 1862
1832 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
… …
1930 1961
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1962 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1963 "$UNIQUEDIR/$path"
1933} 1964}
1934 1965
1935# and all this just because we cannot iterate over
1936# all maps in C++...
1937sub change_all_map_light {
1938 my ($change) = @_;
1939
1940 $_->change_map_light ($change)
1941 for grep $_->outdoor, values %cf::MAP;
1942}
1943
1944sub decay_objects { 1966sub decay_objects {
1945 my ($self) = @_; 1967 my ($self) = @_;
1946 1968
1947 return if $self->{deny_reset}; 1969 return if $self->{deny_reset};
1948 1970
… …
2030sub find { 2052sub find {
2031 my ($path, $origin) = @_; 2053 my ($path, $origin) = @_;
2032 2054
2033 $path = normalise $path, $origin && $origin->path; 2055 $path = normalise $path, $origin && $origin->path;
2034 2056
2035 cf::lock_wait "map_data:$path";#d#remove 2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 2058 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2059
2038 $cf::MAP{$path} || do { 2060 $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 2061 my $map = new_from_path cf::map $path
2043 or return; 2062 or return;
2044 2063
2045 $map->{last_save} = $cf::RUNTIME; 2064 $map->{last_save} = $cf::RUNTIME;
2046 2065
… …
2058 2077
2059 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
2060 } 2079 }
2061} 2080}
2062 2081
2063sub pre_load { } 2082sub pre_load { }
2064sub post_load { } 2083#sub post_load { } # XS
2065 2084
2066sub load { 2085sub load {
2067 my ($self) = @_; 2086 my ($self) = @_;
2068 2087
2069 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
… …
2114 unless ($self->{deny_activate}) { 2133 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2134 $self->decay_objects;
2116 $self->fix_auto_apply; 2135 $self->fix_auto_apply;
2117 $self->update_buttons; 2136 $self->update_buttons;
2118 cf::cede_to_tick; 2137 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2138 $self->activate;
2122 } 2139 }
2123 2140
2124 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2142 $self->last_access ($cf::RUNTIME);
… …
2128 } 2145 }
2129 2146
2130 $self->post_load; 2147 $self->post_load;
2131} 2148}
2132 2149
2150# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath
2133sub customise_for { 2153sub customise_for {
2134 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2135 2155
2136 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2157 if $self->per_player;
… …
2153 or next; 2173 or next;
2154 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2155 or next; 2175 or next;
2156 $neigh->load; 2176 $neigh->load;
2157 2177
2178 # now find the diagonal neighbours
2158 push @neigh, 2179 push @neigh,
2159 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2160 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2161 } 2182 }
2162 2183
… …
2169} 2190}
2170 2191
2171sub find_sync { 2192sub find_sync {
2172 my ($path, $origin) = @_; 2193 my ($path, $origin) = @_;
2173 2194
2174 cf::sync_job { find $path, $origin } 2195 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2196 if $Coro::current == $Coro::main;
2197
2198 find $path, $origin
2175} 2199}
2176 2200
2177sub do_load_sync { 2201sub do_load_sync {
2178 my ($map) = @_; 2202 my ($map) = @_;
2179 2203
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2204 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main; 2205 if $Coro::current == $Coro::main;
2182 2206
2183 cf::sync_job { $map->load }; 2207 $map->load;
2184} 2208}
2185 2209
2186our %MAP_PREFETCH; 2210our %MAP_PREFETCH;
2187our $MAP_PREFETCHER = undef; 2211our $MAP_PREFETCHER = undef;
2188 2212
… …
2214 $MAP_PREFETCHER->prio (6); 2238 $MAP_PREFETCHER->prio (6);
2215 2239
2216 () 2240 ()
2217} 2241}
2218 2242
2243# common code, used by both ->save and ->swapout
2219sub save { 2244sub _save {
2220 my ($self) = @_; 2245 my ($self) = @_;
2221
2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
2223 2246
2224 $self->{last_save} = $cf::RUNTIME; 2247 $self->{last_save} = $cf::RUNTIME;
2225 2248
2226 return unless $self->dirty; 2249 return unless $self->dirty;
2227 2250
… …
2247 } else { 2270 } else {
2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2271 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2249 } 2272 }
2250} 2273}
2251 2274
2275sub save {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 $self->_save;
2281}
2282
2252sub swap_out { 2283sub swap_out {
2253 my ($self) = @_; 2284 my ($self) = @_;
2254 2285
2255 # save first because save cedes
2256 $self->save;
2257
2258 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259 2287
2260 return if $self->players;
2261 return if $self->in_memory != cf::MAP_ACTIVE; 2288 return if $self->in_memory != cf::MAP_ACTIVE;
2262 return if $self->{deny_save}; 2289 return if $self->{deny_save};
2290 return if $self->players;
2263 2291
2292 # first deactivate the map and "unlink" it from the core
2293 $self->deactivate;
2294 $_->clear_links_to ($self) for values %cf::MAP;
2264 $self->in_memory (cf::MAP_SWAPPED); 2295 $self->in_memory (cf::MAP_SWAPPED);
2296
2297 # then atomically save
2298 $self->_save;
2299
2300 # then free the map
2301 $self->clear;
2302}
2303
2304sub reset_at {
2305 my ($self) = @_;
2306
2307 # TODO: safety, remove and allow resettable per-player maps
2308 return 1e99 if $self->{deny_reset};
2309
2310 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2311 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2312
2313 $time + $to
2314}
2315
2316sub should_reset {
2317 my ($self) = @_;
2318
2319 $self->reset_at <= $cf::RUNTIME
2320}
2321
2322sub reset {
2323 my ($self) = @_;
2324
2325 my $lock = cf::lock_acquire "map_data:$self->{path}";
2326
2327 return if $self->players;
2328
2329 cf::trace "resetting map ", $self->path, "\n";
2330
2331 $self->in_memory (cf::MAP_SWAPPED);
2332
2333 # need to save uniques path
2334 unless ($self->{deny_save}) {
2335 my $uniq = $self->uniq_path; utf8::encode $uniq;
2336
2337 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2338 if $uniq;
2339 }
2340
2341 delete $cf::MAP{$self->path};
2265 2342
2266 $self->deactivate; 2343 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP; 2344 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear; 2345 $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 2346
2314 $self->unlink_save; 2347 $self->unlink_save;
2315 $self->destroy; 2348 $self->destroy;
2316} 2349}
2317 2350
… …
2325 2358
2326 delete $cf::MAP{$self->path}; 2359 delete $cf::MAP{$self->path};
2327 2360
2328 $self->unlink_save; 2361 $self->unlink_save;
2329 2362
2330 bless $self, "cf::map"; 2363 bless $self, "cf::map::wrap";
2331 delete $self->{deny_reset}; 2364 delete $self->{deny_reset};
2332 $self->{deny_save} = 1; 2365 $self->{deny_save} = 1;
2333 $self->reset_timeout (1); 2366 $self->reset_timeout (1);
2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2367 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2335 2368
… …
2392 : normalise $_ 2425 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2426 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2427 ]
2395} 2428}
2396 2429
2430=item cf::map::static_maps
2431
2432Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2433file in the shared directory excluding F</styles> and F</editor>). May
2434block.
2435
2436=cut
2437
2438sub static_maps() {
2439 my @dirs = "";
2440 my @maps;
2441
2442 while (@dirs) {
2443 my $dir = shift @dirs;
2444
2445 next if $dir eq "/styles" || $dir eq "/editor";
2446
2447 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2448 or return;
2449
2450 for (@$files) {
2451 s/\.map$// or next;
2452 utf8::decode $_;
2453 push @maps, "$dir/$_";
2454 }
2455
2456 push @dirs, map "$dir/$_", @$dirs;
2457 }
2458
2459 \@maps
2460}
2461
2397=back 2462=back
2398 2463
2399=head3 cf::object 2464=head3 cf::object
2400 2465
2401=cut 2466=cut
… …
2466 2531
2467our $SAY_CHANNEL = { 2532our $SAY_CHANNEL = {
2468 id => "say", 2533 id => "say",
2469 title => "Map", 2534 title => "Map",
2470 reply => "say ", 2535 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2536 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2537};
2473 2538
2474our $CHAT_CHANNEL = { 2539our $CHAT_CHANNEL = {
2475 id => "chat", 2540 id => "chat",
2476 title => "Chat", 2541 title => "Chat",
… …
2531 2596
2532=item $player_object->enter_link 2597=item $player_object->enter_link
2533 2598
2534Freezes the player and moves him/her to a special map (C<{link}>). 2599Freezes the player and moves him/her to a special map (C<{link}>).
2535 2600
2536The player should be reasonably safe there for short amounts of time. You 2601The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2602for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2603though, as the player cannot control the character while it is on the link
2604map.
2538 2605
2539Will never block. 2606Will never block.
2540 2607
2541=item $player_object->leave_link ($map, $x, $y) 2608=item $player_object->leave_link ($map, $x, $y)
2542 2609
… …
2562sub cf::object::player::enter_link { 2629sub cf::object::player::enter_link {
2563 my ($self) = @_; 2630 my ($self) = @_;
2564 2631
2565 $self->deactivate_recursive; 2632 $self->deactivate_recursive;
2566 2633
2634 ++$self->{_link_recursion};
2635
2567 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2636 return if UNIVERSAL::isa $self->map, "ext::map_link";
2568 2637
2569 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2638 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2570 if $self->map && $self->map->{path} ne "{link}"; 2639 if $self->map && $self->map->{path} ne "{link}";
2571 2640
2572 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2641 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2573} 2642}
2574 2643
2575sub cf::object::player::leave_link { 2644sub cf::object::player::leave_link {
2576 my ($self, $map, $x, $y) = @_; 2645 my ($self, $map, $x, $y) = @_;
2577 2646
… …
2594 ($x, $y) = (-1, -1) 2663 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2664 unless (defined $x) && (defined $y);
2596 2665
2597 # use -1 or undef as default coordinates, not 0, 0 2666 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2667 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2668 if $x <= 0 && $y <= 0;
2600 2669
2601 $map->load; 2670 $map->load;
2602 $map->load_neighbours; 2671 $map->load_neighbours;
2603 2672
2604 return unless $self->contr->active; 2673 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2674
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2675 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2676 if ($self->enter_map ($map, $x, $y)) {
2609} 2677 # entering was successful
2678 delete $self->{_link_recursion};
2679 # only activate afterwards, to support waiting in hooks
2680 $self->activate_recursive;
2681 }
2610 2682
2683}
2684
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2685=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2612 2686
2613Moves the player to the given map-path and coordinates by first freezing 2687Moves the player to the given map-path and coordinates by first freezing
2614her, loading and preparing them map, calling the provided $check callback 2688her, loading and preparing them map, calling the provided $check callback
2615that has to return the map if sucecssful, and then unfreezes the player on 2689that 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 2690the new (success) or old (failed) map position. In either case, $done will
… …
2623 2697
2624our $GOTOGEN; 2698our $GOTOGEN;
2625 2699
2626sub cf::object::player::goto { 2700sub cf::object::player::goto {
2627 my ($self, $path, $x, $y, $check, $done) = @_; 2701 my ($self, $path, $x, $y, $check, $done) = @_;
2702
2703 if ($self->{_link_recursion} >= $MAX_LINKS) {
2704 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2705 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2706 ($path, $x, $y) = @$EMERGENCY_POSITION;
2707 }
2628 2708
2629 # do generation counting so two concurrent goto's will be executed in-order 2709 # do generation counting so two concurrent goto's will be executed in-order
2630 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2710 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2631 2711
2632 $self->enter_link; 2712 $self->enter_link;
… …
2656 my $map = eval { 2736 my $map = eval {
2657 my $map = defined $path ? cf::map::find $path : undef; 2737 my $map = defined $path ? cf::map::find $path : undef;
2658 2738
2659 if ($map) { 2739 if ($map) {
2660 $map = $map->customise_for ($self); 2740 $map = $map->customise_for ($self);
2661 $map = $check->($map) if $check && $map; 2741 $map = $check->($map, $x, $y, $self) if $check && $map;
2662 } else { 2742 } else {
2663 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2743 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2664 } 2744 }
2665 2745
2666 $map 2746 $map
… …
2674 if ($gen == $self->{_goto_generation}) { 2754 if ($gen == $self->{_goto_generation}) {
2675 delete $self->{_goto_generation}; 2755 delete $self->{_goto_generation};
2676 $self->leave_link ($map, $x, $y); 2756 $self->leave_link ($map, $x, $y);
2677 } 2757 }
2678 2758
2679 $done->() if $done; 2759 $done->($self) if $done;
2680 })->prio (1); 2760 })->prio (1);
2681} 2761}
2682 2762
2683=item $player_object->enter_exit ($exit_object) 2763=item $player_object->enter_exit ($exit_object)
2684 2764
… …
2772 $self->contr->savebed ($map, $x, $y) 2852 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2853 if $exit->flag (cf::FLAG_DAMNED);
2774 2854
2775 1 2855 1
2776 }) { 2856 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2857 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "I'll try to bring you back to the map you were before. " 2858 . "I'll try to bring you back to the map you were before. "
2779 . "Please report this to the dungeon master!", 2859 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2860 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2861
2782 warn "ERROR in enter_exit: $@"; 2862 error "ERROR in enter_exit: $@";
2783 $self->leave_link; 2863 $self->leave_link;
2784 } 2864 }
2785 })->prio (1); 2865 })->prio (1);
2786} 2866}
2787 2867
… …
2799sub cf::client::send_drawinfo { 2879sub cf::client::send_drawinfo {
2800 my ($self, $text, $flags) = @_; 2880 my ($self, $text, $flags) = @_;
2801 2881
2802 utf8::encode $text; 2882 utf8::encode $text;
2803 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2883 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2884}
2885
2886=item $client->send_big_packet ($pkt)
2887
2888Like C<send_packet>, but tries to compress large packets, and fragments
2889them as required.
2890
2891=cut
2892
2893our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2894
2895sub cf::client::send_big_packet {
2896 my ($self, $pkt) = @_;
2897
2898 # try lzf for large packets
2899 $pkt = "lzf " . Compress::LZF::compress $pkt
2900 if 1024 <= length $pkt and $self->{can_lzf};
2901
2902 # split very large packets
2903 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2904 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2905 $pkt = "frag";
2906 }
2907
2908 $self->send_packet ($pkt);
2804} 2909}
2805 2910
2806=item $client->send_msg ($channel, $msg, $color, [extra...]) 2911=item $client->send_msg ($channel, $msg, $color, [extra...])
2807 2912
2808Send a drawinfo or msg packet to the client, formatting the msg for the 2913Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2812 2917
2813=cut 2918=cut
2814 2919
2815# non-persistent channels (usually the info channel) 2920# non-persistent channels (usually the info channel)
2816our %CHANNEL = ( 2921our %CHANNEL = (
2922 "c/motd" => {
2923 id => "infobox",
2924 title => "MOTD",
2925 reply => undef,
2926 tooltip => "The message of the day",
2927 },
2817 "c/identify" => { 2928 "c/identify" => {
2818 id => "infobox", 2929 id => "infobox",
2819 title => "Identify", 2930 title => "Identify",
2820 reply => undef, 2931 reply => undef,
2821 tooltip => "Items recently identified", 2932 tooltip => "Items recently identified",
… …
2823 "c/examine" => { 2934 "c/examine" => {
2824 id => "infobox", 2935 id => "infobox",
2825 title => "Examine", 2936 title => "Examine",
2826 reply => undef, 2937 reply => undef,
2827 tooltip => "Signs and other items you examined", 2938 tooltip => "Signs and other items you examined",
2939 },
2940 "c/shopinfo" => {
2941 id => "infobox",
2942 title => "Shop Info",
2943 reply => undef,
2944 tooltip => "What your bargaining skill tells you about the shop",
2828 }, 2945 },
2829 "c/book" => { 2946 "c/book" => {
2830 id => "infobox", 2947 id => "infobox",
2831 title => "Book", 2948 title => "Book",
2832 reply => undef, 2949 reply => undef,
… …
2848 id => "infobox", 2965 id => "infobox",
2849 title => "Body Parts", 2966 title => "Body Parts",
2850 reply => undef, 2967 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 2968 tooltip => "Shows which body parts you posess and are available",
2852 }, 2969 },
2970 "c/statistics" => {
2971 id => "infobox",
2972 title => "Statistics",
2973 reply => undef,
2974 tooltip => "Shows your primary statistics",
2975 },
2976 "c/skills" => {
2977 id => "infobox",
2978 title => "Skills",
2979 reply => undef,
2980 tooltip => "Shows your experience per skill and item power",
2981 },
2982 "c/shopitems" => {
2983 id => "infobox",
2984 title => "Shop Items",
2985 reply => undef,
2986 tooltip => "Shows the items currently for sale in this shop",
2987 },
2988 "c/resistances" => {
2989 id => "infobox",
2990 title => "Resistances",
2991 reply => undef,
2992 tooltip => "Shows your resistances",
2993 },
2994 "c/pets" => {
2995 id => "infobox",
2996 title => "Pets",
2997 reply => undef,
2998 tooltip => "Shows information abotu your pets/a specific pet",
2999 },
3000 "c/perceiveself" => {
3001 id => "infobox",
3002 title => "Perceive Self",
3003 reply => undef,
3004 tooltip => "You gained detailed knowledge about yourself",
3005 },
2853 "c/uptime" => { 3006 "c/uptime" => {
2854 id => "infobox", 3007 id => "infobox",
2855 title => "Uptime", 3008 title => "Uptime",
2856 reply => undef, 3009 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 3010 tooltip => "How long the server has been running since last restart",
… …
2866 id => "party", 3019 id => "party",
2867 title => "Party", 3020 title => "Party",
2868 reply => "gsay ", 3021 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party", 3022 tooltip => "Messages and chat related to your party",
2870 }, 3023 },
3024 "c/death" => {
3025 id => "death",
3026 title => "Death",
3027 reply => undef,
3028 tooltip => "Reason for and more info about your most recent death",
3029 },
3030 "c/say" => $SAY_CHANNEL,
3031 "c/chat" => $CHAT_CHANNEL,
2871); 3032);
2872 3033
2873sub cf::client::send_msg { 3034sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 3035 my ($self, $channel, $msg, $color, @extra) = @_;
2875 3036
2876 $msg = $self->pl->expand_cfpod ($msg); 3037 $msg = $self->pl->expand_cfpod ($msg)
3038 unless $color & cf::NDI_VERBATIM;
2877 3039
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 3040 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 3041
2880 # check predefined channels, for the benefit of C 3042 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 3043 if ($CHANNEL{$channel}) {
2882 $channel = $CHANNEL{$channel}; 3044 $channel = $CHANNEL{$channel};
2883 3045
2884 $self->ext_msg (channel_info => $channel) 3046 $self->ext_msg (channel_info => $channel);
2885 if $self->can_msg;
2886
2887 $channel = $channel->{id}; 3047 $channel = $channel->{id};
2888 3048
2889 } elsif (ref $channel) { 3049 } elsif (ref $channel) {
2890 # send meta info to client, if not yet sent 3050 # send meta info to client, if not yet sent
2891 unless (exists $self->{channel}{$channel->{id}}) { 3051 unless (exists $self->{channel}{$channel->{id}}) {
2892 $self->{channel}{$channel->{id}} = $channel; 3052 $self->{channel}{$channel->{id}} = $channel;
2893 $self->ext_msg (channel_info => $channel) 3053 $self->ext_msg (channel_info => $channel);
2894 if $self->can_msg;
2895 } 3054 }
2896 3055
2897 $channel = $channel->{id}; 3056 $channel = $channel->{id};
2898 } 3057 }
2899 3058
2900 return unless @extra || length $msg; 3059 return unless @extra || length $msg;
2901 3060
2902 if ($self->can_msg) {
2903 # default colour, mask it out 3061 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3062 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 3063 if $color & cf::NDI_DEF;
2906 3064
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3065 my $pkt = "msg "
3066 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3067 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2909 } else { 3068 );
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 3069
2921 $color &= cf::NDI_COLOR_MASK; 3070 $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} 3071}
2935 3072
2936=item $client->ext_msg ($type, @msg) 3073=item $client->ext_msg ($type, @msg)
2937 3074
2938Sends an ext event to the client. 3075Sends an ext event to the client.
… …
2941 3078
2942sub cf::client::ext_msg($$@) { 3079sub cf::client::ext_msg($$@) {
2943 my ($self, $type, @msg) = @_; 3080 my ($self, $type, @msg) = @_;
2944 3081
2945 if ($self->extcmd == 2) { 3082 if ($self->extcmd == 2) {
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2947 } elsif ($self->extcmd == 1) { # TODO: remove 3084 } elsif ($self->extcmd == 1) { # TODO: remove
2948 push @msg, msgtype => "event_$type"; 3085 push @msg, msgtype => "event_$type";
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3087 }
2951} 3088}
2952 3089
2953=item $client->ext_reply ($msgid, @msg) 3090=item $client->ext_reply ($msgid, @msg)
2954 3091
… …
2958 3095
2959sub cf::client::ext_reply($$@) { 3096sub cf::client::ext_reply($$@) {
2960 my ($self, $id, @msg) = @_; 3097 my ($self, $id, @msg) = @_;
2961 3098
2962 if ($self->extcmd == 2) { 3099 if ($self->extcmd == 2) {
2963 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3100 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2964 } elsif ($self->extcmd == 1) { 3101 } elsif ($self->extcmd == 1) {
2965 #TODO: version 1, remove 3102 #TODO: version 1, remove
2966 unshift @msg, msgtype => "reply", msgid => $id; 3103 unshift @msg, msgtype => "reply", msgid => $id;
2967 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3104 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2968 } 3105 }
2969} 3106}
2970 3107
2971=item $success = $client->query ($flags, "text", \&cb) 3108=item $success = $client->query ($flags, "text", \&cb)
2972 3109
… …
3043 3180
3044 $ns->ext_reply ($reply, @reply) 3181 $ns->ext_reply ($reply, @reply)
3045 if $reply; 3182 if $reply;
3046 3183
3047 } else { 3184 } else {
3048 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3185 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3049 } 3186 }
3050 3187
3051 cf::override; 3188 cf::override;
3052 }, 3189 },
3053); 3190);
… …
3073 3210
3074 $coro 3211 $coro
3075} 3212}
3076 3213
3077cf::client->attach ( 3214cf::client->attach (
3078 on_destroy => sub { 3215 on_client_destroy => sub {
3079 my ($ns) = @_; 3216 my ($ns) = @_;
3080 3217
3081 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3218 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3082 }, 3219 },
3083); 3220);
… …
3099our $safe_hole = new Safe::Hole; 3236our $safe_hole = new Safe::Hole;
3100 3237
3101$SIG{FPE} = 'IGNORE'; 3238$SIG{FPE} = 'IGNORE';
3102 3239
3103$safe->permit_only (Opcode::opset qw( 3240$safe->permit_only (Opcode::opset qw(
3104 :base_core :base_mem :base_orig :base_math 3241 :base_core :base_mem :base_orig :base_math :base_loop
3105 grepstart grepwhile mapstart mapwhile 3242 grepstart grepwhile mapstart mapwhile
3106 sort time 3243 sort time
3107)); 3244));
3108 3245
3109# here we export the classes and methods available to script code 3246# here we export the classes and methods available to script code
… …
3113The following functions and methods are available within a safe environment: 3250The following functions and methods are available within a safe environment:
3114 3251
3115 cf::object 3252 cf::object
3116 contr pay_amount pay_player map x y force_find force_add destroy 3253 contr pay_amount pay_player map x y force_find force_add destroy
3117 insert remove name archname title slaying race decrease split 3254 insert remove name archname title slaying race decrease split
3255 value
3118 3256
3119 cf::object::player 3257 cf::object::player
3120 player 3258 player
3121 3259
3122 cf::player 3260 cf::player
… …
3128=cut 3266=cut
3129 3267
3130for ( 3268for (
3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3269 ["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 3270 insert remove inv nrof name archname title slaying race
3133 decrease split destroy change_exp)], 3271 decrease split destroy change_exp value msg lore send_msg)],
3134 ["cf::object::player" => qw(player)], 3272 ["cf::object::player" => qw(player)],
3135 ["cf::player" => qw(peaceful)], 3273 ["cf::player" => qw(peaceful send_msg)],
3136 ["cf::map" => qw(trigger)], 3274 ["cf::map" => qw(trigger)],
3137) { 3275) {
3138 no strict 'refs';
3139 my ($pkg, @funs) = @$_; 3276 my ($pkg, @funs) = @$_;
3140 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3277 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3141 for @funs; 3278 for @funs;
3142} 3279}
3143 3280
… …
3158 3295
3159 my $qcode = $code; 3296 my $qcode = $code;
3160 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3297 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3161 $qcode =~ s/\n/\\n/g; 3298 $qcode =~ s/\n/\\n/g;
3162 3299
3300 %vars = (_dummy => 0) unless %vars;
3301
3302 my @res;
3163 local $_; 3303 local $_;
3164 local @safe::cf::_safe_eval_args = values %vars;
3165 3304
3166 my $eval = 3305 my $eval =
3167 "do {\n" 3306 "do {\n"
3168 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3307 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3169 . "#line 0 \"{$qcode}\"\n" 3308 . "#line 0 \"{$qcode}\"\n"
3170 . $code 3309 . $code
3171 . "\n}" 3310 . "\n}"
3172 ; 3311 ;
3173 3312
3313 if ($CFG{safe_eval}) {
3174 sub_generation_inc; 3314 sub_generation_inc;
3315 local @safe::cf::_safe_eval_args = values %vars;
3175 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3316 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3176 sub_generation_inc; 3317 sub_generation_inc;
3318 } else {
3319 local @cf::_safe_eval_args = values %vars;
3320 @res = wantarray ? eval eval : scalar eval $eval;
3321 }
3177 3322
3178 if ($@) { 3323 if ($@) {
3179 warn "$@"; 3324 warn "$@",
3180 warn "while executing safe code '$code'\n"; 3325 "while executing safe code '$code'\n",
3181 warn "with arguments " . (join " ", %vars) . "\n"; 3326 "with arguments " . (join " ", %vars) . "\n";
3182 } 3327 }
3183 3328
3184 wantarray ? @res : $res[0] 3329 wantarray ? @res : $res[0]
3185} 3330}
3186 3331
… …
3200=cut 3345=cut
3201 3346
3202sub register_script_function { 3347sub register_script_function {
3203 my ($fun, $cb) = @_; 3348 my ($fun, $cb) = @_;
3204 3349
3205 no strict 'refs'; 3350 $fun = "safe::$fun" if $CFG{safe_eval};
3206 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3351 *$fun = $safe_hole->wrap ($cb);
3207} 3352}
3208 3353
3209=back 3354=back
3210 3355
3211=cut 3356=cut
… …
3220 # for this (global event?) 3365 # for this (global event?)
3221 %ext::player_env::MUSIC_FACE_CACHE = (); 3366 %ext::player_env::MUSIC_FACE_CACHE = ();
3222 3367
3223 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3368 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3224 3369
3225 warn "loading facedata from $path\n"; 3370 trace "loading facedata from $path\n";
3226 3371
3227 my $facedata; 3372 my $facedata;
3228 0 < aio_load $path, $facedata 3373 0 < aio_load $path, $facedata
3229 or die "$path: $!"; 3374 or die "$path: $!";
3230 3375
… …
3232 3377
3233 $facedata->{version} == 2 3378 $facedata->{version} == 2
3234 or cf::cleanup "$path: version mismatch, cannot proceed."; 3379 or cf::cleanup "$path: version mismatch, cannot proceed.";
3235 3380
3236 # patch in the exptable 3381 # patch in the exptable
3382 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3237 $facedata->{resource}{"res/exp_table"} = { 3383 $facedata->{resource}{"res/exp_table"} = {
3238 type => FT_RSRC, 3384 type => FT_RSRC,
3239 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3385 data => $exp_table,
3386 hash => (Digest::MD5::md5 $exp_table),
3240 }; 3387 };
3241 cf::cede_to_tick; 3388 cf::cede_to_tick;
3242 3389
3243 { 3390 {
3244 my $faces = $facedata->{faceinfo}; 3391 my $faces = $facedata->{faceinfo};
… …
3246 while (my ($face, $info) = each %$faces) { 3393 while (my ($face, $info) = each %$faces) {
3247 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3394 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248 3395
3249 cf::face::set_visibility $idx, $info->{visibility}; 3396 cf::face::set_visibility $idx, $info->{visibility};
3250 cf::face::set_magicmap $idx, $info->{magicmap}; 3397 cf::face::set_magicmap $idx, $info->{magicmap};
3251 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3398 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3252 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3399 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3253 3400
3254 cf::cede_to_tick; 3401 cf::cede_to_tick;
3255 } 3402 }
3256 3403
3257 while (my ($face, $info) = each %$faces) { 3404 while (my ($face, $info) = each %$faces) {
… …
3262 3409
3263 if (my $smooth = cf::face::find $info->{smooth}) { 3410 if (my $smooth = cf::face::find $info->{smooth}) {
3264 cf::face::set_smooth $idx, $smooth; 3411 cf::face::set_smooth $idx, $smooth;
3265 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3412 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3266 } else { 3413 } else {
3267 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3414 error "smooth face '$info->{smooth}' not found for face '$face'";
3268 } 3415 }
3269 3416
3270 cf::cede_to_tick; 3417 cf::cede_to_tick;
3271 } 3418 }
3272 } 3419 }
… …
3281 3428
3282 cf::anim::invalidate_all; # d'oh 3429 cf::anim::invalidate_all; # d'oh
3283 } 3430 }
3284 3431
3285 { 3432 {
3286 # TODO: for gcfclient pleasure, we should give resources
3287 # that gcfclient doesn't grok a >10000 face index.
3288 my $res = $facedata->{resource}; 3433 my $res = $facedata->{resource};
3289 3434
3290 while (my ($name, $info) = each %$res) { 3435 while (my ($name, $info) = each %$res) {
3291 if (defined $info->{type}) { 3436 if (defined $info->{type}) {
3292 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3437 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3293 my $data;
3294 3438
3295 if ($info->{type} & 1) { 3439 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}; 3440 cf::face::set_type $idx, $info->{type};
3310 } else { 3441 } else {
3311 $RESOURCE{$name} = $info; 3442 $RESOURCE{$name} = $info; # unused
3312 } 3443 }
3313 3444
3314 cf::cede_to_tick; 3445 cf::cede_to_tick;
3315 } 3446 }
3316 } 3447 }
3317 3448
3318 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3449 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3319 3450
3320 1 3451 1
3321} 3452}
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 3453
3343register_exticmd fx_want => sub { 3454register_exticmd fx_want => sub {
3344 my ($ns, $want) = @_; 3455 my ($ns, $want) = @_;
3345 3456
3346 while (my ($k, $v) = each %$want) { 3457 while (my ($k, $v) = each %$want) {
… …
3385sub reload_treasures { 3496sub reload_treasures {
3386 load_resource_file "$DATADIR/treasures" 3497 load_resource_file "$DATADIR/treasures"
3387 or die "unable to load treasurelists\n"; 3498 or die "unable to load treasurelists\n";
3388} 3499}
3389 3500
3501sub reload_sound {
3502 trace "loading sound config from $DATADIR/sound\n";
3503
3504 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3505 or die "$DATADIR/sound $!";
3506
3507 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3508
3509 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3510 my $sound = $soundconf->{compat}[$_]
3511 or next;
3512
3513 my $face = cf::face::find "sound/$sound->[1]";
3514 cf::sound::set $sound->[0] => $face;
3515 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3516 }
3517
3518 while (my ($k, $v) = each %{$soundconf->{event}}) {
3519 my $face = cf::face::find "sound/$v";
3520 cf::sound::set $k => $face;
3521 }
3522}
3523
3390sub reload_resources { 3524sub reload_resources {
3391 warn "reloading resource files...\n"; 3525 trace "reloading resource files...\n";
3392 3526
3393 reload_facedata; 3527 reload_facedata;
3528 reload_sound;
3394 reload_archetypes; 3529 reload_archetypes;
3395 reload_regions; 3530 reload_regions;
3396 reload_treasures; 3531 reload_treasures;
3397 3532
3398 warn "finished reloading resource files\n"; 3533 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} 3534}
3408 3535
3409sub reload_config { 3536sub reload_config {
3537 trace "reloading config file...\n";
3538
3410 open my $fh, "<:utf8", "$CONFDIR/config" 3539 open my $fh, "<:utf8", "$CONFDIR/config"
3411 or return; 3540 or return;
3412 3541
3413 local $/; 3542 local $/;
3414 *CFG = YAML::Load <$fh>; 3543 *CFG = YAML::XS::Load scalar <$fh>;
3415 3544
3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3545 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3417 3546
3418 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3547 $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}; 3548 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3420 3549
3421 if (exists $CFG{mlockall}) { 3550 if (exists $CFG{mlockall}) {
… …
3423 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3552 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3424 and die "WARNING: m(un)lockall failed: $!\n"; 3553 and die "WARNING: m(un)lockall failed: $!\n";
3425 }; 3554 };
3426 warn $@ if $@; 3555 warn $@ if $@;
3427 } 3556 }
3557
3558 trace "finished reloading resource files\n";
3559}
3560
3561sub pidfile() {
3562 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3563 or die "$PIDFILE: $!";
3564 flock $fh, &Fcntl::LOCK_EX
3565 or die "$PIDFILE: flock: $!";
3566 $fh
3567}
3568
3569# make sure only one server instance is running at any one time
3570sub atomic {
3571 my $fh = pidfile;
3572
3573 my $pid = <$fh>;
3574 kill 9, $pid if $pid > 0;
3575
3576 seek $fh, 0, 0;
3577 print $fh $$;
3578}
3579
3580sub main_loop {
3581 trace "EV::loop starting\n";
3582 if (1) {
3583 EV::loop;
3584 }
3585 trace "EV::loop returned\n";
3586 goto &main_loop unless $REALLY_UNLOOP;
3428} 3587}
3429 3588
3430sub main { 3589sub main {
3590 cf::init_globals; # initialise logging
3591
3592 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3593 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3594 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3595 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3596
3597 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3598
3431 # we must not ever block the main coroutine 3599 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3600 local $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3601 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3602 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3603 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3604 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3605 })->prio (Coro::PRIO_MAX);
3438 }; 3606 };
3439 3607
3440 { 3608 evthread_start IO::AIO::poll_fileno;
3441 my $guard = freeze_mainloop; 3609
3610 cf::sync_job {
3611 cf::init_experience;
3612 cf::init_anim;
3613 cf::init_attackmess;
3614 cf::init_dynamic;
3615
3616 cf::load_settings;
3617 cf::load_materials;
3618
3619 reload_resources;
3442 reload_config; 3620 reload_config;
3443 db_init; 3621 db_init;
3622
3623 cf::init_uuid;
3624 cf::init_signals;
3625 cf::init_skills;
3626
3627 cf::init_beforeplay;
3628
3629 atomic;
3630
3444 load_extensions; 3631 load_extensions;
3445 3632
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3633 utime time, time, $RUNTIMEFILE;
3634
3635 # no (long-running) fork's whatsoever before this point(!)
3636 use POSIX ();
3637 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3638
3639 (pop @POST_INIT)->(0) while @POST_INIT;
3447 } 3640 };
3448 3641
3449 EV::loop; 3642 cf::object::thawer::errors_are_fatal 0;
3643 info "parse errors in files are no longer fatal from this point on.\n";
3644
3645 main_loop;
3450} 3646}
3451 3647
3452############################################################################# 3648#############################################################################
3453# initialisation and cleanup 3649# initialisation and cleanup
3454 3650
3455# install some emergency cleanup handlers 3651# install some emergency cleanup handlers
3456BEGIN { 3652BEGIN {
3457 our %SIGWATCHER = (); 3653 our %SIGWATCHER = ();
3458 for my $signal (qw(INT HUP TERM)) { 3654 for my $signal (qw(INT HUP TERM)) {
3459 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3655 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3460 cf::cleanup "SIG$signal"; 3656 cf::cleanup "SIG$signal";
3461 }; 3657 };
3462 } 3658 }
3463} 3659}
3464 3660
3465sub write_runtime_sync { 3661sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime"; 3662 my $t0 = AE::time;
3467 3663
3468 # first touch the runtime file to show we are still running: 3664 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3665 # the fsync below can take a very very long time.
3470 3666
3471 IO::AIO::aio_utime $runtime, undef, undef; 3667 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3668
3473 my $guard = cf::lock_acquire "write_runtime"; 3669 my $guard = cf::lock_acquire "write_runtime";
3474 3670
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3671 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3476 or return; 3672 or return;
3477 3673
3478 my $value = $cf::RUNTIME + 90 + 10; 3674 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3675 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3676 # 60 allows for the watchdog to kill the server.
… …
3490 aio_utime $fh, undef, undef; 3686 aio_utime $fh, undef, undef;
3491 3687
3492 close $fh 3688 close $fh
3493 or return; 3689 or return;
3494 3690
3495 aio_rename "$runtime~", $runtime 3691 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3692 and return;
3497 3693
3498 warn "runtime file written.\n"; 3694 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3499 3695
3500 1 3696 1
3501} 3697}
3502 3698
3503our $uuid_lock; 3699our $uuid_lock;
… …
3512 my $uuid = "$LOCALDIR/uuid"; 3708 my $uuid = "$LOCALDIR/uuid";
3513 3709
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3710 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return; 3711 or return;
3516 3712
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3713 my $value = uuid_seq uuid_cur;
3714
3715 unless ($value) {
3716 info "cowardly refusing to write zero uuid value!\n";
3717 return;
3718 }
3719
3720 my $value = uuid_str $value + $uuid_skip;
3518 $uuid_skip = 0; 3721 $uuid_skip = 0;
3519 3722
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3723 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return; 3724 and return;
3522 3725
… …
3528 or return; 3731 or return;
3529 3732
3530 aio_rename "$uuid~", $uuid 3733 aio_rename "$uuid~", $uuid
3531 and return; 3734 and return;
3532 3735
3533 warn "uuid file written ($value).\n"; 3736 trace "uuid file written ($value).\n";
3534 3737
3535 1 3738 1
3536 3739
3537} 3740}
3538 3741
… …
3544} 3747}
3545 3748
3546sub emergency_save() { 3749sub emergency_save() {
3547 my $freeze_guard = cf::freeze_mainloop; 3750 my $freeze_guard = cf::freeze_mainloop;
3548 3751
3549 warn "enter emergency perl save\n"; 3752 info "emergency_perl_save: enter\n";
3753
3754 # this is a trade-off: we want to be very quick here, so
3755 # save all maps without fsync, and later call a global sync
3756 # (which in turn might be very very slow)
3757 local $USE_FSYNC = 0;
3550 3758
3551 cf::sync_job { 3759 cf::sync_job {
3760 cf::write_runtime_sync; # external watchdog should not bark
3761
3552 # use a peculiar iteration method to avoid tripping on perl 3762 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3763 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3764 # and maps saved/destroyed asynchronously.
3555 warn "begin emergency player save\n"; 3765 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3766 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3767 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3768 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3769 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3770 $pl->save;
3561 } 3771 }
3562 warn "end emergency player save\n"; 3772 info "emergency_perl_save: end player save\n";
3563 3773
3564 warn "begin emergency map save\n"; 3774 cf::write_runtime_sync; # external watchdog should not bark
3775
3776 info "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3777 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3778 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3779 $map->valid or next;
3568 $map->save; 3780 $map->save;
3569 } 3781 }
3570 warn "end emergency map save\n"; 3782 info "emergency_perl_save: end map save\n";
3571 3783
3572 warn "begin emergency database checkpoint\n"; 3784 cf::write_runtime_sync; # external watchdog should not bark
3785
3786 info "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3787 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "end emergency database checkpoint\n"; 3788 info "emergency_perl_save: end database checkpoint\n";
3575 3789
3576 warn "begin write uuid\n"; 3790 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3791 write_uuid_sync 1;
3578 warn "end write uuid\n"; 3792 info "emergency_perl_save: end write uuid\n";
3793
3794 cf::write_runtime_sync; # external watchdog should not bark
3795
3796 trace "emergency_perl_save: syncing database to disk";
3797 BDB::db_env_txn_checkpoint $DB_ENV;
3798
3799 info "emergency_perl_save: starting sync\n";
3800 IO::AIO::aio_sync sub {
3801 info "emergency_perl_save: finished sync\n";
3802 };
3803
3804 cf::write_runtime_sync; # external watchdog should not bark
3805
3806 trace "emergency_perl_save: flushing outstanding aio requests";
3807 while (IO::AIO::nreqs || BDB::nreqs) {
3808 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3809 }
3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3579 }; 3812 };
3580 3813
3581 warn "leave emergency perl save\n"; 3814 info "emergency_perl_save: leave\n";
3582} 3815}
3583 3816
3584sub post_cleanup { 3817sub post_cleanup {
3585 my ($make_core) = @_; 3818 my ($make_core) = @_;
3586 3819
3820 IO::AIO::flush;
3821
3587 warn Carp::longmess "post_cleanup backtrace" 3822 error Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3823 if $make_core;
3824
3825 my $fh = pidfile;
3826 unlink $PIDFILE if <$fh> == $$;
3827}
3828
3829# a safer delete_package, copied from Symbol
3830sub clear_package($) {
3831 my $pkg = shift;
3832
3833 # expand to full symbol table name if needed
3834 unless ($pkg =~ /^main::.*::$/) {
3835 $pkg = "main$pkg" if $pkg =~ /^::/;
3836 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3837 $pkg .= '::' unless $pkg =~ /::$/;
3838 }
3839
3840 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3841 my $stem_symtab = *{$stem}{HASH};
3842
3843 defined $stem_symtab and exists $stem_symtab->{$leaf}
3844 or return;
3845
3846 # clear all symbols
3847 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3848 for my $name (keys %$leaf_symtab) {
3849 _gv_clear *{"$pkg$name"};
3850# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3851 }
3589} 3852}
3590 3853
3591sub do_reload_perl() { 3854sub do_reload_perl() {
3592 # can/must only be called in main 3855 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3856 if (in_main) {
3594 warn "can only reload from main coroutine"; 3857 error "can only reload from main coroutine";
3595 return; 3858 return;
3596 } 3859 }
3597 3860
3861 return if $RELOAD++;
3862
3863 my $t1 = AE::time;
3864
3865 while ($RELOAD) {
3598 warn "reloading..."; 3866 info "reloading...";
3599 3867
3600 warn "entering sync_job"; 3868 trace "entering sync_job";
3601 3869
3602 cf::sync_job { 3870 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3871 cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark
3606 3872
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"; 3873 trace "cancelling all extension coros";
3624 $_->cancel for values %EXT_CORO; 3874 $_->cancel for values %EXT_CORO;
3625 %EXT_CORO = (); 3875 %EXT_CORO = ();
3626 3876
3627 warn "removing commands"; 3877 trace "removing commands";
3628 %COMMAND = (); 3878 %COMMAND = ();
3629 3879
3630 warn "removing ext/exti commands"; 3880 trace "removing ext/exti commands";
3631 %EXTCMD = (); 3881 %EXTCMD = ();
3632 %EXTICMD = (); 3882 %EXTICMD = ();
3633 3883
3634 warn "unloading/nuking all extensions"; 3884 trace "unloading/nuking all extensions";
3635 for my $pkg (@EXTS) { 3885 for my $pkg (@EXTS) {
3636 warn "... unloading $pkg"; 3886 trace "... unloading $pkg";
3637 3887
3638 if (my $cb = $pkg->can ("unload")) { 3888 if (my $cb = $pkg->can ("unload")) {
3639 eval { 3889 eval {
3640 $cb->($pkg); 3890 $cb->($pkg);
3641 1 3891 1
3642 } or warn "$pkg unloaded, but with errors: $@"; 3892 } or error "$pkg unloaded, but with errors: $@";
3893 }
3894
3895 trace "... clearing $pkg";
3896 clear_package $pkg;
3643 } 3897 }
3644 3898
3645 warn "... nuking $pkg";
3646 Symbol::delete_package $pkg;
3647 }
3648
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3899 trace "unloading all perl modules loaded from $LIBDIR";
3650 while (my ($k, $v) = each %INC) { 3900 while (my ($k, $v) = each %INC) {
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3901 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3902
3653 warn "... unloading $k"; 3903 trace "... unloading $k";
3654 delete $INC{$k}; 3904 delete $INC{$k};
3655 3905
3656 $k =~ s/\.pm$//; 3906 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g; 3907 $k =~ s/\//::/g;
3658 3908
3659 if (my $cb = $k->can ("unload_module")) { 3909 if (my $cb = $k->can ("unload_module")) {
3660 $cb->(); 3910 $cb->();
3911 }
3912
3913 clear_package $k;
3661 } 3914 }
3662 3915
3663 Symbol::delete_package $k;
3664 }
3665
3666 warn "getting rid of safe::, as good as possible"; 3916 trace "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3917 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3918 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3919
3670 warn "unloading cf.pm \"a bit\""; 3920 trace "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3921 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3922 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3673 3923
3674 # don't, removes xs symbols, too, 3924 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3925 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3926 #clear_package __PACKAGE__;
3677 3927
3678 warn "unload completed, starting to reload now"; 3928 info "unload completed, starting to reload now";
3679 3929
3680 warn "reloading cf.pm"; 3930 trace "reloading cf.pm";
3681 require cf; 3931 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3932 cf::_connect_to_perl_1;
3683 3933
3684 warn "loading config and database again"; 3934 trace "loading config and database again";
3685 cf::reload_config; 3935 cf::reload_config;
3686 3936
3687 warn "loading extensions"; 3937 trace "loading extensions";
3688 cf::load_extensions; 3938 cf::load_extensions;
3689 3939
3940 if ($REATTACH_ON_RELOAD) {
3690 warn "reattaching attachments to objects/players"; 3941 trace "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3942 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3943 trace "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3944 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3945 trace "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3946 reattach $_ for values %PLAYER;
3947 }
3696 3948
3949 trace "running post_init jobs";
3950 (pop @POST_INIT)->(1) while @POST_INIT;
3951
3697 warn "leaving sync_job"; 3952 trace "leaving sync_job";
3698 3953
3699 1 3954 1
3700 } or do { 3955 } or do {
3701 warn $@; 3956 error $@;
3702 cf::cleanup "error while reloading, exiting."; 3957 cf::cleanup "error while reloading, exiting.";
3958 };
3959
3960 info "reloaded";
3961 --$RELOAD;
3703 }; 3962 }
3704 3963
3705 warn "reloaded"; 3964 $t1 = AE::time - $t1;
3965 info "reload completed in ${t1}s\n";
3706}; 3966};
3707 3967
3708our $RELOAD_WATCHER; # used only during reload 3968our $RELOAD_WATCHER; # used only during reload
3709 3969
3710sub reload_perl() { 3970sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 3971 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 3972 # coro crashes during coro_state_free->destroy here.
3713 3973
3974 $RELOAD_WATCHER ||= cf::async {
3975 Coro::AIO::aio_wait cache_extensions;
3976
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3977 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 3978 do_reload_perl;
3716 undef $RELOAD_WATCHER; 3979 undef $RELOAD_WATCHER;
3980 };
3717 }; 3981 };
3718} 3982}
3719 3983
3720register_command "reload" => sub { 3984register_command "reload" => sub {
3721 my ($who, $arg) = @_; 3985 my ($who, $arg) = @_;
… …
3735 3999
3736our @WAIT_FOR_TICK; 4000our @WAIT_FOR_TICK;
3737our @WAIT_FOR_TICK_BEGIN; 4001our @WAIT_FOR_TICK_BEGIN;
3738 4002
3739sub wait_for_tick { 4003sub wait_for_tick {
3740 return if tick_inhibit || $Coro::current == $Coro::main; 4004 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3741 4005
3742 my $signal = new Coro::Signal; 4006 my $signal = new Coro::Signal;
3743 push @WAIT_FOR_TICK, $signal; 4007 push @WAIT_FOR_TICK, $signal;
3744 $signal->wait; 4008 $signal->wait;
3745} 4009}
3746 4010
3747sub wait_for_tick_begin { 4011sub wait_for_tick_begin {
3748 return if tick_inhibit || $Coro::current == $Coro::main; 4012 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3749 4013
3750 my $signal = new Coro::Signal; 4014 my $signal = new Coro::Signal;
3751 push @WAIT_FOR_TICK_BEGIN, $signal; 4015 push @WAIT_FOR_TICK_BEGIN, $signal;
3752 $signal->wait; 4016 $signal->wait;
3753} 4017}
… …
3759 return; 4023 return;
3760 } 4024 }
3761 4025
3762 cf::server_tick; # one server iteration 4026 cf::server_tick; # one server iteration
3763 4027
4028 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4029
3764 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4030 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4031 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3766 Coro::async_pool { 4032 Coro::async_pool {
3767 $Coro::current->{desc} = "runtime saver"; 4033 $Coro::current->{desc} = "runtime saver";
3768 write_runtime_sync 4034 write_runtime_sync
3769 or warn "ERROR: unable to write runtime file: $!"; 4035 or error "ERROR: unable to write runtime file: $!";
3770 }; 4036 };
3771 } 4037 }
3772 4038
3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4039 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3774 $sig->send; 4040 $sig->send;
… …
3782 4048
3783 if (0) { 4049 if (0) {
3784 if ($NEXT_TICK) { 4050 if ($NEXT_TICK) {
3785 my $jitter = $TICK_START - $NEXT_TICK; 4051 my $jitter = $TICK_START - $NEXT_TICK;
3786 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4052 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3787 warn "jitter $JITTER\n";#d# 4053 debug "jitter $JITTER\n";#d#
3788 } 4054 }
3789 } 4055 }
3790} 4056}
3791 4057
3792{ 4058{
3793 # configure BDB 4059 # configure BDB
3794 4060
3795 BDB::min_parallel 8; 4061 BDB::min_parallel 16;
3796 BDB::max_poll_reqs $TICK * 0.1; 4062 BDB::max_poll_reqs $TICK * 0.1;
3797 $AnyEvent::BDB::WATCHER->priority (1); 4063 $AnyEvent::BDB::WATCHER->priority (1);
3798 4064
3799 unless ($DB_ENV) { 4065 unless ($DB_ENV) {
3800 $DB_ENV = BDB::db_env_create; 4066 $DB_ENV = BDB::db_env_create;
… …
3847 $msg =~ s/\n//; 4113 $msg =~ s/\n//;
3848 4114
3849 # limit the # of concurrent backtraces 4115 # limit the # of concurrent backtraces
3850 if ($_log_backtrace < 2) { 4116 if ($_log_backtrace < 2) {
3851 ++$_log_backtrace; 4117 ++$_log_backtrace;
4118 my $perl_bt = Carp::longmess $msg;
3852 async { 4119 async {
3853 $Coro::current->{desc} = "abt $msg"; 4120 $Coro::current->{desc} = "abt $msg";
3854 4121
3855 my @bt = fork_call { 4122 my @bt = fork_call {
3856 @addr = map { sprintf "%x", $_ } @addr; 4123 @addr = map { sprintf "%x", $_ } @addr;
… …
3867 } 4134 }
3868 4135
3869 @funcs 4136 @funcs
3870 }; 4137 };
3871 4138
3872 LOG llevInfo, "[ABT] $msg\n"; 4139 LOG llevInfo, "[ABT] $perl_bt\n";
4140 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 4141 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 4142 --$_log_backtrace;
3875 }; 4143 };
3876 } else { 4144 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 4145 LOG llevInfo, "[ABT] $msg\n";
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4146 LOG llevInfo, "[ABT] [suppressed]\n";
3879 } 4147 }
3880} 4148}
3881 4149
3882# load additional modules 4150# load additional modules
3883use cf::pod; 4151require "cf/$_.pm" for @EXTRA_MODULES;
4152cf::_connect_to_perl_2;
3884 4153
3885END { cf::emergency_save } 4154END { cf::emergency_save }
3886 4155
38871 41561
3888 4157

Diff Legend

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