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.424 by root, Sun Apr 20 05:24:55 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 3.2; 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 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML::XS ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 75
65$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" };
66 78
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 80
69our %COMMAND = (); 81our %COMMAND = ();
70our %COMMAND_TIME = (); 82our %COMMAND_TIME = ();
73our %EXTCMD = (); 85our %EXTCMD = ();
74our %EXTICMD = (); 86our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 87our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 88our %EXT_MAP = (); # pluggable maps
77 89
78our $RELOAD; # number of reloads so far 90our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 91our @EVENT;
92our @REFLECT; # set by XS
93our %REFLECT; # set by us
80 94
81our $CONFDIR = confdir; 95our $CONFDIR = confdir;
82our $DATADIR = datadir; 96our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 97our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 98our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 99our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 100our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 101our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 102our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 103our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 104our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 105our $BDBDIR = "$LOCALDIR/db";
106our $PIDFILE = "$LOCALDIR/pid";
107our $RUNTIMEFILE = "$LOCALDIR/runtime";
108
92our %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;
93 116
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 117our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 118our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 119our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 120our $USE_FSYNC = 1; # use fsync to write maps - default on
99 121
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 122our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 123our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 124our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 125our $DB_ENV;
105 126
127our @EXTRA_MODULES = qw(pod match mapscript);
128
106our %CFG; 129our %CFG;
107 130
108our $UPTIME; $UPTIME ||= time; 131our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 132our $RUNTIME;
110our $NOW; 133our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 142our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 143our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 144our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 145our $TICK_START; # for load detecting purposes
123 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
124binmode STDOUT; 152binmode STDOUT;
125binmode STDERR; 153binmode STDERR;
126 154
127# read virtual server time, if available 155# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 156unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 157 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 158 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 159 $RUNTIME = <$fh> + 0.;
132} 160}
161
162eval "sub TICK() { $TICK } 1" or die;
133 163
134mkdir $_ 164mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 165 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 166
137our $EMERGENCY_POSITION; 167our $EMERGENCY_POSITION;
138 168
139sub 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::"} };
140 185
141############################################################################# 186#############################################################################
142 187
143=head2 GLOBAL VARIABLES 188=head2 GLOBAL VARIABLES
144 189
191returns 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
192per 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.
193 238
194=item @cf::INVOKE_RESULTS 239=item @cf::INVOKE_RESULTS
195 240
196This array contains the results of the last C<invoke ()> call. When 241This array contains the results of the last C<invoke ()> call. When
197C<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
198that call. 243that call.
199 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
200=back 251=back
201 252
202=cut 253=cut
203 254
204BEGIN { 255sub error(@) { LOG llevError, join "", @_ }
205 *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 {
206 my $msg = join "", @_; 262 my $msg = join "", @_;
207 263
208 $msg .= "\n" 264 $msg .= "\n"
209 unless $msg =~ /\n$/; 265 unless $msg =~ /\n$/;
210 266
211 $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;
212 268
213 LOG llevError, $msg; 269 LOG llevWarn, $msg;
214 }; 270};
215}
216 271
217$Coro::State::DIEHOOK = sub { 272$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 273 return unless $^S eq 0; # "eq", not "=="
219 274
220 if ($Coro::current == $Coro::main) {#d# 275 error Carp::longmess $_[0];
276
277 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 278 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 279 return;#d#
223 }#d# 280 }#d#
224 281
225 # kill coroutine otherwise 282 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 283 Coro::terminate
228}; 284};
229
230$SIG{__DIE__} = sub { }; #d#?
231 285
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 286@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 287@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 288@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 289@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 296for my $pkg (qw(
243 cf::global cf::attachable 297 cf::global cf::attachable
244 cf::object cf::object::player 298 cf::object cf::object::player
245 cf::client cf::player 299 cf::client cf::player
246 cf::arch cf::living 300 cf::arch cf::living
301 cf::map cf::mapspace
247 cf::map cf::party cf::region 302 cf::party cf::region
248)) { 303)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 304 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 305}
252 306
253$EV::DIED = sub { 307$EV::DIED = sub {
254 warn "error in event callback: @_"; 308 Carp::cluck "error in event callback: @_";
255}; 309};
256 310
257############################################################################# 311#############################################################################
258 312
259=head2 UTILITY FUNCTIONS 313=head2 UTILITY FUNCTIONS
296our $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
297 351
298sub encode_json($) { $json_coder->encode ($_[0]) } 352sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 353sub decode_json($) { $json_coder->decode ($_[0]) }
300 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
301=item cf::lock_wait $string 369=item cf::lock_wait $string
302 370
303Wait until the given lock is available. See cf::lock_acquire. 371Wait until the given lock is available. See cf::lock_acquire.
304 372
305=item my $lock = cf::lock_acquire $string 373=item my $lock = cf::lock_acquire $string
306 374
307Wait 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
308a 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,
309for example when the coroutine gets canceled), the lock is automatically 377for example when the coroutine gets canceled), the lock is automatically
310returned. 378returned.
311 379
312Locks 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
313deadlocked coro. 381deadlocked coro.
319 387
320Return 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.
321 389
322=cut 390=cut
323 391
324our %LOCK; 392our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 393
327sub lock_wait($) { 394sub lock_wait($) {
328 my ($key) = @_; 395 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 396}
341 397
342sub lock_acquire($) { 398sub lock_acquire($) {
343 my ($key) = @_; 399 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 400}
357 401
358sub lock_active($) { 402sub lock_active($) {
359 my ($key) = @_; 403 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 404}
363 405
364sub freeze_mainloop { 406sub freeze_mainloop {
365 tick_inhibit_inc; 407 tick_inhibit_inc;
366 408
367 Coro::guard \&tick_inhibit_dec; 409 &Guard::guard (\&tick_inhibit_dec);
368} 410}
369 411
370=item cf::periodic $interval, $cb 412=item cf::periodic $interval, $cb
371 413
372Like 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
373get spread over timer. 415get spread over time.
374 416
375=cut 417=cut
376 418
377sub periodic($$) { 419sub periodic($$) {
378 my ($interval, $cb) = @_; 420 my ($interval, $cb) = @_;
395 437
396=cut 438=cut
397 439
398our @SLOT_QUEUE; 440our @SLOT_QUEUE;
399our $SLOT_QUEUE; 441our $SLOT_QUEUE;
442our $SLOT_DECAY = 0.9;
400 443
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 444$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 445$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 446 $Coro::current->desc ("timeslot manager");
404 447
405 my $signal = new Coro::Signal; 448 my $signal = new Coro::Signal;
449 my $busy;
406 450
407 while () { 451 while () {
408 next_job: 452 next_job:
453
409 my $avail = cf::till_tick; 454 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 455
411 for (0 .. $#SLOT_QUEUE) { 456 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 457 if ($SLOT_QUEUE[$_][0] <= $avail) {
458 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 459 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 460 $job->[2]->send;
415 Coro::cede; 461 Coro::cede;
416 goto next_job; 462 goto next_job;
417 } 463 } else {
464 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 465 }
419 } 466 }
420 467
421 if (@SLOT_QUEUE) { 468 if (@SLOT_QUEUE) {
422 # 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
423 push @cf::WAIT_FOR_TICK, $signal; 470 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 471 $signal->wait;
425 } else { 472 } else {
473 $busy = 0;
426 Coro::schedule; 474 Coro::schedule;
427 } 475 }
428 } 476 }
429}; 477};
430 478
431sub get_slot($;$$) { 479sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main; 480 return if tick_inhibit || $Coro::current == $Coro::main;
433 481
434 my ($time, $pri, $name) = @_; 482 my ($time, $pri, $name) = @_;
435 483
436 $time = $TICK * .6 if $time > $TICK * .6; 484 $time = clamp $time, 0.01, $TICK * .6;
485
437 my $sig = new Coro::Signal; 486 my $sig = new Coro::Signal;
438 487
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 488 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 489 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 490 $SLOT_QUEUE->ready;
467=cut 516=cut
468 517
469sub sync_job(&) { 518sub sync_job(&) {
470 my ($job) = @_; 519 my ($job) = @_;
471 520
472 if ($Coro::current == $Coro::main) { 521 if (in_main) {
473 my $time = EV::time; 522 my $time = AE::time;
474 523
475 # this is the main coro, too bad, we have to block 524 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 525 # till the operation succeeds, freezing the server :/
477 526
478 LOG llevError, Carp::longmess "sync job";#d# 527 #LOG llevError, Carp::longmess "sync job";#d#
479 528
480 my $freeze_guard = freeze_mainloop; 529 my $freeze_guard = freeze_mainloop;
481 530
482 my $busy = 1; 531 my $busy = 1;
483 my @res; 532 my @res;
484 533
485 (async { 534 (async {
486 $Coro::current->desc ("sync job coro"); 535 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 536 @res = eval { $job->() };
488 warn $@ if $@; 537 error $@ if $@;
489 undef $busy; 538 undef $busy;
490 })->prio (Coro::PRIO_MAX); 539 })->prio (Coro::PRIO_MAX);
491 540
492 while ($busy) { 541 while ($busy) {
493 if (Coro::nready) { 542 if (Coro::nready) {
495 } else { 544 } else {
496 EV::loop EV::LOOP_ONESHOT; 545 EV::loop EV::LOOP_ONESHOT;
497 } 546 }
498 } 547 }
499 548
500 my $time = EV::time - $time; 549 my $time = AE::time - $time;
501 550
502 $TICK_START += $time; # do not account sync jobs to server load 551 $TICK_START += $time; # do not account sync jobs to server load
503 552
504 wantarray ? @res : $res[0] 553 wantarray ? @res : $res[0]
505 } else { 554 } else {
549 reset_signals; 598 reset_signals;
550 &$cb 599 &$cb
551 }, @args; 600 }, @args;
552 601
553 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 )
554} 614}
555 615
556=item $coin = coin_from_name $name 616=item $coin = coin_from_name $name
557 617
558=cut 618=cut
595within each server. 655within each server.
596 656
597=cut 657=cut
598 658
599sub db_table($) { 659sub db_table($) {
660 cf::error "db_get called from main context"
661 if $Coro::current == $Coro::main;
662
600 my ($name) = @_; 663 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 664 my $db = BDB::db_create $DB_ENV;
602 665
603 eval { 666 eval {
604 $db->set_flags (BDB::CHKSUM); 667 $db->set_flags (BDB::CHKSUM);
614} 677}
615 678
616our $DB; 679our $DB;
617 680
618sub db_init { 681sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 682 $DB ||= db_table "db";
621 };
622} 683}
623 684
624sub db_get($$) { 685sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 686 my $key = "$_[0]/$_[1]";
626 687
627 cf::sync_job { 688 cf::error "db_get called from main context"
689 if $Coro::current == $Coro::main;
690
628 BDB::db_get $DB, undef, $key, my $data; 691 BDB::db_get $DB, undef, $key, my $data;
629 692
630 $! ? () 693 $! ? ()
631 : $data 694 : $data
632 }
633} 695}
634 696
635sub db_put($$$) { 697sub db_put($$$) {
636 BDB::dbreq_pri 4; 698 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 699 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
693 755
694 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
695 my $data = $process->(\@data); 757 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
697 759
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 761
700 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
703 765
713 775
714=cut 776=cut
715 777
716sub datalog($@) { 778sub datalog($@) {
717 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 781}
720 782
721=back 783=back
722 784
723=cut 785=cut
724 786
725############################################################################# 787#############################################################################
726 788
727=head2 ATTACHABLE OBJECTS 789=head2 ATTACHABLE OBJECTS
728 790
729Many 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
730attach callbacks/event handlers (a collection of which is called an "attachment") 792attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 793to it. All such attachable objects support the following methods.
732 794
733In 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>
734C<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
784=item cf::CLASS::attachment $name, ... 846=item cf::CLASS::attachment $name, ...
785 847
786Register an attachment by C<$name> through which attachable objects of the 848Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 849given CLASS can refer to this attachment.
788 850
789Some classes such as crossfire maps and objects can specify attachments 851Some classes such as deliantra maps and objects can specify attachments
790that 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.
791 853
792These calls expect any number of the following handler/hook descriptions: 854These calls expect any number of the following handler/hook descriptions:
793 855
794=over 4 856=over 4
918 980
919 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 983
922 } elsif (ref $type) { 984 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
924 986
925 } else { 987 } else {
926 shift @arg; 988 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
928 } 990 }
929 } 991 }
930} 992}
931 993
932sub _object_attach { 994sub _object_attach {
942 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
943 } 1005 }
944 1006
945 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
946 } else { 1008 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1010 }
949 1011
950 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
951} 1013}
952 1014
1011 1073
1012 for (@$callbacks) { 1074 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1014 1076
1015 if ($@) { 1077 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1079 override;
1019 } 1080 }
1020 1081
1021 return 1 if $override; 1082 return 1 if $override;
1022 } 1083 }
1085 1146
1086sub reattach { 1147sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1148 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1149 my ($obj) = @_;
1089 1150
1151 # no longer needed after getting rid of delete_package?
1090 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
1091 1153
1092 my $registry = $obj->registry; 1154 my $registry = $obj->registry;
1093 1155
1094 @$registry = (); 1156 @$registry = ();
1095 1157
1100 for (@$attach) { 1162 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1103 } 1165 }
1104 } else { 1166 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1168 }
1107 } 1169 }
1108} 1170}
1109 1171
1110cf::attachable->attach ( 1172cf::attachable->attach (
1137 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1138 1200
1139 sync_job { 1201 sync_job {
1140 if (length $$rdata) { 1202 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1144 1207
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1209 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 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 }
1149 close $fh; 1215 aio_close $fh;
1150 1216
1151 if (@$objs) { 1217 if (@$objs) {
1152 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) {
1153 chmod SAVE_MODE, $fh; 1219 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1156 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 }
1157 close $fh; 1226 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1228 }
1160 } else { 1229 } else {
1161 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
1162 } 1231 }
1163 1232
1164 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1234
1235 $filename =~ s%/[^/]+$%%;
1236 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1237 } else {
1166 warn "FATAL: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1167 } 1239 }
1168 } else { 1240 } else {
1169 aio_unlink $filename; 1241 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1171 } 1243 }
1195 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1268 $av = $st->{objs};
1197 } 1269 }
1198 1270
1199 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1202 1275
1203 ($data, $av) 1276 ($data, $av)
1204} 1277}
1205 1278
1206=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
1262 my ($name, $cb) = @_; 1335 my ($name, $cb) = @_;
1263 1336
1264 $EXTICMD{$name} = $cb; 1337 $EXTICMD{$name} = $cb;
1265} 1338}
1266 1339
1340use File::Glob ();
1341
1267cf::player->attach ( 1342cf::player->attach (
1268 on_command => sub { 1343 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1270 1345
1271 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1272 or return; 1347 or return;
1273 1348
1296 1371
1297 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1298 if $reply; 1373 if $reply;
1299 1374
1300 } else { 1375 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1377 }
1303 1378
1304 cf::override; 1379 cf::override;
1305 }, 1380 },
1306); 1381);
1307 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
1308sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1309 cf::sync_job { 1399 cf::sync_job {
1310 my %todo; 1400 my %todo;
1311 1401
1312 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1403 next unless -r $path;
1331 1421
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1424
1335 $ext{source} = 1425 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1426 "package $pkg; use common::sense;\n"
1337 . "#line 1 \"$path\"\n{\n" 1427 . "#line 1 \"$path\"\n{\n"
1338 . $source 1428 . $source
1339 . "\n};\n1"; 1429 . "\n};\n1";
1340 1430
1341 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1342 } 1432 }
1343 1433
1434 my $pass = 0;
1344 my %done; 1435 my %done;
1345 while (%todo) { 1436 while (%todo) {
1346 my $progress; 1437 my $progress;
1347 1438
1439 ++$pass;
1440
1441 ext:
1348 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1444 next ext
1351 unless exists $done{$_}; 1445 unless exists $done{$_};
1352 } 1446 }
1353 1447
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1449
1356 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n"; 1454 undef $@; # work around perl 5.10.0 utf-8 caching bug
1359 1455
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1456 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1457 if exists $v->{meta}{mandatory};
1364 1458
1365 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;
1366 } 1468 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1469 }
1372 1470
1373 skip: 1471 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1472 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 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 }
1376 } 1479 }
1377 }; 1480 };
1378} 1481}
1379 1482
1380############################################################################# 1483#############################################################################
1381 1484
1382=back 1485=back
1383 1486
1384=head2 CORE EXTENSIONS 1487=head2 CORE EXTENSIONS
1385 1488
1386Functions and methods that extend core crossfire objects. 1489Functions and methods that extend core deliantra objects.
1387 1490
1388=cut 1491=cut
1389 1492
1390package cf::player; 1493package cf::player;
1391 1494
1434 1537
1435sub exists($) { 1538sub exists($) {
1436 my ($login) = @_; 1539 my ($login) = @_;
1437 1540
1438 $cf::PLAYER{$login} 1541 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1542 or !aio_stat path $login
1440} 1543}
1441 1544
1442sub find($) { 1545sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1546 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1547 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1559 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1560 or return;
1458 1561
1459 my $pl = cf::player::load_pl $f 1562 my $pl = cf::player::load_pl $f
1460 or return; 1563 or return;
1564
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1565 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1566 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1567 $cf::PLAYER{$login} = $pl
1464 } 1568 }
1465 } 1569 }
1466} 1570}
1467 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
1468sub save($) { 1585sub save($) {
1469 my ($pl) = @_; 1586 my ($pl) = @_;
1470 1587
1471 return if $pl->{deny_save}; 1588 return if $pl->{deny_save};
1472 1589
1477 1594
1478 aio_mkdir playerdir $pl, 0770; 1595 aio_mkdir playerdir $pl, 0770;
1479 $pl->{last_save} = $cf::RUNTIME; 1596 $pl->{last_save} = $cf::RUNTIME;
1480 1597
1481 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];
1482 1602
1483 $pl->save_pl ($path); 1603 $pl->save_pl ($path);
1484 cf::cede_to_tick; 1604 cf::cede_to_tick;
1485} 1605}
1486 1606
1518 my ($pl) = @_; 1638 my ($pl) = @_;
1519 1639
1520 my $name = $pl->ob->name; 1640 my $name = $pl->ob->name;
1521 1641
1522 $pl->{deny_save} = 1; 1642 $pl->{deny_save} = 1;
1523 $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
1524 1644
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1645 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1646 $pl->deactivate;
1647 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1648 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1649 $pl->ns->destroy if $pl->ns;
1529 1650
1530 my $path = playerdir $pl; 1651 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1652 my $temp = "$path~$cf::RUNTIME~deleting~";
1570 1691
1571 for my $login (@$dirs) { 1692 for my $login (@$dirs) {
1572 my $path = path $login; 1693 my $path = path $login;
1573 1694
1574 # a .pst is a dead give-away for a valid player 1695 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1696 # if no pst file found, open and chekc for blocked users
1697 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1698 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1699 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1700 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1701 }
1580 1702
1584 1706
1585 \@logins 1707 \@logins
1586} 1708}
1587 1709
1588=item $player->maps 1710=item $player->maps
1711
1712=item cf::player::maps $login
1589 1713
1590Returns an arrayref of map paths that are private for this 1714Returns an arrayref of map paths that are private for this
1591player. May block. 1715player. May block.
1592 1716
1593=cut 1717=cut
1611 } 1735 }
1612 1736
1613 \@paths 1737 \@paths
1614} 1738}
1615 1739
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1740=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1741
1618Expand crossfire pod fragments into protocol xml. 1742Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1743
1709=item $player->ext_reply ($msgid, @msg) 1744=item $player->ext_reply ($msgid, @msg)
1710 1745
1711Sends an ext reply to the player. 1746Sends an ext reply to the player.
1712 1747
1744 1779
1745=cut 1780=cut
1746 1781
1747sub find_by_path($) { 1782sub find_by_path($) {
1748 my ($path) = @_; 1783 my ($path) = @_;
1784
1785 $path =~ s/^~[^\/]*//; # skip ~login
1749 1786
1750 my ($match, $specificity); 1787 my ($match, $specificity);
1751 1788
1752 for my $region (list) { 1789 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1790 if ($region->{match} && $path =~ $region->{match}) {
1785 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
1786 1823
1787 # mit "rum" bekleckern, nicht 1824 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1825 $self->_create_random_map (
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1826 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1827 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1828 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map}, 1829 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize}, 1830 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1831 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1832 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1810 1847
1811sub register { 1848sub register {
1812 my (undef, $regex, $prio) = @_; 1849 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1850 my $pkg = caller;
1814 1851
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1852 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1853
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1855}
1820 1856
1821# also paths starting with '/' 1857# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1859
1824sub thawer_merge { 1860sub thawer_merge {
1825 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1826 1862
1827 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
1925 1961
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1962 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1963 "$UNIQUEDIR/$path"
1928} 1964}
1929 1965
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937}
1938
1939sub decay_objects { 1966sub decay_objects {
1940 my ($self) = @_; 1967 my ($self) = @_;
1941 1968
1942 return if $self->{deny_reset}; 1969 return if $self->{deny_reset};
1943 1970
2025sub find { 2052sub find {
2026 my ($path, $origin) = @_; 2053 my ($path, $origin) = @_;
2027 2054
2028 $path = normalise $path, $origin && $origin->path; 2055 $path = normalise $path, $origin && $origin->path;
2029 2056
2030 cf::lock_wait "map_data:$path";#d#remove 2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2058 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2059
2033 $cf::MAP{$path} || do { 2060 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 2061 my $map = new_from_path cf::map $path
2038 or return; 2062 or return;
2039 2063
2040 $map->{last_save} = $cf::RUNTIME; 2064 $map->{last_save} = $cf::RUNTIME;
2041 2065
2043 or return; 2067 or return;
2044 2068
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2069 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2070 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2071 #$cf::WAIT_FOR_TICK->wait;
2072 undef $guard2;
2048 undef $guard1; 2073 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2074 $map->reset;
2051 return find $path; 2075 return find $path;
2052 } 2076 }
2053 2077
2054 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
2055 } 2079 }
2056} 2080}
2057 2081
2058sub pre_load { } 2082sub pre_load { }
2059sub post_load { } 2083#sub post_load { } # XS
2060 2084
2061sub load { 2085sub load {
2062 my ($self) = @_; 2086 my ($self) = @_;
2063 2087
2064 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2105 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2106 $f->skip_block;
2083 $self->_load_objects ($f) 2107 $self->_load_objects ($f)
2084 or return; 2108 or return;
2085 2109
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2110 $self->post_load_original
2087 if delete $self->{load_original}; 2111 if delete $self->{load_original};
2088 2112
2089 if (my $uniq = $self->uniq_path) { 2113 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2114 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2115 unless (aio_stat $uniq) {
2109 unless ($self->{deny_activate}) { 2133 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2134 $self->decay_objects;
2111 $self->fix_auto_apply; 2135 $self->fix_auto_apply;
2112 $self->update_buttons; 2136 $self->update_buttons;
2113 cf::cede_to_tick; 2137 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick;
2116 $self->activate; 2138 $self->activate;
2117 } 2139 }
2118 2140
2119 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2142 $self->last_access ($cf::RUNTIME);
2123 } 2145 }
2124 2146
2125 $self->post_load; 2147 $self->post_load;
2126} 2148}
2127 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
2128sub customise_for { 2153sub customise_for {
2129 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2130 2155
2131 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2132 if $self->per_player; 2157 if $self->per_player;
2148 or next; 2173 or next;
2149 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2150 or next; 2175 or next;
2151 $neigh->load; 2176 $neigh->load;
2152 2177
2178 # now find the diagonal neighbours
2153 push @neigh, 2179 push @neigh,
2154 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2155 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2156 } 2182 }
2157 2183
2164} 2190}
2165 2191
2166sub find_sync { 2192sub find_sync {
2167 my ($path, $origin) = @_; 2193 my ($path, $origin) = @_;
2168 2194
2169 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
2170} 2199}
2171 2200
2172sub do_load_sync { 2201sub do_load_sync {
2173 my ($map) = @_; 2202 my ($map) = @_;
2174 2203
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2204 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main; 2205 if $Coro::current == $Coro::main;
2177 2206
2178 cf::sync_job { $map->load }; 2207 $map->load;
2179} 2208}
2180 2209
2181our %MAP_PREFETCH; 2210our %MAP_PREFETCH;
2182our $MAP_PREFETCHER = undef; 2211our $MAP_PREFETCHER = undef;
2183 2212
2209 $MAP_PREFETCHER->prio (6); 2238 $MAP_PREFETCHER->prio (6);
2210 2239
2211 () 2240 ()
2212} 2241}
2213 2242
2243# common code, used by both ->save and ->swapout
2214sub save { 2244sub _save {
2215 my ($self) = @_; 2245 my ($self) = @_;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2246
2219 $self->{last_save} = $cf::RUNTIME; 2247 $self->{last_save} = $cf::RUNTIME;
2220 2248
2221 return unless $self->dirty; 2249 return unless $self->dirty;
2222 2250
2242 } else { 2270 } else {
2243 $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);
2244 } 2272 }
2245} 2273}
2246 2274
2275sub save {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 $self->_save;
2281}
2282
2247sub swap_out { 2283sub swap_out {
2248 my ($self) = @_; 2284 my ($self) = @_;
2249 2285
2250 # save first because save cedes
2251 $self->save;
2252
2253 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2254 2287
2255 return if $self->players;
2256 return if $self->in_memory != cf::MAP_ACTIVE; 2288 return if $self->in_memory != cf::MAP_ACTIVE;
2257 return if $self->{deny_save}; 2289 return if $self->{deny_save};
2290 return if $self->players;
2258 2291
2292 # first deactivate the map and "unlink" it from the core
2293 $self->deactivate;
2294 $_->clear_links_to ($self) for values %cf::MAP;
2259 $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};
2260 2342
2261 $self->deactivate; 2343 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP; 2344 $_->clear_links_to ($self) for values %cf::MAP;
2263 $self->clear; 2345 $self->clear;
2264}
2265
2266sub reset_at {
2267 my ($self) = @_;
2268
2269 # TODO: safety, remove and allow resettable per-player maps
2270 return 1e99 if $self->{deny_reset};
2271
2272 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2273 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2274
2275 $time + $to
2276}
2277
2278sub should_reset {
2279 my ($self) = @_;
2280
2281 $self->reset_at <= $cf::RUNTIME
2282}
2283
2284sub reset {
2285 my ($self) = @_;
2286
2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288
2289 return if $self->players;
2290
2291 warn "resetting map ", $self->path;
2292
2293 $self->in_memory (cf::MAP_SWAPPED);
2294
2295 # need to save uniques path
2296 unless ($self->{deny_save}) {
2297 my $uniq = $self->uniq_path; utf8::encode $uniq;
2298
2299 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2300 if $uniq;
2301 }
2302
2303 delete $cf::MAP{$self->path};
2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2307 $self->clear;
2308 2346
2309 $self->unlink_save; 2347 $self->unlink_save;
2310 $self->destroy; 2348 $self->destroy;
2311} 2349}
2312 2350
2320 2358
2321 delete $cf::MAP{$self->path}; 2359 delete $cf::MAP{$self->path};
2322 2360
2323 $self->unlink_save; 2361 $self->unlink_save;
2324 2362
2325 bless $self, "cf::map"; 2363 bless $self, "cf::map::wrap";
2326 delete $self->{deny_reset}; 2364 delete $self->{deny_reset};
2327 $self->{deny_save} = 1; 2365 $self->{deny_save} = 1;
2328 $self->reset_timeout (1); 2366 $self->reset_timeout (1);
2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2367 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2330 2368
2387 : normalise $_ 2425 : normalise $_
2388 } @{ aio_readdir $UNIQUEDIR or [] } 2426 } @{ aio_readdir $UNIQUEDIR or [] }
2389 ] 2427 ]
2390} 2428}
2391 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
2392=back 2462=back
2393 2463
2394=head3 cf::object 2464=head3 cf::object
2395 2465
2396=cut 2466=cut
2457can be C<undef>. Does the right thing when the player is currently in a 2527can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2528dialogue with the given NPC character.
2459 2529
2460=cut 2530=cut
2461 2531
2532our $SAY_CHANNEL = {
2533 id => "say",
2534 title => "Map",
2535 reply => "say ",
2536 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2537};
2538
2539our $CHAT_CHANNEL = {
2540 id => "chat",
2541 title => "Chat",
2542 reply => "chat ",
2543 tooltip => "Player chat and shouts, global to the server.",
2544};
2545
2462# rough implementation of a future "reply" method that works 2546# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2547# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2548#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2549sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2550 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2561 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2562 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2563
2480 } else { 2564 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2565 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2566 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2567 }
2484 } 2568 }
2485} 2569}
2486 2570
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2571=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2596
2513=item $player_object->enter_link 2597=item $player_object->enter_link
2514 2598
2515Freezes 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}>).
2516 2600
2517The 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.
2518I<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.
2519 2605
2520Will never block. 2606Will never block.
2521 2607
2522=item $player_object->leave_link ($map, $x, $y) 2608=item $player_object->leave_link ($map, $x, $y)
2523 2609
2543sub cf::object::player::enter_link { 2629sub cf::object::player::enter_link {
2544 my ($self) = @_; 2630 my ($self) = @_;
2545 2631
2546 $self->deactivate_recursive; 2632 $self->deactivate_recursive;
2547 2633
2634 ++$self->{_link_recursion};
2635
2548 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2636 return if UNIVERSAL::isa $self->map, "ext::map_link";
2549 2637
2550 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2638 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2551 if $self->map && $self->map->{path} ne "{link}"; 2639 if $self->map && $self->map->{path} ne "{link}";
2552 2640
2553 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2641 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2554} 2642}
2555 2643
2556sub cf::object::player::leave_link { 2644sub cf::object::player::leave_link {
2557 my ($self, $map, $x, $y) = @_; 2645 my ($self, $map, $x, $y) = @_;
2558 2646
2575 ($x, $y) = (-1, -1) 2663 ($x, $y) = (-1, -1)
2576 unless (defined $x) && (defined $y); 2664 unless (defined $x) && (defined $y);
2577 2665
2578 # use -1 or undef as default coordinates, not 0, 0 2666 # use -1 or undef as default coordinates, not 0, 0
2579 ($x, $y) = ($map->enter_x, $map->enter_y) 2667 ($x, $y) = ($map->enter_x, $map->enter_y)
2580 if $x <=0 && $y <= 0; 2668 if $x <= 0 && $y <= 0;
2581 2669
2582 $map->load; 2670 $map->load;
2583 $map->load_neighbours; 2671 $map->load_neighbours;
2584 2672
2585 return unless $self->contr->active; 2673 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2674
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2675 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2676 if ($self->enter_map ($map, $x, $y)) {
2590} 2677 # entering was successful
2678 delete $self->{_link_recursion};
2679 # only activate afterwards, to support waiting in hooks
2680 $self->activate_recursive;
2681 }
2591 2682
2683}
2684
2592=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)]])
2593 2686
2594Moves 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
2595her, loading and preparing them map, calling the provided $check callback 2688her, loading and preparing them map, calling the provided $check callback
2596that 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
2597the 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
2598be called at the end of this process. 2691be called at the end of this process.
2599 2692
2693Note that $check will be called with a potentially non-loaded map, so if
2694it needs a loaded map it has to call C<< ->load >>.
2695
2600=cut 2696=cut
2601 2697
2602our $GOTOGEN; 2698our $GOTOGEN;
2603 2699
2604sub cf::object::player::goto { 2700sub cf::object::player::goto {
2605 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 }
2606 2708
2607 # 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
2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2710 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2609 2711
2610 $self->enter_link; 2712 $self->enter_link;
2634 my $map = eval { 2736 my $map = eval {
2635 my $map = defined $path ? cf::map::find $path : undef; 2737 my $map = defined $path ? cf::map::find $path : undef;
2636 2738
2637 if ($map) { 2739 if ($map) {
2638 $map = $map->customise_for ($self); 2740 $map = $map->customise_for ($self);
2639 $map = $check->($map) if $check && $map; 2741 $map = $check->($map, $x, $y, $self) if $check && $map;
2640 } else { 2742 } else {
2641 $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);
2642 } 2744 }
2643 2745
2644 $map 2746 $map
2652 if ($gen == $self->{_goto_generation}) { 2754 if ($gen == $self->{_goto_generation}) {
2653 delete $self->{_goto_generation}; 2755 delete $self->{_goto_generation};
2654 $self->leave_link ($map, $x, $y); 2756 $self->leave_link ($map, $x, $y);
2655 } 2757 }
2656 2758
2657 $done->() if $done; 2759 $done->($self) if $done;
2658 })->prio (1); 2760 })->prio (1);
2659} 2761}
2660 2762
2661=item $player_object->enter_exit ($exit_object) 2763=item $player_object->enter_exit ($exit_object)
2662 2764
2682} 2784}
2683 2785
2684sub prepare_random_map { 2786sub prepare_random_map {
2685 my ($exit) = @_; 2787 my ($exit) = @_;
2686 2788
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2789 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2790 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2791 # that depends on the exit object
2692 2792
2693 my $rmp = parse_random_map_params $exit->msg; 2793 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2795 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2796 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2797 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2798 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2799 $rmp->{origin_y} = $exit->y;
2800
2801 $exit->map->touch;
2700 } 2802 }
2701 2803
2702 $rmp->{random_seed} ||= $exit->random_seed; 2804 $rmp->{random_seed} ||= $exit->random_seed;
2703 2805
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2806 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2810 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2811 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2812 undef $fh;
2711 aio_rename "$meta~", $meta; 2813 aio_rename "$meta~", $meta;
2712 2814
2815 my $slaying = "?random/$md5";
2816
2817 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2818 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2819 $exit->msg (undef);
2820 }
2715 } 2821 }
2716} 2822}
2717 2823
2718sub cf::object::player::enter_exit { 2824sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2825 my ($self, $exit) = @_;
2720 2826
2721 return unless $self->type == cf::PLAYER; 2827 return unless $self->type == cf::PLAYER;
2722 2828
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2829 $self->enter_link;
2735 2830
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2831 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2832 $Coro::current->{desc} = "enter_exit";
2742 2833
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2834 unless (eval {
2835 $self->deactivate_recursive; # just to be sure
2836
2837 # random map handling
2838 {
2839 my $guard = cf::lock_acquire "exit_prepare:$exit";
2840
2841 prepare_random_map $exit
2842 if $exit->slaying eq "/!";
2843 }
2844
2845 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2846 my $x = $exit->stats->hp;
2847 my $y = $exit->stats->sp;
2848
2745 $self->goto ($slaying, $hp, $sp); 2849 $self->goto ($map, $x, $y);
2746 2850
2851 # if exit is damned, update players death & WoR home-position
2852 $self->contr->savebed ($map, $x, $y)
2853 if $exit->flag (cf::FLAG_DAMNED);
2854
2747 1; 2855 1
2748 }) { 2856 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2857 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "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. "
2751 . "Please report this to the dungeon master!", 2859 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2860 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2861
2754 warn "ERROR in enter_exit: $@"; 2862 error "ERROR in enter_exit: $@";
2755 $self->leave_link; 2863 $self->leave_link;
2756 } 2864 }
2757 })->prio (1); 2865 })->prio (1);
2758} 2866}
2759 2867
2771sub cf::client::send_drawinfo { 2879sub cf::client::send_drawinfo {
2772 my ($self, $text, $flags) = @_; 2880 my ($self, $text, $flags) = @_;
2773 2881
2774 utf8::encode $text; 2882 utf8::encode $text;
2775 $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);
2776} 2909}
2777 2910
2778=item $client->send_msg ($channel, $msg, $color, [extra...]) 2911=item $client->send_msg ($channel, $msg, $color, [extra...])
2779 2912
2780Send 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
2784 2917
2785=cut 2918=cut
2786 2919
2787# non-persistent channels (usually the info channel) 2920# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 2921our %CHANNEL = (
2922 "c/motd" => {
2923 id => "infobox",
2924 title => "MOTD",
2925 reply => undef,
2926 tooltip => "The message of the day",
2927 },
2789 "c/identify" => { 2928 "c/identify" => {
2790 id => "infobox", 2929 id => "infobox",
2791 title => "Identify", 2930 title => "Identify",
2792 reply => undef, 2931 reply => undef,
2793 tooltip => "Items recently identified", 2932 tooltip => "Items recently identified",
2795 "c/examine" => { 2934 "c/examine" => {
2796 id => "infobox", 2935 id => "infobox",
2797 title => "Examine", 2936 title => "Examine",
2798 reply => undef, 2937 reply => undef,
2799 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",
2800 }, 2945 },
2801 "c/book" => { 2946 "c/book" => {
2802 id => "infobox", 2947 id => "infobox",
2803 title => "Book", 2948 title => "Book",
2804 reply => undef, 2949 reply => undef,
2820 id => "infobox", 2965 id => "infobox",
2821 title => "Body Parts", 2966 title => "Body Parts",
2822 reply => undef, 2967 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2968 tooltip => "Shows which body parts you posess and are available",
2824 }, 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 },
2825 "c/uptime" => { 3006 "c/uptime" => {
2826 id => "infobox", 3007 id => "infobox",
2827 title => "Uptime", 3008 title => "Uptime",
2828 reply => undef, 3009 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 3010 tooltip => "How long the server has been running since last restart",
2832 id => "infobox", 3013 id => "infobox",
2833 title => "Map Info", 3014 title => "Map Info",
2834 reply => undef, 3015 reply => undef,
2835 tooltip => "Information related to the maps", 3016 tooltip => "Information related to the maps",
2836 }, 3017 },
3018 "c/party" => {
3019 id => "party",
3020 title => "Party",
3021 reply => "gsay ",
3022 tooltip => "Messages and chat related to your party",
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,
2837); 3032);
2838 3033
2839sub cf::client::send_msg { 3034sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3035 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3036
2842 $msg = $self->pl->expand_cfpod ($msg); 3037 $msg = $self->pl->expand_cfpod ($msg)
3038 unless $color & cf::NDI_VERBATIM;
2843 3039
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 3040 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 3041
2846 # check predefined channels, for the benefit of C 3042 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 3043 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 3044 $channel = $CHANNEL{$channel};
2849 3045
2850 $self->ext_msg (channel_info => $channel) 3046 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 3047 $channel = $channel->{id};
2854 3048
2855 } elsif (ref $channel) { 3049 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 3050 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 3051 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 3052 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 3053 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 3054 }
2862 3055
2863 $channel = $channel->{id}; 3056 $channel = $channel->{id};
2864 } 3057 }
2865 3058
2866 return unless @extra || length $msg; 3059 return unless @extra || length $msg;
2867 3060
2868 if ($self->can_msg) {
2869 # default colour, mask it out 3061 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3062 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 3063 if $color & cf::NDI_DEF;
2872 3064
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3065 my $pkt = "msg "
3066 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3067 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 3068 );
2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886 3069
2887 $color &= cf::NDI_COLOR_MASK; 3070 $self->send_big_packet ($pkt);
2888
2889 utf8::encode $msg;
2890
2891 if (0 && $msg =~ /\[/) {
2892 # COMMAND/INFO
2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896 $self->send_packet ("drawinfo $color $msg")
2897 }
2898 }
2899 }
2900} 3071}
2901 3072
2902=item $client->ext_msg ($type, @msg) 3073=item $client->ext_msg ($type, @msg)
2903 3074
2904Sends an ext event to the client. 3075Sends an ext event to the client.
2907 3078
2908sub cf::client::ext_msg($$@) { 3079sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3080 my ($self, $type, @msg) = @_;
2910 3081
2911 if ($self->extcmd == 2) { 3082 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3084 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3085 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3087 }
2917} 3088}
2918 3089
2919=item $client->ext_reply ($msgid, @msg) 3090=item $client->ext_reply ($msgid, @msg)
2920 3091
2924 3095
2925sub cf::client::ext_reply($$@) { 3096sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3097 my ($self, $id, @msg) = @_;
2927 3098
2928 if ($self->extcmd == 2) { 3099 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3100 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) { 3101 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove 3102 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id; 3103 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3104 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 } 3105 }
2935} 3106}
2936 3107
2937=item $success = $client->query ($flags, "text", \&cb) 3108=item $success = $client->query ($flags, "text", \&cb)
2938 3109
3009 3180
3010 $ns->ext_reply ($reply, @reply) 3181 $ns->ext_reply ($reply, @reply)
3011 if $reply; 3182 if $reply;
3012 3183
3013 } else { 3184 } else {
3014 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";
3015 } 3186 }
3016 3187
3017 cf::override; 3188 cf::override;
3018 }, 3189 },
3019); 3190);
3039 3210
3040 $coro 3211 $coro
3041} 3212}
3042 3213
3043cf::client->attach ( 3214cf::client->attach (
3044 on_destroy => sub { 3215 on_client_destroy => sub {
3045 my ($ns) = @_; 3216 my ($ns) = @_;
3046 3217
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3218 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3219 },
3049); 3220);
3065our $safe_hole = new Safe::Hole; 3236our $safe_hole = new Safe::Hole;
3066 3237
3067$SIG{FPE} = 'IGNORE'; 3238$SIG{FPE} = 'IGNORE';
3068 3239
3069$safe->permit_only (Opcode::opset qw( 3240$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3241 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3242 grepstart grepwhile mapstart mapwhile
3072 sort time 3243 sort time
3073)); 3244));
3074 3245
3075# here we export the classes and methods available to script code 3246# here we export the classes and methods available to script code
3078 3249
3079The following functions and methods are available within a safe environment: 3250The following functions and methods are available within a safe environment:
3080 3251
3081 cf::object 3252 cf::object
3082 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
3083 insert remove name archname title slaying race decrease_ob_nr 3254 insert remove name archname title slaying race decrease split
3255 value
3084 3256
3085 cf::object::player 3257 cf::object::player
3086 player 3258 player
3087 3259
3088 cf::player 3260 cf::player
3093 3265
3094=cut 3266=cut
3095 3267
3096for ( 3268for (
3097 ["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
3098 insert remove inv name archname title slaying race 3270 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3271 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3272 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3273 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3274 ["cf::map" => qw(trigger)],
3103) { 3275) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3276 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3277 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3278 for @funs;
3108} 3279}
3109 3280
3124 3295
3125 my $qcode = $code; 3296 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3297 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3298 $qcode =~ s/\n/\\n/g;
3128 3299
3300 %vars = (_dummy => 0) unless %vars;
3301
3302 my @res;
3129 local $_; 3303 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3304
3132 my $eval = 3305 my $eval =
3133 "do {\n" 3306 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3307 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3308 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3309 . $code
3137 . "\n}" 3310 . "\n}"
3138 ; 3311 ;
3139 3312
3313 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3314 sub_generation_inc;
3315 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3316 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 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 }
3143 3322
3144 if ($@) { 3323 if ($@) {
3145 warn "$@"; 3324 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3325 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3326 "with arguments " . (join " ", %vars) . "\n";
3148 } 3327 }
3149 3328
3150 wantarray ? @res : $res[0] 3329 wantarray ? @res : $res[0]
3151} 3330}
3152 3331
3166=cut 3345=cut
3167 3346
3168sub register_script_function { 3347sub register_script_function {
3169 my ($fun, $cb) = @_; 3348 my ($fun, $cb) = @_;
3170 3349
3171 no strict 'refs'; 3350 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3351 *$fun = $safe_hole->wrap ($cb);
3173} 3352}
3174 3353
3175=back 3354=back
3176 3355
3177=cut 3356=cut
3186 # for this (global event?) 3365 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3366 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3367
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3368 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3369
3191 warn "loading facedata from $path\n"; 3370 trace "loading facedata from $path\n";
3192 3371
3193 my $facedata; 3372 my $facedata;
3194 0 < aio_load $path, $facedata 3373 0 < aio_load $path, $facedata
3195 or die "$path: $!"; 3374 or die "$path: $!";
3196 3375
3198 3377
3199 $facedata->{version} == 2 3378 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3379 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3380
3202 # 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]);
3203 $facedata->{resource}{"res/exp_table"} = { 3383 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3384 type => FT_RSRC,
3205 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),
3206 }; 3387 };
3207 cf::cede_to_tick; 3388 cf::cede_to_tick;
3208 3389
3209 { 3390 {
3210 my $faces = $facedata->{faceinfo}; 3391 my $faces = $facedata->{faceinfo};
3212 while (my ($face, $info) = each %$faces) { 3393 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3394 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3395
3215 cf::face::set_visibility $idx, $info->{visibility}; 3396 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3397 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3398 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3399 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3219 3400
3220 cf::cede_to_tick; 3401 cf::cede_to_tick;
3221 } 3402 }
3222 3403
3223 while (my ($face, $info) = each %$faces) { 3404 while (my ($face, $info) = each %$faces) {
3228 3409
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3410 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3411 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3412 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3413 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3414 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3415 }
3235 3416
3236 cf::cede_to_tick; 3417 cf::cede_to_tick;
3237 } 3418 }
3238 } 3419 }
3247 3428
3248 cf::anim::invalidate_all; # d'oh 3429 cf::anim::invalidate_all; # d'oh
3249 } 3430 }
3250 3431
3251 { 3432 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3433 my $res = $facedata->{resource};
3255 3434
3256 while (my ($name, $info) = each %$res) { 3435 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3436 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3437 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3438
3261 if ($info->{type} & 1) { 3439 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3440 cf::face::set_type $idx, $info->{type};
3276 } else { 3441 } else {
3277 $RESOURCE{$name} = $info; 3442 $RESOURCE{$name} = $info; # unused
3278 } 3443 }
3279 3444
3280 cf::cede_to_tick; 3445 cf::cede_to_tick;
3281 } 3446 }
3282 } 3447 }
3283 3448
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3449 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3450
3286 1 3451 1
3287} 3452}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3453
3309register_exticmd fx_want => sub { 3454register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3455 my ($ns, $want) = @_;
3311 3456
3312 while (my ($k, $v) = each %$want) { 3457 while (my ($k, $v) = each %$want) {
3351sub reload_treasures { 3496sub reload_treasures {
3352 load_resource_file "$DATADIR/treasures" 3497 load_resource_file "$DATADIR/treasures"
3353 or die "unable to load treasurelists\n"; 3498 or die "unable to load treasurelists\n";
3354} 3499}
3355 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
3356sub reload_resources { 3524sub reload_resources {
3357 warn "reloading resource files...\n"; 3525 trace "reloading resource files...\n";
3358 3526
3359 reload_facedata; 3527 reload_facedata;
3528 reload_sound;
3360 reload_archetypes; 3529 reload_archetypes;
3361 reload_regions; 3530 reload_regions;
3362 reload_treasures; 3531 reload_treasures;
3363 3532
3364 warn "finished reloading resource files\n"; 3533 trace "finished reloading resource files\n";
3365}
3366
3367sub init {
3368 my $guard = freeze_mainloop;
3369
3370 reload_resources;
3371} 3534}
3372 3535
3373sub reload_config { 3536sub reload_config {
3537 trace "reloading config file...\n";
3538
3374 open my $fh, "<:utf8", "$CONFDIR/config" 3539 open my $fh, "<:utf8", "$CONFDIR/config"
3375 or return; 3540 or return;
3376 3541
3377 local $/; 3542 local $/;
3378 *CFG = YAML::Load <$fh>; 3543 *CFG = YAML::XS::Load scalar <$fh>;
3379 3544
3380 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3545 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3381 3546
3382 $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};
3383 $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};
3384 3549
3385 if (exists $CFG{mlockall}) { 3550 if (exists $CFG{mlockall}) {
3387 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3552 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3388 and die "WARNING: m(un)lockall failed: $!\n"; 3553 and die "WARNING: m(un)lockall failed: $!\n";
3389 }; 3554 };
3390 warn $@ if $@; 3555 warn $@ if $@;
3391 } 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;
3392} 3587}
3393 3588
3394sub 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
3395 # we must not ever block the main coroutine 3599 # we must not ever block the main coroutine
3396 local $Coro::idle = sub { 3600 local $Coro::idle = sub {
3397 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#
3398 (async { 3602 (async {
3399 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3603 $Coro::current->{desc} = "IDLE BUG HANDLER";
3400 EV::loop EV::LOOP_ONESHOT; 3604 EV::loop EV::LOOP_ONESHOT;
3401 })->prio (Coro::PRIO_MAX); 3605 })->prio (Coro::PRIO_MAX);
3402 }; 3606 };
3403 3607
3404 { 3608 evthread_start IO::AIO::poll_fileno;
3405 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;
3406 reload_config; 3620 reload_config;
3407 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
3408 load_extensions; 3631 load_extensions;
3409 3632
3410 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3633 utime time, time, $RUNTIMEFILE;
3411 evthread_start IO::AIO::poll_fileno; 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;
3412 } 3640 };
3413 3641
3414 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;
3415} 3646}
3416 3647
3417############################################################################# 3648#############################################################################
3418# initialisation and cleanup 3649# initialisation and cleanup
3419 3650
3420# install some emergency cleanup handlers 3651# install some emergency cleanup handlers
3421BEGIN { 3652BEGIN {
3422 our %SIGWATCHER = (); 3653 our %SIGWATCHER = ();
3423 for my $signal (qw(INT HUP TERM)) { 3654 for my $signal (qw(INT HUP TERM)) {
3424 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3655 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3425 cf::cleanup "SIG$signal"; 3656 cf::cleanup "SIG$signal";
3426 }; 3657 };
3427 } 3658 }
3428} 3659}
3429 3660
3430sub write_runtime_sync { 3661sub write_runtime_sync {
3431 my $runtime = "$LOCALDIR/runtime"; 3662 my $t0 = AE::time;
3432 3663
3433 # first touch the runtime file to show we are still running: 3664 # first touch the runtime file to show we are still running:
3434 # the fsync below can take a very very long time. 3665 # the fsync below can take a very very long time.
3435 3666
3436 IO::AIO::aio_utime $runtime, undef, undef; 3667 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3437 3668
3438 my $guard = cf::lock_acquire "write_runtime"; 3669 my $guard = cf::lock_acquire "write_runtime";
3439 3670
3440 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3671 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3441 or return; 3672 or return;
3442 3673
3443 my $value = $cf::RUNTIME + 90 + 10; 3674 my $value = $cf::RUNTIME + 90 + 10;
3444 # 10 is the runtime save interval, for a monotonic clock 3675 # 10 is the runtime save interval, for a monotonic clock
3445 # 60 allows for the watchdog to kill the server. 3676 # 60 allows for the watchdog to kill the server.
3455 aio_utime $fh, undef, undef; 3686 aio_utime $fh, undef, undef;
3456 3687
3457 close $fh 3688 close $fh
3458 or return; 3689 or return;
3459 3690
3460 aio_rename "$runtime~", $runtime 3691 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3461 and return; 3692 and return;
3462 3693
3463 warn "runtime file written.\n"; 3694 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3464 3695
3465 1 3696 1
3466} 3697}
3467 3698
3468our $uuid_lock; 3699our $uuid_lock;
3477 my $uuid = "$LOCALDIR/uuid"; 3708 my $uuid = "$LOCALDIR/uuid";
3478 3709
3479 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3710 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3480 or return; 3711 or return;
3481 3712
3482 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;
3483 $uuid_skip = 0; 3721 $uuid_skip = 0;
3484 3722
3485 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3723 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3486 and return; 3724 and return;
3487 3725
3493 or return; 3731 or return;
3494 3732
3495 aio_rename "$uuid~", $uuid 3733 aio_rename "$uuid~", $uuid
3496 and return; 3734 and return;
3497 3735
3498 warn "uuid file written ($value).\n"; 3736 trace "uuid file written ($value).\n";
3499 3737
3500 1 3738 1
3501 3739
3502} 3740}
3503 3741
3509} 3747}
3510 3748
3511sub emergency_save() { 3749sub emergency_save() {
3512 my $freeze_guard = cf::freeze_mainloop; 3750 my $freeze_guard = cf::freeze_mainloop;
3513 3751
3514 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;
3515 3758
3516 cf::sync_job { 3759 cf::sync_job {
3760 cf::write_runtime_sync; # external watchdog should not bark
3761
3517 # use a peculiar iteration method to avoid tripping on perl 3762 # use a peculiar iteration method to avoid tripping on perl
3518 # refcount bugs in for. also avoids problems with players 3763 # refcount bugs in for. also avoids problems with players
3519 # and maps saved/destroyed asynchronously. 3764 # and maps saved/destroyed asynchronously.
3520 warn "begin emergency player save\n"; 3765 info "emergency_perl_save: begin player save\n";
3521 for my $login (keys %cf::PLAYER) { 3766 for my $login (keys %cf::PLAYER) {
3522 my $pl = $cf::PLAYER{$login} or next; 3767 my $pl = $cf::PLAYER{$login} or next;
3523 $pl->valid or next; 3768 $pl->valid or next;
3524 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3769 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3525 $pl->save; 3770 $pl->save;
3526 } 3771 }
3527 warn "end emergency player save\n"; 3772 info "emergency_perl_save: end player save\n";
3528 3773
3529 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";
3530 for my $path (keys %cf::MAP) { 3777 for my $path (keys %cf::MAP) {
3531 my $map = $cf::MAP{$path} or next; 3778 my $map = $cf::MAP{$path} or next;
3532 $map->valid or next; 3779 $map->valid or next;
3533 $map->save; 3780 $map->save;
3534 } 3781 }
3535 warn "end emergency map save\n"; 3782 info "emergency_perl_save: end map save\n";
3536 3783
3537 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";
3538 BDB::db_env_txn_checkpoint $DB_ENV; 3787 BDB::db_env_txn_checkpoint $DB_ENV;
3539 warn "end emergency database checkpoint\n"; 3788 info "emergency_perl_save: end database checkpoint\n";
3540 3789
3541 warn "begin write uuid\n"; 3790 info "emergency_perl_save: begin write uuid\n";
3542 write_uuid_sync 1; 3791 write_uuid_sync 1;
3543 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
3544 }; 3812 };
3545 3813
3546 warn "leave emergency perl save\n"; 3814 info "emergency_perl_save: leave\n";
3547} 3815}
3548 3816
3549sub post_cleanup { 3817sub post_cleanup {
3550 my ($make_core) = @_; 3818 my ($make_core) = @_;
3551 3819
3820 IO::AIO::flush;
3821
3552 warn Carp::longmess "post_cleanup backtrace" 3822 error Carp::longmess "post_cleanup backtrace"
3553 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 }
3554} 3852}
3555 3853
3556sub do_reload_perl() { 3854sub do_reload_perl() {
3557 # can/must only be called in main 3855 # can/must only be called in main
3558 if ($Coro::current != $Coro::main) { 3856 if (in_main) {
3559 warn "can only reload from main coroutine"; 3857 error "can only reload from main coroutine";
3560 return; 3858 return;
3561 } 3859 }
3562 3860
3861 return if $RELOAD++;
3862
3863 my $t1 = AE::time;
3864
3865 while ($RELOAD) {
3563 warn "reloading..."; 3866 info "reloading...";
3564 3867
3565 warn "entering sync_job"; 3868 trace "entering sync_job";
3566 3869
3567 cf::sync_job { 3870 cf::sync_job {
3568 cf::write_runtime_sync; # external watchdog should not bark
3569 cf::emergency_save; 3871 cf::emergency_save;
3570 cf::write_runtime_sync; # external watchdog should not bark
3571 3872
3572 warn "syncing database to disk";
3573 BDB::db_env_txn_checkpoint $DB_ENV;
3574
3575 # if anything goes wrong in here, we should simply crash as we already saved
3576
3577 warn "flushing outstanding aio requests";
3578 for (;;) {
3579 BDB::flush;
3580 IO::AIO::flush;
3581 Coro::cede_notself;
3582 last unless IO::AIO::nreqs || BDB::nreqs;
3583 warn "iterate...";
3584 }
3585
3586 ++$RELOAD;
3587
3588 warn "cancelling all extension coros"; 3873 trace "cancelling all extension coros";
3589 $_->cancel for values %EXT_CORO; 3874 $_->cancel for values %EXT_CORO;
3590 %EXT_CORO = (); 3875 %EXT_CORO = ();
3591 3876
3592 warn "removing commands"; 3877 trace "removing commands";
3593 %COMMAND = (); 3878 %COMMAND = ();
3594 3879
3595 warn "removing ext/exti commands"; 3880 trace "removing ext/exti commands";
3596 %EXTCMD = (); 3881 %EXTCMD = ();
3597 %EXTICMD = (); 3882 %EXTICMD = ();
3598 3883
3599 warn "unloading/nuking all extensions"; 3884 trace "unloading/nuking all extensions";
3600 for my $pkg (@EXTS) { 3885 for my $pkg (@EXTS) {
3601 warn "... unloading $pkg"; 3886 trace "... unloading $pkg";
3602 3887
3603 if (my $cb = $pkg->can ("unload")) { 3888 if (my $cb = $pkg->can ("unload")) {
3604 eval { 3889 eval {
3605 $cb->($pkg); 3890 $cb->($pkg);
3606 1 3891 1
3607 } 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;
3608 } 3897 }
3609 3898
3610 warn "... nuking $pkg";
3611 Symbol::delete_package $pkg;
3612 }
3613
3614 warn "unloading all perl modules loaded from $LIBDIR"; 3899 trace "unloading all perl modules loaded from $LIBDIR";
3615 while (my ($k, $v) = each %INC) { 3900 while (my ($k, $v) = each %INC) {
3616 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3901 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3617 3902
3618 warn "... unloading $k"; 3903 trace "... unloading $k";
3619 delete $INC{$k}; 3904 delete $INC{$k};
3620 3905
3621 $k =~ s/\.pm$//; 3906 $k =~ s/\.pm$//;
3622 $k =~ s/\//::/g; 3907 $k =~ s/\//::/g;
3623 3908
3624 if (my $cb = $k->can ("unload_module")) { 3909 if (my $cb = $k->can ("unload_module")) {
3625 $cb->(); 3910 $cb->();
3911 }
3912
3913 clear_package $k;
3626 } 3914 }
3627 3915
3628 Symbol::delete_package $k;
3629 }
3630
3631 warn "getting rid of safe::, as good as possible"; 3916 trace "getting rid of safe::, as good as possible";
3632 Symbol::delete_package "safe::$_" 3917 clear_package "safe::$_"
3633 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);
3634 3919
3635 warn "unloading cf.pm \"a bit\""; 3920 trace "unloading cf.pm \"a bit\"";
3636 delete $INC{"cf.pm"}; 3921 delete $INC{"cf.pm"};
3637 delete $INC{"cf/pod.pm"}; 3922 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3638 3923
3639 # don't, removes xs symbols, too, 3924 # don't, removes xs symbols, too,
3640 # and global variables created in xs 3925 # and global variables created in xs
3641 #Symbol::delete_package __PACKAGE__; 3926 #clear_package __PACKAGE__;
3642 3927
3643 warn "unload completed, starting to reload now"; 3928 info "unload completed, starting to reload now";
3644 3929
3645 warn "reloading cf.pm"; 3930 trace "reloading cf.pm";
3646 require cf; 3931 require cf;
3647 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3932 cf::_connect_to_perl_1;
3648 3933
3649 warn "loading config and database again"; 3934 trace "loading config and database again";
3650 cf::reload_config; 3935 cf::reload_config;
3651 3936
3652 warn "loading extensions"; 3937 trace "loading extensions";
3653 cf::load_extensions; 3938 cf::load_extensions;
3654 3939
3940 if ($REATTACH_ON_RELOAD) {
3655 warn "reattaching attachments to objects/players"; 3941 trace "reattaching attachments to objects/players";
3656 _global_reattach; # objects, sockets 3942 _global_reattach; # objects, sockets
3657 warn "reattaching attachments to maps"; 3943 trace "reattaching attachments to maps";
3658 reattach $_ for values %MAP; 3944 reattach $_ for values %MAP;
3659 warn "reattaching attachments to players"; 3945 trace "reattaching attachments to players";
3660 reattach $_ for values %PLAYER; 3946 reattach $_ for values %PLAYER;
3947 }
3661 3948
3949 trace "running post_init jobs";
3950 (pop @POST_INIT)->(1) while @POST_INIT;
3951
3662 warn "leaving sync_job"; 3952 trace "leaving sync_job";
3663 3953
3664 1 3954 1
3665 } or do { 3955 } or do {
3666 warn $@; 3956 error $@;
3667 cf::cleanup "error while reloading, exiting."; 3957 cf::cleanup "error while reloading, exiting.";
3958 };
3959
3960 info "reloaded";
3961 --$RELOAD;
3668 }; 3962 }
3669 3963
3670 warn "reloaded"; 3964 $t1 = AE::time - $t1;
3965 info "reload completed in ${t1}s\n";
3671}; 3966};
3672 3967
3673our $RELOAD_WATCHER; # used only during reload 3968our $RELOAD_WATCHER; # used only during reload
3674 3969
3675sub reload_perl() { 3970sub reload_perl() {
3676 # doing reload synchronously and two reloads happen back-to-back, 3971 # doing reload synchronously and two reloads happen back-to-back,
3677 # coro crashes during coro_state_free->destroy here. 3972 # coro crashes during coro_state_free->destroy here.
3678 3973
3974 $RELOAD_WATCHER ||= cf::async {
3975 Coro::AIO::aio_wait cache_extensions;
3976
3679 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3977 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3680 do_reload_perl; 3978 do_reload_perl;
3681 undef $RELOAD_WATCHER; 3979 undef $RELOAD_WATCHER;
3980 };
3682 }; 3981 };
3683} 3982}
3684 3983
3685register_command "reload" => sub { 3984register_command "reload" => sub {
3686 my ($who, $arg) = @_; 3985 my ($who, $arg) = @_;
3700 3999
3701our @WAIT_FOR_TICK; 4000our @WAIT_FOR_TICK;
3702our @WAIT_FOR_TICK_BEGIN; 4001our @WAIT_FOR_TICK_BEGIN;
3703 4002
3704sub wait_for_tick { 4003sub wait_for_tick {
3705 return if tick_inhibit || $Coro::current == $Coro::main; 4004 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3706 4005
3707 my $signal = new Coro::Signal; 4006 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK, $signal; 4007 push @WAIT_FOR_TICK, $signal;
3709 $signal->wait; 4008 $signal->wait;
3710} 4009}
3711 4010
3712sub wait_for_tick_begin { 4011sub wait_for_tick_begin {
3713 return if tick_inhibit || $Coro::current == $Coro::main; 4012 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3714 4013
3715 my $signal = new Coro::Signal; 4014 my $signal = new Coro::Signal;
3716 push @WAIT_FOR_TICK_BEGIN, $signal; 4015 push @WAIT_FOR_TICK_BEGIN, $signal;
3717 $signal->wait; 4016 $signal->wait;
3718} 4017}
3724 return; 4023 return;
3725 } 4024 }
3726 4025
3727 cf::server_tick; # one server iteration 4026 cf::server_tick; # one server iteration
3728 4027
4028 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4029
3729 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4030 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3730 $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.;
3731 Coro::async_pool { 4032 Coro::async_pool {
3732 $Coro::current->{desc} = "runtime saver"; 4033 $Coro::current->{desc} = "runtime saver";
3733 write_runtime_sync 4034 write_runtime_sync
3734 or warn "ERROR: unable to write runtime file: $!"; 4035 or error "ERROR: unable to write runtime file: $!";
3735 }; 4036 };
3736 } 4037 }
3737 4038
3738 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4039 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3739 $sig->send; 4040 $sig->send;
3747 4048
3748 if (0) { 4049 if (0) {
3749 if ($NEXT_TICK) { 4050 if ($NEXT_TICK) {
3750 my $jitter = $TICK_START - $NEXT_TICK; 4051 my $jitter = $TICK_START - $NEXT_TICK;
3751 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4052 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3752 warn "jitter $JITTER\n";#d# 4053 debug "jitter $JITTER\n";#d#
3753 } 4054 }
3754 } 4055 }
3755} 4056}
3756 4057
3757{ 4058{
3758 # configure BDB 4059 # configure BDB
3759 4060
3760 BDB::min_parallel 8; 4061 BDB::min_parallel 16;
3761 BDB::max_poll_reqs $TICK * 0.1; 4062 BDB::max_poll_reqs $TICK * 0.1;
3762 $Coro::BDB::WATCHER->priority (1); 4063 $AnyEvent::BDB::WATCHER->priority (1);
3763 4064
3764 unless ($DB_ENV) { 4065 unless ($DB_ENV) {
3765 $DB_ENV = BDB::db_env_create; 4066 $DB_ENV = BDB::db_env_create;
3766 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4067 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3767 | BDB::LOG_AUTOREMOVE, 1); 4068 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4069 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3768 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4070 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3769 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4071 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3770 4072
3771 cf::sync_job { 4073 cf::sync_job {
3772 eval { 4074 eval {
3798{ 4100{
3799 # configure IO::AIO 4101 # configure IO::AIO
3800 4102
3801 IO::AIO::min_parallel 8; 4103 IO::AIO::min_parallel 8;
3802 IO::AIO::max_poll_time $TICK * 0.1; 4104 IO::AIO::max_poll_time $TICK * 0.1;
3803 $Coro::AIO::WATCHER->priority (1); 4105 undef $AnyEvent::AIO::WATCHER;
3804} 4106}
3805 4107
3806my $_log_backtrace; 4108my $_log_backtrace;
3807 4109
3808sub _log_backtrace { 4110sub _log_backtrace {
3811 $msg =~ s/\n//; 4113 $msg =~ s/\n//;
3812 4114
3813 # limit the # of concurrent backtraces 4115 # limit the # of concurrent backtraces
3814 if ($_log_backtrace < 2) { 4116 if ($_log_backtrace < 2) {
3815 ++$_log_backtrace; 4117 ++$_log_backtrace;
4118 my $perl_bt = Carp::longmess $msg;
3816 async { 4119 async {
3817 $Coro::current->{desc} = "abt $msg"; 4120 $Coro::current->{desc} = "abt $msg";
3818 4121
3819 my @bt = fork_call { 4122 my @bt = fork_call {
3820 @addr = map { sprintf "%x", $_ } @addr; 4123 @addr = map { sprintf "%x", $_ } @addr;
3831 } 4134 }
3832 4135
3833 @funcs 4136 @funcs
3834 }; 4137 };
3835 4138
3836 LOG llevInfo, "[ABT] $msg\n"; 4139 LOG llevInfo, "[ABT] $perl_bt\n";
4140 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3837 LOG llevInfo, "[ABT] $_\n" for @bt; 4141 LOG llevInfo, "[ABT] $_\n" for @bt;
3838 --$_log_backtrace; 4142 --$_log_backtrace;
3839 }; 4143 };
3840 } else { 4144 } else {
3841 LOG llevInfo, "[ABT] $msg\n"; 4145 LOG llevInfo, "[ABT] $msg\n";
3842 LOG llevInfo, "[ABT] [suppressed]\n"; 4146 LOG llevInfo, "[ABT] [suppressed]\n";
3843 } 4147 }
3844} 4148}
3845 4149
3846# load additional modules 4150# load additional modules
3847use cf::pod; 4151require "cf/$_.pm" for @EXTRA_MODULES;
4152cf::_connect_to_perl_2;
3848 4153
3849END { cf::emergency_save } 4154END { cf::emergency_save }
3850 4155
38511 41561
3852 4157

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines