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.362 by root, Mon Sep 10 12:44:06 2007 UTC vs.
Revision 1.474 by root, Thu Jul 16 21:42:56 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict qw(vars subs);
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5; 56use Digest::MD5;
30use Fcntl; 57use Fcntl;
31use YAML::Syck (); 58use YAML ();
32use IO::AIO 2.32 (); 59use IO::AIO ();
33use Time::HiRes; 60use Time::HiRes;
34use Compress::LZF; 61use Compress::LZF;
35use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
36 65
37# configure various modules to our taste 66# configure various modules to our taste
38# 67#
39$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 76
43$Event::Eval = 1; # no idea why this is required, but it is 77# strictly for debugging
44 78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 79
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 81
52our %COMMAND = (); 82our %COMMAND = ();
53our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
56our %EXTCMD = (); 86our %EXTCMD = ();
57our %EXTICMD = (); 87our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
60 90
61our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 92our @EVENT;
63 93
64our $CONFDIR = confdir; 94our $CONFDIR = confdir;
65our $DATADIR = datadir; 95our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 96our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 97our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 98our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 99our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 100our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 102our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 103our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 104our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime";
107
108our %RESOURCE;
75 109
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 112our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
83 114
115our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 117our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 118our $DB_ENV;
119
120our @EXTRA_MODULES = qw(pod mapscript);
86 121
87our %CFG; 122our %CFG;
88 123
89our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 125our $RUNTIME;
126our $NOW;
91 127
92our (%PLAYER, %PLAYER_LOADING); # all users 128our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 129our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 130our $LINK_MAP; # the special {link} map, which is always available
95 131
96# used to convert map paths into valid unix filenames by replacing / by ∕ 132# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 133our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 134
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
137our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
139
140our @POST_INIT;
141
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
102 144
103binmode STDOUT; 145binmode STDOUT;
104binmode STDERR; 146binmode STDERR;
105 147
106# read virtual server time, if available 148# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 150 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
111} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
112 156
113mkdir $_ 157mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 159
116our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
159 203
160The raw value load value from the last tick. 204The raw value load value from the last tick.
161 205
162=item %cf::CFG 206=item %cf::CFG
163 207
164Configuration for the server, loaded from C</etc/crossfire/config>, or 208Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 209from wherever your confdir points to.
166 210
167=item cf::wait_for_tick, cf::wait_for_tick_begin 211=item cf::wait_for_tick, cf::wait_for_tick_begin
168 212
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 213These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 235
192 LOG llevError, $msg; 236 LOG llevError, $msg;
193 }; 237 };
194} 238}
239
240$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "=="
242
243 if ($Coro::current == $Coro::main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d#
246 }#d#
247
248 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate
251};
252
253$SIG{__DIE__} = sub { }; #d#?
195 254
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 265for my $pkg (qw(
207 cf::global cf::attachable 266 cf::global cf::attachable
208 cf::object cf::object::player 267 cf::object cf::object::player
209 cf::client cf::player 268 cf::client cf::player
210 cf::arch cf::living 269 cf::arch cf::living
270 cf::map cf::mapspace
211 cf::map cf::party cf::region 271 cf::party cf::region
212)) { 272)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 274}
216 275
217$Event::DIED = sub { 276$EV::DIED = sub {
218 warn "error in event callback: @_"; 277 warn "error in event callback: @_";
219}; 278};
220 279
221############################################################################# 280#############################################################################
222 281
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 304 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 305 $d
247 } || "[unable to dump $_[0]: '$@']"; 306 } || "[unable to dump $_[0]: '$@']";
248} 307}
249 308
250=item $ref = cf::from_json $json 309=item $ref = cf::decode_json $json
251 310
252Converts a JSON string into the corresponding perl data structure. 311Converts a JSON string into the corresponding perl data structure.
253 312
254=item $json = cf::to_json $ref 313=item $json = cf::encode_json $ref
255 314
256Converts a perl data structure into its JSON representation. 315Converts a perl data structure into its JSON representation.
257 316
258=cut 317=cut
259 318
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 320
262sub to_json ($) { $json_coder->encode ($_[0]) } 321sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 322sub decode_json($) { $json_coder->decode ($_[0]) }
323
324=item cf::post_init { BLOCK }
325
326Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again.
328
329The cdoeblock will have a single boolean argument to indicate whether this
330is a reload or not.
331
332=cut
333
334sub post_init(&) {
335 push @POST_INIT, shift;
336}
264 337
265=item cf::lock_wait $string 338=item cf::lock_wait $string
266 339
267Wait until the given lock is available. See cf::lock_acquire. 340Wait until the given lock is available. See cf::lock_acquire.
268 341
269=item my $lock = cf::lock_acquire $string 342=item my $lock = cf::lock_acquire $string
270 343
271Wait until the given lock is available and then acquires it and returns 344Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 345a L<Guard> object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 346for example when the coroutine gets canceled), the lock is automatically
274returned. 347returned.
275 348
276Locks are *not* recursive, locking from the same coro twice results in a 349Locks are *not* recursive, locking from the same coro twice results in a
277deadlocked coro. 350deadlocked coro.
283 356
284Return true if the lock is currently active, i.e. somebody has locked it. 357Return true if the lock is currently active, i.e. somebody has locked it.
285 358
286=cut 359=cut
287 360
288our %LOCK; 361our $LOCKS = new Coro::SemaphoreSet;
289our %LOCKER;#d#
290 362
291sub lock_wait($) { 363sub lock_wait($) {
292 my ($key) = @_; 364 $LOCKS->wait ($_[0]);
293
294 if ($LOCKER{$key} == $Coro::current) {#d#
295 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
296 return;#d#
297 }#d#
298
299 # wait for lock, if any
300 while ($LOCK{$key}) {
301 push @{ $LOCK{$key} }, $Coro::current;
302 Coro::schedule;
303 }
304} 365}
305 366
306sub lock_acquire($) { 367sub lock_acquire($) {
307 my ($key) = @_; 368 $LOCKS->guard ($_[0])
308
309 # wait, to be sure we are not locked
310 lock_wait $key;
311
312 $LOCK{$key} = [];
313 $LOCKER{$key} = $Coro::current;#d#
314
315 Coro::guard {
316 delete $LOCKER{$key};#d#
317 # wake up all waiters, to be on the safe side
318 $_->ready for @{ delete $LOCK{$key} };
319 }
320} 369}
321 370
322sub lock_active($) { 371sub lock_active($) {
323 my ($key) = @_; 372 $LOCKS->count ($_[0]) < 1
324
325 ! ! $LOCK{$key}
326} 373}
327 374
328sub freeze_mainloop { 375sub freeze_mainloop {
329 return unless $TICK_WATCHER->is_active; 376 tick_inhibit_inc;
330 377
331 my $guard = Coro::guard { 378 &Guard::guard (\&tick_inhibit_dec);
332 $TICK_WATCHER->start; 379}
333 }; 380
334 $TICK_WATCHER->stop; 381=item cf::periodic $interval, $cb
335 $guard 382
383Like EV::periodic, but randomly selects a starting point so that the actions
384get spread over timer.
385
386=cut
387
388sub periodic($$) {
389 my ($interval, $cb) = @_;
390
391 my $start = rand List::Util::min 180, $interval;
392
393 EV::periodic $start, $interval, 0, $cb
336} 394}
337 395
338=item cf::get_slot $time[, $priority[, $name]] 396=item cf::get_slot $time[, $priority[, $name]]
339 397
340Allocate $time seconds of blocking CPU time at priority C<$priority>: 398Allocate $time seconds of blocking CPU time at priority C<$priority>:
351our @SLOT_QUEUE; 409our @SLOT_QUEUE;
352our $SLOT_QUEUE; 410our $SLOT_QUEUE;
353 411
354$SLOT_QUEUE->cancel if $SLOT_QUEUE; 412$SLOT_QUEUE->cancel if $SLOT_QUEUE;
355$SLOT_QUEUE = Coro::async { 413$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager");
415
356 my $signal = new Coro::Signal; 416 my $signal = new Coro::Signal;
357 417
358 while () { 418 while () {
359 next_job: 419 next_job:
360 my $avail = cf::till_tick; 420 my $avail = cf::till_tick;
368 } 428 }
369 } 429 }
370 } 430 }
371 431
372 if (@SLOT_QUEUE) { 432 if (@SLOT_QUEUE) {
373 # we do not use wait_For_tick() as it returns immediately when tick is inactive 433 # we do not use wait_for_tick() as it returns immediately when tick is inactive
374 push @cf::WAIT_FOR_TICK, $signal; 434 push @cf::WAIT_FOR_TICK, $signal;
375 $signal->wait; 435 $signal->wait;
376 } else { 436 } else {
377 Coro::schedule; 437 Coro::schedule;
378 } 438 }
379 } 439 }
380}; 440};
381 441
382sub get_slot($;$$) { 442sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main;
444
383 my ($time, $pri, $name) = @_; 445 my ($time, $pri, $name) = @_;
384 446
385 $time = $TICK * .6 if $time > $TICK * .6; 447 $time = $TICK * .6 if $time > $TICK * .6;
386 my $sig = new Coro::Signal; 448 my $sig = new Coro::Signal;
387 449
401 463
402BEGIN { *async = \&Coro::async_pool } 464BEGIN { *async = \&Coro::async_pool }
403 465
404=item cf::sync_job { BLOCK } 466=item cf::sync_job { BLOCK }
405 467
406The design of Crossfire TRT requires that the main coroutine ($Coro::main) 468The design of Deliantra requires that the main coroutine ($Coro::main)
407is always able to handle events or runnable, as Crossfire TRT is only 469is always able to handle events or runnable, as Deliantra is only
408partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 470partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
409acceptable. 471acceptable.
410 472
411If it must be done, put the blocking parts into C<sync_job>. This will run 473If it must be done, put the blocking parts into C<sync_job>. This will run
412the given BLOCK in another coroutine while waiting for the result. The 474the given BLOCK in another coroutine while waiting for the result. The
417 479
418sub sync_job(&) { 480sub sync_job(&) {
419 my ($job) = @_; 481 my ($job) = @_;
420 482
421 if ($Coro::current == $Coro::main) { 483 if ($Coro::current == $Coro::main) {
422 my $time = Event::time; 484 my $time = EV::time;
423 485
424 # this is the main coro, too bad, we have to block 486 # this is the main coro, too bad, we have to block
425 # till the operation succeeds, freezing the server :/ 487 # till the operation succeeds, freezing the server :/
426 488
427 # TODO: use suspend/resume instead 489 LOG llevError, Carp::longmess "sync job";#d#
428 # (but this is cancel-safe) 490
429 my $freeze_guard = freeze_mainloop; 491 my $freeze_guard = freeze_mainloop;
430 492
431 my $busy = 1; 493 my $busy = 1;
432 my @res; 494 my @res;
433 495
434 (async { 496 (async {
497 $Coro::current->desc ("sync job coro");
435 @res = eval { $job->() }; 498 @res = eval { $job->() };
436 warn $@ if $@; 499 warn $@ if $@;
437 undef $busy; 500 undef $busy;
438 })->prio (Coro::PRIO_MAX); 501 })->prio (Coro::PRIO_MAX);
439 502
440 while ($busy) { 503 while ($busy) {
441 Coro::cede or Event::one_event; 504 if (Coro::nready) {
505 Coro::cede_notself;
506 } else {
507 EV::loop EV::LOOP_ONESHOT;
442 } 508 }
509 }
443 510
444 $time = Event::time - $time; 511 my $time = EV::time - $time;
445 512
446 LOG llevError | logBacktrace, Carp::longmess "long sync job"
447 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
448
449 $tick_start += $time; # do not account sync jobs to server load 513 $TICK_START += $time; # do not account sync jobs to server load
450 514
451 wantarray ? @res : $res[0] 515 wantarray ? @res : $res[0]
452 } else { 516 } else {
453 # we are in another coroutine, how wonderful, everything just works 517 # we are in another coroutine, how wonderful, everything just works
454 518
479=item fork_call { }, $args 543=item fork_call { }, $args
480 544
481Executes the given code block with the given arguments in a seperate 545Executes the given code block with the given arguments in a seperate
482process, returning the results. Everything must be serialisable with 546process, returning the results. Everything must be serialisable with
483Coro::Storable. May, of course, block. Note that the executed sub may 547Coro::Storable. May, of course, block. Note that the executed sub may
484never block itself or use any form of Event handling. 548never block itself or use any form of event handling.
485 549
486=cut 550=cut
487 551
488sub fork_call(&@) { 552sub fork_call(&@) {
489 my ($cb, @args) = @_; 553 my ($cb, @args) = @_;
498 }, @args; 562 }, @args;
499 563
500 wantarray ? @res : $res[-1] 564 wantarray ? @res : $res[-1]
501} 565}
502 566
567=item $coin = coin_from_name $name
568
569=cut
570
571our %coin_alias = (
572 "silver" => "silvercoin",
573 "silvercoin" => "silvercoin",
574 "silvercoins" => "silvercoin",
575 "gold" => "goldcoin",
576 "goldcoin" => "goldcoin",
577 "goldcoins" => "goldcoin",
578 "platinum" => "platinacoin",
579 "platinumcoin" => "platinacoin",
580 "platinumcoins" => "platinacoin",
581 "platina" => "platinacoin",
582 "platinacoin" => "platinacoin",
583 "platinacoins" => "platinacoin",
584 "royalty" => "royalty",
585 "royalties" => "royalty",
586);
587
588sub coin_from_name($) {
589 $coin_alias{$_[0]}
590 ? cf::arch::find $coin_alias{$_[0]}
591 : undef
592}
593
503=item $value = cf::db_get $family => $key 594=item $value = cf::db_get $family => $key
504 595
505Returns a single value from the environment database. 596Returns a single value from the environment database.
506 597
507=item cf::db_put $family => $key => $value 598=item cf::db_put $family => $key => $value
508 599
509Stores the given C<$value> in the family. It can currently store binary 600Stores the given C<$value> in the family. It can currently store binary
510data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 601data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
511 602
603=item $db = cf::db_table "name"
604
605Create and/or open a new database table. The string must not be "db" and must be unique
606within each server.
607
512=cut 608=cut
609
610sub db_table($) {
611 my ($name) = @_;
612 my $db = BDB::db_create $DB_ENV;
613
614 eval {
615 $db->set_flags (BDB::CHKSUM);
616
617 utf8::encode $name;
618 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
619 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
620 cf::cleanup "db_open(db): $!" if $!;
621 };
622 cf::cleanup "db_open(db): $@" if $@;
623
624 $db
625}
513 626
514our $DB; 627our $DB;
515 628
516sub db_init { 629sub db_init {
517 unless ($DB) {
518 $DB = BDB::db_create $DB_ENV;
519
520 cf::sync_job { 630 cf::sync_job {
521 eval { 631 $DB ||= db_table "db";
522 $DB->set_flags (BDB::CHKSUM);
523
524 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
525 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
526 cf::cleanup "db_open(db): $!" if $!;
527 };
528 cf::cleanup "db_open(db): $@" if $@;
529 };
530 } 632 };
531} 633}
532 634
533sub db_get($$) { 635sub db_get($$) {
534 my $key = "$_[0]/$_[1]"; 636 my $key = "$_[0]/$_[1]";
535 637
633 735
634############################################################################# 736#############################################################################
635 737
636=head2 ATTACHABLE OBJECTS 738=head2 ATTACHABLE OBJECTS
637 739
638Many objects in crossfire are so-called attachable objects. That means you can 740Many objects in deliantra are so-called attachable objects. That means you can
639attach callbacks/event handlers (a collection of which is called an "attachment") 741attach callbacks/event handlers (a collection of which is called an "attachment")
640to it. All such attachable objects support the following methods. 742to it. All such attachable objects support the following methods.
641 743
642In the following description, CLASS can be any of C<global>, C<object> 744In the following description, CLASS can be any of C<global>, C<object>
643C<player>, C<client> or C<map> (i.e. the attachable objects in 745C<player>, C<client> or C<map> (i.e. the attachable objects in
644Crossfire TRT). 746Deliantra).
645 747
646=over 4 748=over 4
647 749
648=item $attachable->attach ($attachment, key => $value...) 750=item $attachable->attach ($attachment, key => $value...)
649 751
693=item cf::CLASS::attachment $name, ... 795=item cf::CLASS::attachment $name, ...
694 796
695Register an attachment by C<$name> through which attachable objects of the 797Register an attachment by C<$name> through which attachable objects of the
696given CLASS can refer to this attachment. 798given CLASS can refer to this attachment.
697 799
698Some classes such as crossfire maps and objects can specify attachments 800Some classes such as deliantra maps and objects can specify attachments
699that are attached at load/instantiate time, thus the need for a name. 801that are attached at load/instantiate time, thus the need for a name.
700 802
701These calls expect any number of the following handler/hook descriptions: 803These calls expect any number of the following handler/hook descriptions:
702 804
703=over 4 805=over 4
931 } 1033 }
932 1034
933 0 1035 0
934} 1036}
935 1037
936=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1038=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
937 1039
938=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1040=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
939 1041
940Generate an object-specific event with the given arguments. 1042Generate an object-specific event with the given arguments.
941 1043
947 1049
948=cut 1050=cut
949 1051
950############################################################################# 1052#############################################################################
951# object support 1053# object support
952#
953 1054
1055sub _object_equal($$);
1056sub _object_equal($$) {
1057 my ($a, $b) = @_;
1058
1059 return 0 unless (ref $a) eq (ref $b);
1060
1061 if ("HASH" eq ref $a) {
1062 my @ka = keys %$a;
1063 my @kb = keys %$b;
1064
1065 return 0 if @ka != @kb;
1066
1067 for (0 .. $#ka) {
1068 return 0 unless $ka[$_] eq $kb[$_];
1069 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1070 }
1071
1072 } elsif ("ARRAY" eq ref $a) {
1073
1074 return 0 if @$a != @$b;
1075
1076 for (0 .. $#$a) {
1077 return 0 unless _object_equal $a->[$_], $b->[$_];
1078 }
1079
1080 } elsif ($a ne $b) {
1081 return 0;
1082 }
1083
1084 1
1085}
1086
1087our $SLOW_MERGES;#d#
954sub _can_merge { 1088sub _can_merge {
955 my ($ob1, $ob2) = @_; 1089 my ($ob1, $ob2) = @_;
956 1090
957 local $Storable::canonical = 1; 1091 ++$SLOW_MERGES;#d#
958 my $fob1 = Storable::freeze $ob1;
959 my $fob2 = Storable::freeze $ob2;
960 1092
961 $fob1 eq $fob2 1093 # we do the slow way here
1094 return _object_equal $ob1, $ob2
962} 1095}
963 1096
964sub reattach { 1097sub reattach {
965 # basically do the same as instantiate, without calling instantiate 1098 # basically do the same as instantiate, without calling instantiate
966 my ($obj) = @_; 1099 my ($obj) = @_;
967 1100
1101 # no longer needed after getting rid of delete_package?
968 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1102 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
969 1103
970 my $registry = $obj->registry; 1104 my $registry = $obj->registry;
971 1105
972 @$registry = (); 1106 @$registry = ();
973 1107
988cf::attachable->attach ( 1122cf::attachable->attach (
989 prio => -1000000, 1123 prio => -1000000,
990 on_instantiate => sub { 1124 on_instantiate => sub {
991 my ($obj, $data) = @_; 1125 my ($obj, $data) = @_;
992 1126
993 $data = from_json $data; 1127 $data = decode_json $data;
994 1128
995 for (@$data) { 1129 for (@$data) {
996 my ($name, $args) = @$_; 1130 my ($name, $args) = @$_;
997 1131
998 $obj->attach ($name, %{$args || {} }); 1132 $obj->attach ($name, %{$args || {} });
1011 }, 1145 },
1012); 1146);
1013 1147
1014sub object_freezer_save { 1148sub object_freezer_save {
1015 my ($filename, $rdata, $objs) = @_; 1149 my ($filename, $rdata, $objs) = @_;
1016
1017 my $guard = cf::lock_acquire "io";
1018 1150
1019 sync_job { 1151 sync_job {
1020 if (length $$rdata) { 1152 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename); 1153 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1154 warn sprintf "saving %s (%d,%d)\n",
1023 $decname, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
1024 1156
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1158 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1160 if ($cf::USE_FSYNC) {
1161 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;
1162 aio_fsync $fh;
1163 }
1029 close $fh; 1164 aio_close $fh;
1030 1165
1031 if (@$objs) { 1166 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1167 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1168 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1171 if ($cf::USE_FSYNC) {
1172 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;
1173 aio_fsync $fh;
1174 }
1037 close $fh; 1175 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1177 }
1040 } else { 1178 } else {
1041 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1042 } 1180 }
1043 1181
1044 aio_rename "$filename~", $filename; 1182 aio_rename "$filename~", $filename;
1183
1184 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC;
1045 } else { 1186 } else {
1046 warn "FATAL: $filename~: $!\n"; 1187 warn "unable to save objects: $filename~: $!\n";
1047 } 1188 }
1048 } else { 1189 } else {
1049 aio_unlink $filename; 1190 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1051 } 1192 }
1052 }; 1193 };
1053
1054 undef $guard;
1055} 1194}
1056 1195
1057sub object_freezer_as_string { 1196sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1197 my ($rdata, $objs) = @_;
1059 1198
1064 1203
1065sub object_thawer_load { 1204sub object_thawer_load {
1066 my ($filename) = @_; 1205 my ($filename) = @_;
1067 1206
1068 my ($data, $av); 1207 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1208
1072 (aio_load $filename, $data) >= 0 1209 (aio_load $filename, $data) >= 0
1073 or return; 1210 or return;
1074 1211
1075 unless (aio_stat "$filename.pst") { 1212 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1213 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1214 or return;
1078 1215
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1216 my $st = eval { Coro::Storable::thaw $av };
1217 $av = $st->{objs};
1081 } 1218 }
1082 1219
1083 utf8::decode (my $decname = $filename); 1220 utf8::decode (my $decname = $filename);
1084 warn sprintf "loading %s (%d,%d)\n", 1221 warn sprintf "loading %s (%d,%d)\n",
1085 $decname, length $data, scalar @{$av || []}; 1222 $decname, length $data, scalar @{$av || []};
1146 my ($name, $cb) = @_; 1283 my ($name, $cb) = @_;
1147 1284
1148 $EXTICMD{$name} = $cb; 1285 $EXTICMD{$name} = $cb;
1149} 1286}
1150 1287
1288use File::Glob ();
1289
1151cf::player->attach ( 1290cf::player->attach (
1152 on_command => sub { 1291 on_command => sub {
1153 my ($pl, $name, $params) = @_; 1292 my ($pl, $name, $params) = @_;
1154 1293
1155 my $cb = $COMMAND{$name} 1294 my $cb = $COMMAND{$name}
1187 1326
1188 cf::override; 1327 cf::override;
1189 }, 1328 },
1190); 1329);
1191 1330
1331# "readahead" all extensions
1332sub cache_extensions {
1333 my $grp = IO::AIO::aio_group;
1334
1335 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1336 for (grep /\.ext$/, @{$_[0]}) {
1337 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1338 }
1339 };
1340
1341 $grp
1342}
1343
1192sub load_extensions { 1344sub load_extensions {
1193 cf::sync_job { 1345 cf::sync_job {
1194 my %todo; 1346 my %todo;
1195 1347
1196 for my $path (<$LIBDIR/*.ext>) { 1348 for my $path (<$LIBDIR/*.ext>) {
1215 1367
1216 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1217 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1218 1370
1219 $ext{source} = 1371 $ext{source} =
1220 "package $pkg; use strict; use utf8;\n" 1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1221 . "#line 1 \"$path\"\n{\n" 1373 . "#line 1 \"$path\"\n{\n"
1222 . $source 1374 . $source
1223 . "\n};\n1"; 1375 . "\n};\n1";
1224 1376
1225 $todo{$base} = \%ext; 1377 $todo{$base} = \%ext;
1241 my $msg = $@ ? "$v->{path}: $@\n" 1393 my $msg = $@ ? "$v->{path}: $@\n"
1242 : "$v->{base}: extension inactive.\n"; 1394 : "$v->{base}: extension inactive.\n";
1243 1395
1244 if (exists $v->{meta}{mandatory}) { 1396 if (exists $v->{meta}{mandatory}) {
1245 warn $msg; 1397 warn $msg;
1246 warn "mandatory extension failed to load, exiting.\n"; 1398 cf::cleanup "mandatory extension failed to load, exiting.";
1247 exit 1;
1248 } 1399 }
1249 1400
1250 warn $msg; 1401 warn $msg;
1251 } 1402 }
1252 1403
1266 1417
1267=back 1418=back
1268 1419
1269=head2 CORE EXTENSIONS 1420=head2 CORE EXTENSIONS
1270 1421
1271Functions and methods that extend core crossfire objects. 1422Functions and methods that extend core deliantra objects.
1272 1423
1273=cut 1424=cut
1274 1425
1275package cf::player; 1426package cf::player;
1276 1427
1319 1470
1320sub exists($) { 1471sub exists($) {
1321 my ($login) = @_; 1472 my ($login) = @_;
1322 1473
1323 $cf::PLAYER{$login} 1474 $cf::PLAYER{$login}
1324 or cf::sync_job { !aio_stat path $login } 1475 or !aio_stat path $login
1325} 1476}
1326 1477
1327sub find($) { 1478sub find($) {
1328 return $cf::PLAYER{$_[0]} || do { 1479 return $cf::PLAYER{$_[0]} || do {
1329 my $login = $_[0]; 1480 my $login = $_[0];
1339 aio_unlink +(playerdir $login) . "/$login.pl"; 1490 aio_unlink +(playerdir $login) . "/$login.pl";
1340 1491
1341 my $f = new_from_file cf::object::thawer path $login 1492 my $f = new_from_file cf::object::thawer path $login
1342 or return; 1493 or return;
1343 1494
1344 $f->next;
1345 my $pl = cf::player::load_pl $f 1495 my $pl = cf::player::load_pl $f
1346 or return; 1496 or return;
1497
1347 local $cf::PLAYER_LOADING{$login} = $pl; 1498 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs; 1499 $f->resolve_delayed_derefs;
1349 $cf::PLAYER{$login} = $pl 1500 $cf::PLAYER{$login} = $pl
1350 } 1501 }
1351 } 1502 }
1361 1512
1362 return if $pl->{deny_save}; 1513 return if $pl->{deny_save};
1363 1514
1364 aio_mkdir playerdir $pl, 0770; 1515 aio_mkdir playerdir $pl, 0770;
1365 $pl->{last_save} = $cf::RUNTIME; 1516 $pl->{last_save} = $cf::RUNTIME;
1517
1518 cf::get_slot 0.01;
1366 1519
1367 $pl->save_pl ($path); 1520 $pl->save_pl ($path);
1368 cf::cede_to_tick; 1521 cf::cede_to_tick;
1369} 1522}
1370 1523
1402 my ($pl) = @_; 1555 my ($pl) = @_;
1403 1556
1404 my $name = $pl->ob->name; 1557 my $name = $pl->ob->name;
1405 1558
1406 $pl->{deny_save} = 1; 1559 $pl->{deny_save} = 1;
1407 $pl->password ("*"); # this should lock out the player until we nuked the dir 1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1408 1561
1409 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1410 $pl->deactivate; 1563 $pl->deactivate;
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score;
1411 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1566 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1412 $pl->ns->destroy if $pl->ns; 1567 $pl->ns->destroy if $pl->ns;
1413 1568
1414 my $path = playerdir $pl; 1569 my $path = playerdir $pl;
1415 my $temp = "$path~$cf::RUNTIME~deleting~"; 1570 my $temp = "$path~$cf::RUNTIME~deleting~";
1454 1609
1455 for my $login (@$dirs) { 1610 for my $login (@$dirs) {
1456 my $path = path $login; 1611 my $path = path $login;
1457 1612
1458 # a .pst is a dead give-away for a valid player 1613 # a .pst is a dead give-away for a valid player
1459 unless (-e "$path.pst") { 1614 # if no pst file found, open and chekc for blocked users
1615 if (aio_stat "$path.pst") {
1460 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1616 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1461 aio_read $fh, 0, 512, my $buf, 0 or next; 1617 aio_read $fh, 0, 512, my $buf, 0 or next;
1462 $buf !~ /^password -------------$/m or next; # official not-valid tag 1618 $buf !~ /^password -------------$/m or next; # official not-valid tag
1463 } 1619 }
1464 1620
1495 } 1651 }
1496 1652
1497 \@paths 1653 \@paths
1498} 1654}
1499 1655
1500=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1656=item $protocol_xml = $player->expand_cfpod ($cfpod)
1501 1657
1502Expand crossfire pod fragments into protocol xml. 1658Expand deliantra pod fragments into protocol xml.
1503
1504=cut
1505
1506sub expand_cfpod {
1507 ((my $self), (local $_)) = @_;
1508
1509 # escape & and <
1510 s/&/&amp;/g;
1511 s/(?<![BIUGHT])</&lt;/g;
1512
1513 # this is buggy, it needs to properly take care of nested <'s
1514
1515 1 while
1516 # replace B<>, I<>, U<> etc.
1517 s/B<([^\>]*)>/<b>$1<\/b>/
1518 || s/I<([^\>]*)>/<i>$1<\/i>/
1519 || s/U<([^\>]*)>/<u>$1<\/u>/
1520 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1521 # replace G<male|female> tags
1522 || s{G<([^>|]*)\|([^>]*)>}{
1523 $self->gender ? $2 : $1
1524 }ge
1525 # replace H<hint text>
1526 || s{H<([^\>]*)>}
1527 {
1528 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1529 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1530 "")
1531 [$self->{hintmode}]
1532 }ge;
1533
1534 # create single paragraphs (very hackish)
1535 s/(?<=\S)\n(?=\w)/ /g;
1536
1537 # compress some whitespace
1538 s/\s+\n/\n/g; # ws line-ends
1539 s/\n\n+/\n/g; # double lines
1540 s/^\n+//; # beginning lines
1541 s/\n+$//; # ending lines
1542
1543 $_
1544}
1545
1546sub hintmode {
1547 $_[0]{hintmode} = $_[1] if @_ > 1;
1548 $_[0]{hintmode}
1549}
1550 1659
1551=item $player->ext_reply ($msgid, @msg) 1660=item $player->ext_reply ($msgid, @msg)
1552 1661
1553Sends an ext reply to the player. 1662Sends an ext reply to the player.
1554 1663
1621our $MAX_RESET = 3600; 1730our $MAX_RESET = 3600;
1622our $DEFAULT_RESET = 3000; 1731our $DEFAULT_RESET = 3000;
1623 1732
1624sub generate_random_map { 1733sub generate_random_map {
1625 my ($self, $rmp) = @_; 1734 my ($self, $rmp) = @_;
1735
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737
1626 # mit "rum" bekleckern, nicht 1738 # mit "rum" bekleckern, nicht
1627 $self->_create_random_map ( 1739 $self->_create_random_map (
1628 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1629 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1630 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1752 1864
1753# the temporary/swap location 1865# the temporary/swap location
1754sub save_path { 1866sub save_path {
1755 my ($self) = @_; 1867 my ($self) = @_;
1756 1868
1757 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1758 "$TMPDIR/$path.map" 1870 "$TMPDIR/$path.map"
1759} 1871}
1760 1872
1761# the unique path, undef == no special unique path 1873# the unique path, undef == no special unique path
1762sub uniq_path { 1874sub uniq_path {
1763 my ($self) = @_; 1875 my ($self) = @_;
1764 1876
1765 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1766 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1767}
1768
1769# and all this just because we cannot iterate over
1770# all maps in C++...
1771sub change_all_map_light {
1772 my ($change) = @_;
1773
1774 $_->change_map_light ($change)
1775 for grep $_->outdoor, values %cf::MAP;
1776} 1879}
1777 1880
1778sub decay_objects { 1881sub decay_objects {
1779 my ($self) = @_; 1882 my ($self) = @_;
1780 1883
1864sub find { 1967sub find {
1865 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1866 1969
1867 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1868 1971
1869 cf::lock_wait "map_data:$path";#d#remove 1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1870 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1871 1974
1872 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1873 my $guard1 = cf::lock_acquire "map_find:$path";
1874 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1875
1876 my $map = new_from_path cf::map $path 1976 my $map = new_from_path cf::map $path
1877 or return; 1977 or return;
1878 1978
1879 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
1880 1980
1882 or return; 1982 or return;
1883 1983
1884 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1984 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1885 # doing this can freeze the server in a sync job, obviously 1985 # doing this can freeze the server in a sync job, obviously
1886 #$cf::WAIT_FOR_TICK->wait; 1986 #$cf::WAIT_FOR_TICK->wait;
1987 undef $guard2;
1887 undef $guard1; 1988 undef $guard1;
1888 undef $guard2;
1889 $map->reset; 1989 $map->reset;
1890 return find $path; 1990 return find $path;
1891 } 1991 }
1892 1992
1893 $cf::MAP{$path} = $map 1993 $cf::MAP{$path} = $map
1920 my $f = new_from_file cf::object::thawer $self->{load_path}; 2020 my $f = new_from_file cf::object::thawer $self->{load_path};
1921 $f->skip_block; 2021 $f->skip_block;
1922 $self->_load_objects ($f) 2022 $self->_load_objects ($f)
1923 or return; 2023 or return;
1924 2024
1925 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2025 $self->post_load_original
1926 if delete $self->{load_original}; 2026 if delete $self->{load_original};
1927 2027
1928 if (my $uniq = $self->uniq_path) { 2028 if (my $uniq = $self->uniq_path) {
1929 utf8::encode $uniq; 2029 utf8::encode $uniq;
1930 unless (aio_stat $uniq) { 2030 unless (aio_stat $uniq) {
1948 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
1949 $self->decay_objects; 2049 $self->decay_objects;
1950 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
1951 $self->update_buttons; 2051 $self->update_buttons;
1952 cf::cede_to_tick; 2052 cf::cede_to_tick;
1953 $self->set_darkness_map;
1954 cf::cede_to_tick;
1955 $self->activate; 2053 $self->activate;
1956 } 2054 }
1957 2055
1958 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
1959 $self->last_access ($cf::RUNTIME); 2057 $self->last_access ($cf::RUNTIME);
1960 2058
1961 $self->in_memory (cf::MAP_IN_MEMORY); 2059 $self->in_memory (cf::MAP_ACTIVE);
1962 } 2060 }
1963 2061
1964 $self->post_load; 2062 $self->post_load;
1965} 2063}
1966 2064
2024 my ($path, $origin, $load) = @_; 2122 my ($path, $origin, $load) = @_;
2025 2123
2026 $path = normalise $path, $origin && $origin->{path}; 2124 $path = normalise $path, $origin && $origin->{path};
2027 2125
2028 if (my $map = $cf::MAP{$path}) { 2126 if (my $map = $cf::MAP{$path}) {
2029 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2127 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2030 } 2128 }
2031 2129
2032 $MAP_PREFETCH{$path} |= $load; 2130 $MAP_PREFETCH{$path} |= $load;
2033 2131
2034 $MAP_PREFETCHER ||= cf::async { 2132 $MAP_PREFETCHER ||= cf::async {
2133 $Coro::current->{desc} = "map prefetcher";
2134
2035 while (%MAP_PREFETCH) { 2135 while (%MAP_PREFETCH) {
2036 while (my ($k, $v) = each %MAP_PREFETCH) { 2136 while (my ($k, $v) = each %MAP_PREFETCH) {
2037 if (my $map = find $k) { 2137 if (my $map = find $k) {
2038 $map->load if $v; 2138 $map->load if $v;
2039 } 2139 }
2065 return if $self->{deny_save}; 2165 return if $self->{deny_save};
2066 2166
2067 local $self->{last_access} = $self->last_access;#d# 2167 local $self->{last_access} = $self->last_access;#d#
2068 2168
2069 cf::async { 2169 cf::async {
2170 $Coro::current->{desc} = "map player save";
2070 $_->contr->save for $self->players; 2171 $_->contr->save for $self->players;
2071 }; 2172 };
2173
2174 cf::get_slot 0.02;
2072 2175
2073 if ($uniq) { 2176 if ($uniq) {
2074 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2075 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2178 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2076 } else { 2179 } else {
2085 $self->save; 2188 $self->save;
2086 2189
2087 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2088 2191
2089 return if $self->players; 2192 return if $self->players;
2090 return if $self->in_memory != cf::MAP_IN_MEMORY; 2193 return if $self->in_memory != cf::MAP_ACTIVE;
2091 return if $self->{deny_save}; 2194 return if $self->{deny_save};
2092 2195
2093 $self->in_memory (cf::MAP_SWAPPED); 2196 $self->in_memory (cf::MAP_SWAPPED);
2094 2197
2095 $self->deactivate; 2198 $self->deactivate;
2213 2316
2214sub unique_maps() { 2317sub unique_maps() {
2215 [ 2318 [
2216 map { 2319 map {
2217 utf8::decode $_; 2320 utf8::decode $_;
2218 /\.map$/ 2321 s/\.map$//; # TODO future compatibility hack
2322 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2323 ? ()
2219 ? normalise $_ 2324 : normalise $_
2220 : ()
2221 } @{ aio_readdir $UNIQUEDIR or [] } 2325 } @{ aio_readdir $UNIQUEDIR or [] }
2222 ] 2326 ]
2223} 2327}
2224 2328
2225package cf;
2226
2227=back 2329=back
2228 2330
2229=head3 cf::object 2331=head3 cf::object
2230 2332
2231=cut 2333=cut
2234 2336
2235=over 4 2337=over 4
2236 2338
2237=item $ob->inv_recursive 2339=item $ob->inv_recursive
2238 2340
2239Returns the inventory of the object _and_ their inventories, recursively. 2341Returns the inventory of the object I<and> their inventories, recursively,
2342but I<not> the object itself.
2240 2343
2241=cut 2344=cut
2242 2345
2243sub inv_recursive_; 2346sub inv_recursive_;
2244sub inv_recursive_ { 2347sub inv_recursive_ {
2249 inv_recursive_ inv $_[0] 2352 inv_recursive_ inv $_[0]
2250} 2353}
2251 2354
2252=item $ref = $ob->ref 2355=item $ref = $ob->ref
2253 2356
2254creates and returns a persistent reference to an objetc that can be stored as a string. 2357Creates and returns a persistent reference to an object that can be stored as a string.
2255 2358
2256=item $ob = cf::object::deref ($refstring) 2359=item $ob = cf::object::deref ($refstring)
2257 2360
2258returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2361returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2259even if the object actually exists. May block. 2362even if the object actually exists. May block.
2261=cut 2364=cut
2262 2365
2263sub deref { 2366sub deref {
2264 my ($ref) = @_; 2367 my ($ref) = @_;
2265 2368
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2369 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2); 2370 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2371 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return; 2372 or return;
2273 $pl->ob->uuid eq $uuid 2373 $pl->ob->uuid eq $uuid
2274 or return; 2374 or return;
2294can be C<undef>. Does the right thing when the player is currently in a 2394can be C<undef>. Does the right thing when the player is currently in a
2295dialogue with the given NPC character. 2395dialogue with the given NPC character.
2296 2396
2297=cut 2397=cut
2298 2398
2399our $SAY_CHANNEL = {
2400 id => "say",
2401 title => "Map",
2402 reply => "say ",
2403 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2404};
2405
2406our $CHAT_CHANNEL = {
2407 id => "chat",
2408 title => "Chat",
2409 reply => "chat ",
2410 tooltip => "Player chat and shouts, global to the server.",
2411};
2412
2299# rough implementation of a future "reply" method that works 2413# rough implementation of a future "reply" method that works
2300# with dialog boxes. 2414# with dialog boxes.
2301#TODO: the first argument must go, split into a $npc->reply_to ( method 2415#TODO: the first argument must go, split into a $npc->reply_to ( method
2302sub cf::object::player::reply($$$;$) { 2416sub cf::object::player::reply($$$;$) {
2303 my ($self, $npc, $msg, $flags) = @_; 2417 my ($self, $npc, $msg, $flags) = @_;
2314 my $dialog = $pl->{npc_dialog}; 2428 my $dialog = $pl->{npc_dialog};
2315 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2429 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2316 2430
2317 } else { 2431 } else {
2318 $msg = $npc->name . " says: $msg" if $npc; 2432 $msg = $npc->name . " says: $msg" if $npc;
2319 $self->message ($msg, $flags); 2433 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2320 } 2434 }
2321 } 2435 }
2322} 2436}
2323 2437
2324=item $object->send_msg ($channel, $msg, $color, [extra...]) 2438=item $object->send_msg ($channel, $msg, $color, [extra...])
2349 2463
2350=item $player_object->enter_link 2464=item $player_object->enter_link
2351 2465
2352Freezes the player and moves him/her to a special map (C<{link}>). 2466Freezes the player and moves him/her to a special map (C<{link}>).
2353 2467
2354The player should be reasonably safe there for short amounts of time. You 2468The player should be reasonably safe there for short amounts of time (e.g.
2355I<MUST> call C<leave_link> as soon as possible, though. 2469for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link
2471map.
2356 2472
2357Will never block. 2473Will never block.
2358 2474
2359=item $player_object->leave_link ($map, $x, $y) 2475=item $player_object->leave_link ($map, $x, $y)
2360 2476
2418 2534
2419 $map->load; 2535 $map->load;
2420 $map->load_neighbours; 2536 $map->load_neighbours;
2421 2537
2422 return unless $self->contr->active; 2538 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2423 $self->activate_recursive; 2540 $self->activate_recursive;
2424 2541
2425 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2426 $self->enter_map ($map, $x, $y); 2543 $self->enter_map ($map, $x, $y);
2427} 2544}
2432her, loading and preparing them map, calling the provided $check callback 2549her, loading and preparing them map, calling the provided $check callback
2433that has to return the map if sucecssful, and then unfreezes the player on 2550that has to return the map if sucecssful, and then unfreezes the player on
2434the new (success) or old (failed) map position. In either case, $done will 2551the new (success) or old (failed) map position. In either case, $done will
2435be called at the end of this process. 2552be called at the end of this process.
2436 2553
2554Note that $check will be called with a potentially non-loaded map, so if
2555it needs a loaded map it has to call C<< ->load >>.
2556
2437=cut 2557=cut
2438 2558
2439our $GOTOGEN; 2559our $GOTOGEN;
2440 2560
2441sub cf::object::player::goto { 2561sub cf::object::player::goto {
2445 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2565 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2446 2566
2447 $self->enter_link; 2567 $self->enter_link;
2448 2568
2449 (async { 2569 (async {
2570 $Coro::current->{desc} = "player::goto $path $x $y";
2571
2572 # *tag paths override both path and x|y
2573 if ($path =~ /^\*(.*)$/) {
2574 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2575 my $ob = $obs[rand @obs];
2576
2577 # see if we actually can go there
2578 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2579 $ob = $obs[rand @obs];
2580 } else {
2581 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2582 }
2583 # else put us there anyways for now #d#
2584
2585 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2586 } else {
2587 ($path, $x, $y) = (undef, undef, undef);
2588 }
2589 }
2590
2450 my $map = eval { 2591 my $map = eval {
2451 my $map = cf::map::find $path; 2592 my $map = defined $path ? cf::map::find $path : undef;
2452 2593
2453 if ($map) { 2594 if ($map) {
2454 $map = $map->customise_for ($self); 2595 $map = $map->customise_for ($self);
2455 $map = $check->($map) if $check && $map; 2596 $map = $check->($map) if $check && $map;
2456 } else { 2597 } else {
2457 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2598 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2458 } 2599 }
2459 2600
2460 $map 2601 $map
2461 }; 2602 };
2462 2603
2498} 2639}
2499 2640
2500sub prepare_random_map { 2641sub prepare_random_map {
2501 my ($exit) = @_; 2642 my ($exit) = @_;
2502 2643
2503 my $guard = cf::lock_acquire "exit_prepare:$exit";
2504
2505 # all this does is basically replace the /! path by 2644 # all this does is basically replace the /! path by
2506 # a new random map path (?random/...) with a seed 2645 # a new random map path (?random/...) with a seed
2507 # that depends on the exit object 2646 # that depends on the exit object
2508 2647
2509 my $rmp = parse_random_map_params $exit->msg; 2648 my $rmp = parse_random_map_params $exit->msg;
2511 if ($exit->map) { 2650 if ($exit->map) {
2512 $rmp->{region} = $exit->region->name; 2651 $rmp->{region} = $exit->region->name;
2513 $rmp->{origin_map} = $exit->map->path; 2652 $rmp->{origin_map} = $exit->map->path;
2514 $rmp->{origin_x} = $exit->x; 2653 $rmp->{origin_x} = $exit->x;
2515 $rmp->{origin_y} = $exit->y; 2654 $rmp->{origin_y} = $exit->y;
2655
2656 $exit->map->touch;
2516 } 2657 }
2517 2658
2518 $rmp->{random_seed} ||= $exit->random_seed; 2659 $rmp->{random_seed} ||= $exit->random_seed;
2519 2660
2520 my $data = cf::to_json $rmp; 2661 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2521 my $md5 = Digest::MD5::md5_hex $data; 2662 my $md5 = Digest::MD5::md5_hex $data;
2522 my $meta = "$RANDOMDIR/$md5.meta"; 2663 my $meta = "$RANDOMDIR/$md5.meta";
2523 2664
2524 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2665 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2525 aio_write $fh, 0, (length $data), $data, 0; 2666 aio_write $fh, 0, (length $data), $data, 0;
2526 undef $fh; 2667 undef $fh;
2527 aio_rename "$meta~", $meta; 2668 aio_rename "$meta~", $meta;
2528 2669
2670 my $slaying = "?random/$md5";
2671
2672 if ($exit->valid) {
2529 $exit->slaying ("?random/$md5"); 2673 $exit->slaying ("?random/$md5");
2530 $exit->msg (undef); 2674 $exit->msg (undef);
2675 }
2531 } 2676 }
2532} 2677}
2533 2678
2534sub cf::object::player::enter_exit { 2679sub cf::object::player::enter_exit {
2535 my ($self, $exit) = @_; 2680 my ($self, $exit) = @_;
2536 2681
2537 return unless $self->type == cf::PLAYER; 2682 return unless $self->type == cf::PLAYER;
2538 2683
2539 if ($exit->slaying eq "/!") {
2540 #TODO: this should de-fi-ni-te-ly not be a sync-job
2541 # the problem is that $exit might not survive long enough
2542 # so it needs to be done right now, right here
2543 cf::sync_job { prepare_random_map $exit };
2544 }
2545
2546 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2547 my $hp = $exit->stats->hp;
2548 my $sp = $exit->stats->sp;
2549
2550 $self->enter_link; 2684 $self->enter_link;
2551 2685
2552 # if exit is damned, update players death & WoR home-position
2553 $self->contr->savebed ($slaying, $hp, $sp)
2554 if $exit->flag (FLAG_DAMNED);
2555
2556 (async { 2686 (async {
2557 $self->deactivate_recursive; # just to be sure 2687 $Coro::current->{desc} = "enter_exit";
2688
2558 unless (eval { 2689 unless (eval {
2690 $self->deactivate_recursive; # just to be sure
2691
2692 # random map handling
2693 {
2694 my $guard = cf::lock_acquire "exit_prepare:$exit";
2695
2696 prepare_random_map $exit
2697 if $exit->slaying eq "/!";
2698 }
2699
2700 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2701 my $x = $exit->stats->hp;
2702 my $y = $exit->stats->sp;
2703
2559 $self->goto ($slaying, $hp, $sp); 2704 $self->goto ($map, $x, $y);
2560 2705
2706 # if exit is damned, update players death & WoR home-position
2707 $self->contr->savebed ($map, $x, $y)
2708 if $exit->flag (cf::FLAG_DAMNED);
2709
2561 1; 2710 1
2562 }) { 2711 }) {
2563 $self->message ("Something went wrong deep within the crossfire server. " 2712 $self->message ("Something went wrong deep within the deliantra server. "
2564 . "I'll try to bring you back to the map you were before. " 2713 . "I'll try to bring you back to the map you were before. "
2565 . "Please report this to the dungeon master!", 2714 . "Please report this to the dungeon master!",
2566 cf::NDI_UNIQUE | cf::NDI_RED); 2715 cf::NDI_UNIQUE | cf::NDI_RED);
2567 2716
2568 warn "ERROR in enter_exit: $@"; 2717 warn "ERROR in enter_exit: $@";
2596the message, with C<log> being the default. If C<$color> is negative, suppress 2745the message, with C<log> being the default. If C<$color> is negative, suppress
2597the message unless the client supports the msg packet. 2746the message unless the client supports the msg packet.
2598 2747
2599=cut 2748=cut
2600 2749
2750# non-persistent channels (usually the info channel)
2601our %CHANNEL = ( 2751our %CHANNEL = (
2602 "c/identify" => { 2752 "c/identify" => {
2603 id => "identify", 2753 id => "infobox",
2604 title => "Identify", 2754 title => "Identify",
2605 reply => undef, 2755 reply => undef,
2606 tooltip => "Items recently identified", 2756 tooltip => "Items recently identified",
2607 }, 2757 },
2608 "c/examine" => { 2758 "c/examine" => {
2609 id => "examine", 2759 id => "infobox",
2610 title => "Examine", 2760 title => "Examine",
2611 reply => undef, 2761 reply => undef,
2612 tooltip => "Signs and other items you examined", 2762 tooltip => "Signs and other items you examined",
2613 }, 2763 },
2764 "c/book" => {
2765 id => "infobox",
2766 title => "Book",
2767 reply => undef,
2768 tooltip => "The contents of a note or book",
2769 },
2770 "c/lookat" => {
2771 id => "infobox",
2772 title => "Look",
2773 reply => undef,
2774 tooltip => "What you saw there",
2775 },
2776 "c/who" => {
2777 id => "infobox",
2778 title => "Players",
2779 reply => undef,
2780 tooltip => "Shows players who are currently online",
2781 },
2782 "c/body" => {
2783 id => "infobox",
2784 title => "Body Parts",
2785 reply => undef,
2786 tooltip => "Shows which body parts you posess and are available",
2787 },
2788 "c/statistics" => {
2789 id => "infobox",
2790 title => "Statistics",
2791 reply => undef,
2792 tooltip => "Shows your primary statistics",
2793 },
2794 "c/skills" => {
2795 id => "infobox",
2796 title => "Skills",
2797 reply => undef,
2798 tooltip => "Shows your experience per skill and item power",
2799 },
2800 "c/shopitems" => {
2801 id => "infobox",
2802 title => "Shop Items",
2803 reply => undef,
2804 tooltip => "Shows the items currently for sale in this shop",
2805 },
2806 "c/resistances" => {
2807 id => "infobox",
2808 title => "Resistances",
2809 reply => undef,
2810 tooltip => "Shows your resistances",
2811 },
2812 "c/pets" => {
2813 id => "infobox",
2814 title => "Pets",
2815 reply => undef,
2816 tooltip => "Shows information abotu your pets/a specific pet",
2817 },
2818 "c/perceiveself" => {
2819 id => "infobox",
2820 title => "Perceive Self",
2821 reply => undef,
2822 tooltip => "You gained detailed knowledge about yourself",
2823 },
2824 "c/uptime" => {
2825 id => "infobox",
2826 title => "Uptime",
2827 reply => undef,
2828 tooltip => "How long the server has been running since last restart",
2829 },
2830 "c/mapinfo" => {
2831 id => "infobox",
2832 title => "Map Info",
2833 reply => undef,
2834 tooltip => "Information related to the maps",
2835 },
2836 "c/party" => {
2837 id => "party",
2838 title => "Party",
2839 reply => "gsay ",
2840 tooltip => "Messages and chat related to your party",
2841 },
2842 "c/death" => {
2843 id => "death",
2844 title => "Death",
2845 reply => undef,
2846 tooltip => "Reason for and more info about your most recent death",
2847 },
2848 "c/say" => $SAY_CHANNEL,
2849 "c/chat" => $CHAT_CHANNEL,
2614); 2850);
2615 2851
2616sub cf::client::send_msg { 2852sub cf::client::send_msg {
2617 my ($self, $channel, $msg, $color, @extra) = @_; 2853 my ($self, $channel, $msg, $color, @extra) = @_;
2618 2854
2619 $msg = $self->pl->expand_cfpod ($msg); 2855 $msg = $self->pl->expand_cfpod ($msg)
2856 unless $color & cf::NDI_VERBATIM;
2620 2857
2621 $color &= cf::NDI_CLIENT_MASK; # just in case... 2858 $color &= cf::NDI_CLIENT_MASK; # just in case...
2622 2859
2623 # check predefined channels, for the benefit of C 2860 # check predefined channels, for the benefit of C
2624 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2861 if ($CHANNEL{$channel}) {
2862 $channel = $CHANNEL{$channel};
2625 2863
2864 $self->ext_msg (channel_info => $channel);
2865 $channel = $channel->{id};
2866
2626 if (ref $channel) { 2867 } elsif (ref $channel) {
2627 # send meta info to client, if not yet sent 2868 # send meta info to client, if not yet sent
2628 unless (exists $self->{channel}{$channel->{id}}) { 2869 unless (exists $self->{channel}{$channel->{id}}) {
2629 $self->{channel}{$channel->{id}} = $channel; 2870 $self->{channel}{$channel->{id}} = $channel;
2630 $self->ext_msg (channel_info => $channel) 2871 $self->ext_msg (channel_info => $channel);
2631 if $self->can_msg;
2632 } 2872 }
2633 2873
2634 $channel = $channel->{id}; 2874 $channel = $channel->{id};
2635 } 2875 }
2636 2876
2637 return unless @extra || length $msg; 2877 return unless @extra || length $msg;
2638 2878
2639 if ($self->can_msg) {
2640 # default colour, mask it out 2879 # default colour, mask it out
2641 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2642 if $color & cf::NDI_DEF; 2881 if $color & cf::NDI_DEF;
2643 2882
2644 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2883 my $pkt = "msg "
2884 . $self->{json_coder}->encode (
2645 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2646 } else { 2886 );
2647 if ($color >= 0) {
2648 # replace some tags by gcfclient-compatible ones
2649 for ($msg) {
2650 1 while
2651 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2652 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2653 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2654 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2655 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2656 }
2657 2887
2658 $color &= cf::NDI_COLOR_MASK; 2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2659 2891
2660 utf8::encode $msg; 2892 # split very large packets
2661 2893 if (8192 < length $pkt and $self->{can_lzf}) {
2662 if (0 && $msg =~ /\[/) { 2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2663 # COMMAND/INFO 2895 $pkt = "frag";
2664 $self->send_packet ("drawextinfo $color 10 8 $msg")
2665 } else {
2666 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2667 $self->send_packet ("drawinfo $color $msg")
2668 }
2669 }
2670 } 2896 }
2897
2898 $self->send_packet ($pkt);
2671} 2899}
2672 2900
2673=item $client->ext_msg ($type, @msg) 2901=item $client->ext_msg ($type, @msg)
2674 2902
2675Sends an ext event to the client. 2903Sends an ext event to the client.
2848=pod 3076=pod
2849 3077
2850The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
2851 3079
2852 cf::object 3080 cf::object
2853 contr pay_amount pay_player map x y force_find force_add 3081 contr pay_amount pay_player map x y force_find force_add destroy
2854 insert remove name archname title slaying race decrease_ob_nr 3082 insert remove name archname title slaying race decrease split
3083 value
2855 3084
2856 cf::object::player 3085 cf::object::player
2857 player 3086 player
2858 3087
2859 cf::player 3088 cf::player
2864 3093
2865=cut 3094=cut
2866 3095
2867for ( 3096for (
2868 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2869 insert remove inv name archname title slaying race 3098 insert remove inv nrof name archname title slaying race
2870 decrease_ob_nr)], 3099 decrease split destroy change_exp value msg lore send_msg)],
2871 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
2872 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
2873 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
2874) { 3103) {
2875 no strict 'refs'; 3104 no strict 'refs';
2876 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
2877 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2894 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
2895 3124
2896 my $qcode = $code; 3125 my $qcode = $code;
2897 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2898 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
2899 3130
2900 local $_; 3131 local $_;
2901 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
2902 3133
2903 my $eval = 3134 my $eval =
2980 { 3211 {
2981 my $faces = $facedata->{faceinfo}; 3212 my $faces = $facedata->{faceinfo};
2982 3213
2983 while (my ($face, $info) = each %$faces) { 3214 while (my ($face, $info) = each %$faces) {
2984 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3215 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216
2985 cf::face::set_visibility $idx, $info->{visibility}; 3217 cf::face::set_visibility $idx, $info->{visibility};
2986 cf::face::set_magicmap $idx, $info->{magicmap}; 3218 cf::face::set_magicmap $idx, $info->{magicmap};
2987 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2988 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2989 3221
2990 cf::cede_to_tick; 3222 cf::cede_to_tick;
2991 } 3223 }
2992 3224
2993 while (my ($face, $info) = each %$faces) { 3225 while (my ($face, $info) = each %$faces) {
2994 next unless $info->{smooth}; 3226 next unless $info->{smooth};
3227
2995 my $idx = cf::face::find $face 3228 my $idx = cf::face::find $face
2996 or next; 3229 or next;
3230
2997 if (my $smooth = cf::face::find $info->{smooth}) { 3231 if (my $smooth = cf::face::find $info->{smooth}) {
2998 cf::face::set_smooth $idx, $smooth; 3232 cf::face::set_smooth $idx, $smooth;
2999 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3233 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3000 } else { 3234 } else {
3001 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3235 warn "smooth face '$info->{smooth}' not found for face '$face'";
3019 { 3253 {
3020 # TODO: for gcfclient pleasure, we should give resources 3254 # TODO: for gcfclient pleasure, we should give resources
3021 # that gcfclient doesn't grok a >10000 face index. 3255 # that gcfclient doesn't grok a >10000 face index.
3022 my $res = $facedata->{resource}; 3256 my $res = $facedata->{resource};
3023 3257
3024 my $soundconf = delete $res->{"res/sound.conf"};
3025
3026 while (my ($name, $info) = each %$res) { 3258 while (my ($name, $info) = each %$res) {
3259 if (defined $info->{type}) {
3027 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3260 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3028 my $data; 3261 my $data;
3029 3262
3030 if ($info->{type} & 1) { 3263 if ($info->{type} & 1) {
3031 # prepend meta info 3264 # prepend meta info
3032 3265
3033 my $meta = $enc->encode ({ 3266 my $meta = $enc->encode ({
3034 name => $name, 3267 name => $name,
3035 %{ $info->{meta} || {} }, 3268 %{ $info->{meta} || {} },
3036 }); 3269 });
3037 3270
3038 $data = pack "(w/a*)*", $meta, $info->{data}; 3271 $data = pack "(w/a*)*", $meta, $info->{data};
3272 } else {
3273 $data = $info->{data};
3274 }
3275
3276 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277 cf::face::set_type $idx, $info->{type};
3039 } else { 3278 } else {
3040 $data = $info->{data}; 3279 $RESOURCE{$name} = $info;
3041 } 3280 }
3042 3281
3043 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3044 cf::face::set_type $idx, $info->{type};
3045
3046 cf::cede_to_tick; 3282 cf::cede_to_tick;
3047 } 3283 }
3048
3049 if ($soundconf) {
3050 $soundconf = $enc->decode (delete $soundconf->{data});
3051
3052 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3053 my $sound = $soundconf->{compat}[$_]
3054 or next;
3055
3056 my $face = cf::face::find "sound/$sound->[1]";
3057 cf::sound::set $sound->[0] => $face;
3058 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3059 }
3060
3061 while (my ($k, $v) = each %{$soundconf->{event}}) {
3062 my $face = cf::face::find "sound/$v";
3063 cf::sound::set $k => $face;
3064 }
3065 }
3066 } 3284 }
3285
3286 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3067 3287
3068 1 3288 1
3069} 3289}
3290
3291cf::global->attach (on_resource_update => sub {
3292 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3293 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3294
3295 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3296 my $sound = $soundconf->{compat}[$_]
3297 or next;
3298
3299 my $face = cf::face::find "sound/$sound->[1]";
3300 cf::sound::set $sound->[0] => $face;
3301 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3302 }
3303
3304 while (my ($k, $v) = each %{$soundconf->{event}}) {
3305 my $face = cf::face::find "sound/$v";
3306 cf::sound::set $k => $face;
3307 }
3308 }
3309});
3070 3310
3071register_exticmd fx_want => sub { 3311register_exticmd fx_want => sub {
3072 my ($ns, $want) = @_; 3312 my ($ns, $want) = @_;
3073 3313
3074 while (my ($k, $v) = each %$want) { 3314 while (my ($k, $v) = each %$want) {
3075 $ns->fx_want ($k, $v); 3315 $ns->fx_want ($k, $v);
3076 } 3316 }
3077}; 3317};
3318
3319sub load_resource_file($) {
3320 my $guard = lock_acquire "load_resource_file";
3321
3322 my $status = load_resource_file_ $_[0];
3323 get_slot 0.1, 100;
3324 cf::arch::commit_load;
3325
3326 $status
3327}
3078 3328
3079sub reload_regions { 3329sub reload_regions {
3080 # HACK to clear player env face cache, we need some signal framework 3330 # HACK to clear player env face cache, we need some signal framework
3081 # for this (global event?) 3331 # for this (global event?)
3082 %ext::player_env::MUSIC_FACE_CACHE = (); 3332 %ext::player_env::MUSIC_FACE_CACHE = ();
3096} 3346}
3097 3347
3098sub reload_archetypes { 3348sub reload_archetypes {
3099 load_resource_file "$DATADIR/archetypes" 3349 load_resource_file "$DATADIR/archetypes"
3100 or die "unable to load archetypes\n"; 3350 or die "unable to load archetypes\n";
3101 #d# NEED to laod twice to resolve forward references
3102 # this really needs to be done in an extra post-pass
3103 # (which needs to be synchronous, so solve it differently)
3104 load_resource_file "$DATADIR/archetypes"
3105 or die "unable to load archetypes\n";
3106} 3351}
3107 3352
3108sub reload_treasures { 3353sub reload_treasures {
3109 load_resource_file "$DATADIR/treasures" 3354 load_resource_file "$DATADIR/treasures"
3110 or die "unable to load treasurelists\n"; 3355 or die "unable to load treasurelists\n";
3111} 3356}
3112 3357
3113sub reload_resources { 3358sub reload_resources {
3114 warn "reloading resource files...\n"; 3359 warn "reloading resource files...\n";
3115 3360
3361 reload_facedata;
3362 reload_archetypes;
3116 reload_regions; 3363 reload_regions;
3117 reload_facedata;
3118 #reload_archetypes;#d#
3119 reload_archetypes;
3120 reload_treasures; 3364 reload_treasures;
3121 3365
3122 warn "finished reloading resource files\n"; 3366 warn "finished reloading resource files\n";
3123}
3124
3125sub init {
3126 reload_resources;
3127} 3367}
3128 3368
3129sub reload_config { 3369sub reload_config {
3130 open my $fh, "<:utf8", "$CONFDIR/config" 3370 open my $fh, "<:utf8", "$CONFDIR/config"
3131 or return; 3371 or return;
3132 3372
3133 local $/; 3373 local $/;
3134 *CFG = YAML::Syck::Load <$fh>; 3374 *CFG = YAML::Load <$fh>;
3135 3375
3136 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3137 3377
3138 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3378 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3139 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3379 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3145 }; 3385 };
3146 warn $@ if $@; 3386 warn $@ if $@;
3147 } 3387 }
3148} 3388}
3149 3389
3390sub pidfile() {
3391 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3392 or die "$PIDFILE: $!";
3393 flock $fh, &Fcntl::LOCK_EX
3394 or die "$PIDFILE: flock: $!";
3395 $fh
3396}
3397
3398# make sure only one server instance is running at any one time
3399sub atomic {
3400 my $fh = pidfile;
3401
3402 my $pid = <$fh>;
3403 kill 9, $pid if $pid > 0;
3404
3405 seek $fh, 0, 0;
3406 print $fh $$;
3407}
3408
3409sub main_loop {
3410 warn "EV::loop starting\n";
3411 if (1) {
3412 EV::loop;
3413 }
3414 warn "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP;
3416}
3417
3150sub main { 3418sub main {
3419 cf::init_globals; # initialise logging
3420
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430
3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432
3151 # we must not ever block the main coroutine 3433 # we must not ever block the main coroutine
3152 local $Coro::idle = sub { 3434 local $Coro::idle = sub {
3153 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3435 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3154 (async { 3436 (async {
3155 Event::one_event; 3437 $Coro::current->{desc} = "IDLE BUG HANDLER";
3438 EV::loop EV::LOOP_ONESHOT;
3156 })->prio (Coro::PRIO_MAX); 3439 })->prio (Coro::PRIO_MAX);
3157 }; 3440 };
3158 3441
3442 evthread_start IO::AIO::poll_fileno;
3443
3444 cf::sync_job {
3445 reload_resources;
3159 reload_config; 3446 reload_config;
3160 db_init; 3447 db_init;
3448
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid;
3452 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills;
3455
3456 cf::init_beforeplay;
3457
3458 atomic;
3459
3161 load_extensions; 3460 load_extensions;
3162 3461
3163 $TICK_WATCHER->start; 3462 utime time, time, $RUNTIMEFILE;
3164 Event::loop; 3463
3464 # no (long-running) fork's whatsoever before this point(!)
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466
3467 (pop @POST_INIT)->(0) while @POST_INIT;
3468 };
3469
3470 main_loop;
3165} 3471}
3166 3472
3167############################################################################# 3473#############################################################################
3168# initialisation and cleanup 3474# initialisation and cleanup
3169 3475
3170# install some emergency cleanup handlers 3476# install some emergency cleanup handlers
3171BEGIN { 3477BEGIN {
3478 our %SIGWATCHER = ();
3172 for my $signal (qw(INT HUP TERM)) { 3479 for my $signal (qw(INT HUP TERM)) {
3173 Event->signal ( 3480 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3174 reentrant => 0,
3175 data => WF_AUTOCANCEL,
3176 signal => $signal,
3177 prio => 0,
3178 cb => sub {
3179 cf::cleanup "SIG$signal"; 3481 cf::cleanup "SIG$signal";
3180 },
3181 ); 3482 };
3182 } 3483 }
3183} 3484}
3184 3485
3185sub write_runtime { 3486sub write_runtime_sync {
3186 my $runtime = "$LOCALDIR/runtime";
3187
3188 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
3189 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
3190 3489
3191 IO::AIO::aio_utime $runtime, undef, undef; 3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3192 3491
3193 my $guard = cf::lock_acquire "write_runtime"; 3492 my $guard = cf::lock_acquire "write_runtime";
3194 3493
3195 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3196 or return; 3495 or return;
3197 3496
3198 my $value = $cf::RUNTIME + 90 + 10; 3497 my $value = $cf::RUNTIME + 90 + 10;
3199 # 10 is the runtime save interval, for a monotonic clock 3498 # 10 is the runtime save interval, for a monotonic clock
3200 # 60 allows for the watchdog to kill the server. 3499 # 60 allows for the watchdog to kill the server.
3210 aio_utime $fh, undef, undef; 3509 aio_utime $fh, undef, undef;
3211 3510
3212 close $fh 3511 close $fh
3213 or return; 3512 or return;
3214 3513
3215 aio_rename "$runtime~", $runtime 3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3216 and return; 3515 and return;
3217 3516
3218 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
3219 3518
3220 1 3519 1
3520}
3521
3522our $uuid_lock;
3523our $uuid_skip;
3524
3525sub write_uuid_sync($) {
3526 $uuid_skip ||= $_[0];
3527
3528 return if $uuid_lock;
3529 local $uuid_lock = 1;
3530
3531 my $uuid = "$LOCALDIR/uuid";
3532
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return;
3535
3536 my $value = uuid_seq uuid_cur;
3537
3538 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n";
3540 return;
3541 }
3542
3543 my $value = uuid_str $value + $uuid_skip;
3544 $uuid_skip = 0;
3545
3546 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3547 and return;
3548
3549 # always fsync - this file is important
3550 aio_fsync $fh
3551 and return;
3552
3553 close $fh
3554 or return;
3555
3556 aio_rename "$uuid~", $uuid
3557 and return;
3558
3559 warn "uuid file written ($value).\n";
3560
3561 1
3562
3563}
3564
3565sub write_uuid($$) {
3566 my ($skip, $sync) = @_;
3567
3568 $sync ? write_uuid_sync $skip
3569 : async { write_uuid_sync $skip };
3221} 3570}
3222 3571
3223sub emergency_save() { 3572sub emergency_save() {
3224 my $freeze_guard = cf::freeze_mainloop; 3573 my $freeze_guard = cf::freeze_mainloop;
3225 3574
3226 warn "enter emergency perl save\n"; 3575 warn "emergency_perl_save: enter\n";
3227 3576
3228 cf::sync_job { 3577 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582
3229 # use a peculiar iteration method to avoid tripping on perl 3583 # use a peculiar iteration method to avoid tripping on perl
3230 # refcount bugs in for. also avoids problems with players 3584 # refcount bugs in for. also avoids problems with players
3231 # and maps saved/destroyed asynchronously. 3585 # and maps saved/destroyed asynchronously.
3232 warn "begin emergency player save\n"; 3586 warn "emergency_perl_save: begin player save\n";
3233 for my $login (keys %cf::PLAYER) { 3587 for my $login (keys %cf::PLAYER) {
3234 my $pl = $cf::PLAYER{$login} or next; 3588 my $pl = $cf::PLAYER{$login} or next;
3235 $pl->valid or next; 3589 $pl->valid or next;
3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3236 $pl->save; 3591 $pl->save;
3237 } 3592 }
3238 warn "end emergency player save\n"; 3593 warn "emergency_perl_save: end player save\n";
3239 3594
3240 warn "begin emergency map save\n"; 3595 warn "emergency_perl_save: begin map save\n";
3241 for my $path (keys %cf::MAP) { 3596 for my $path (keys %cf::MAP) {
3242 my $map = $cf::MAP{$path} or next; 3597 my $map = $cf::MAP{$path} or next;
3243 $map->valid or next; 3598 $map->valid or next;
3244 $map->save; 3599 $map->save;
3245 } 3600 }
3246 warn "end emergency map save\n"; 3601 warn "emergency_perl_save: end map save\n";
3247 3602
3248 warn "begin emergency database checkpoint\n"; 3603 warn "emergency_perl_save: begin database checkpoint\n";
3249 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3250 warn "end emergency database checkpoint\n"; 3605 warn "emergency_perl_save: end database checkpoint\n";
3606
3607 warn "emergency_perl_save: begin write uuid\n";
3608 write_uuid_sync 1;
3609 warn "emergency_perl_save: end write uuid\n";
3251 }; 3610 };
3252 3611
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
3253 warn "leave emergency perl save\n"; 3617 warn "emergency_perl_save: leave\n";
3254} 3618}
3255 3619
3256sub post_cleanup { 3620sub post_cleanup {
3257 my ($make_core) = @_; 3621 my ($make_core) = @_;
3258 3622
3259 warn Carp::longmess "post_cleanup backtrace" 3623 warn Carp::longmess "post_cleanup backtrace"
3260 if $make_core; 3624 if $make_core;
3625
3626 my $fh = pidfile;
3627 unlink $PIDFILE if <$fh> == $$;
3628}
3629
3630# a safer delete_package, copied from Symbol
3631sub clear_package($) {
3632 my $pkg = shift;
3633
3634 # expand to full symbol table name if needed
3635 unless ($pkg =~ /^main::.*::$/) {
3636 $pkg = "main$pkg" if $pkg =~ /^::/;
3637 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3638 $pkg .= '::' unless $pkg =~ /::$/;
3639 }
3640
3641 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3642 my $stem_symtab = *{$stem}{HASH};
3643
3644 defined $stem_symtab and exists $stem_symtab->{$leaf}
3645 or return;
3646
3647 # clear all symbols
3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649 for my $name (keys %$leaf_symtab) {
3650 _gv_clear *{"$pkg$name"};
3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652 }
3653 warn "cleared package $pkg\n";#d#
3261} 3654}
3262 3655
3263sub do_reload_perl() { 3656sub do_reload_perl() {
3264 # can/must only be called in main 3657 # can/must only be called in main
3265 if ($Coro::current != $Coro::main) { 3658 if ($Coro::current != $Coro::main) {
3266 warn "can only reload from main coroutine"; 3659 warn "can only reload from main coroutine";
3267 return; 3660 return;
3268 } 3661 }
3269 3662
3663 return if $RELOAD++;
3664
3665 my $t1 = EV::time;
3666
3667 while ($RELOAD) {
3270 warn "reloading..."; 3668 warn "reloading...";
3271 3669
3272 warn "entering sync_job"; 3670 warn "entering sync_job";
3273 3671
3274 cf::sync_job { 3672 cf::sync_job {
3275 cf::write_runtime; # external watchdog should not bark 3673 cf::write_runtime_sync; # external watchdog should not bark
3276 cf::emergency_save; 3674 cf::emergency_save;
3277 cf::write_runtime; # external watchdog should not bark 3675 cf::write_runtime_sync; # external watchdog should not bark
3278 3676
3279 warn "syncing database to disk"; 3677 warn "syncing database to disk";
3280 BDB::db_env_txn_checkpoint $DB_ENV; 3678 BDB::db_env_txn_checkpoint $DB_ENV;
3281 3679
3282 # if anything goes wrong in here, we should simply crash as we already saved 3680 # if anything goes wrong in here, we should simply crash as we already saved
3283 3681
3284 warn "cancelling all WF_AUTOCANCEL watchers";
3285 for (Event::all_watchers) {
3286 $_->cancel if $_->data & WF_AUTOCANCEL;
3287 }
3288
3289 warn "flushing outstanding aio requests"; 3682 warn "flushing outstanding aio requests";
3290 for (;;) {
3291 BDB::flush;
3292 IO::AIO::flush;
3293 Coro::cede;
3294 last unless IO::AIO::nreqs || BDB::nreqs; 3683 while (IO::AIO::nreqs || BDB::nreqs) {
3295 warn "iterate..."; 3684 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3296 }
3297
3298 ++$RELOAD;
3299
3300 warn "cancelling all extension coros";
3301 $_->cancel for values %EXT_CORO;
3302 %EXT_CORO = ();
3303
3304 warn "removing commands";
3305 %COMMAND = ();
3306
3307 warn "removing ext/exti commands";
3308 %EXTCMD = ();
3309 %EXTICMD = ();
3310
3311 warn "unloading/nuking all extensions";
3312 for my $pkg (@EXTS) {
3313 warn "... unloading $pkg";
3314
3315 if (my $cb = $pkg->can ("unload")) {
3316 eval {
3317 $cb->($pkg);
3318 1
3319 } or warn "$pkg unloaded, but with errors: $@";
3320 } 3685 }
3321 3686
3322 warn "... nuking $pkg"; 3687 warn "cancelling all extension coros";
3323 Symbol::delete_package $pkg; 3688 $_->cancel for values %EXT_CORO;
3324 } 3689 %EXT_CORO = ();
3325 3690
3326 warn "unloading all perl modules loaded from $LIBDIR"; 3691 warn "removing commands";
3327 while (my ($k, $v) = each %INC) { 3692 %COMMAND = ();
3328 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3329 3693
3694 warn "removing ext/exti commands";
3695 %EXTCMD = ();
3696 %EXTICMD = ();
3697
3698 warn "unloading/nuking all extensions";
3699 for my $pkg (@EXTS) {
3330 warn "... unloading $k"; 3700 warn "... unloading $pkg";
3331 delete $INC{$k};
3332 3701
3333 $k =~ s/\.pm$//;
3334 $k =~ s/\//::/g;
3335
3336 if (my $cb = $k->can ("unload_module")) { 3702 if (my $cb = $pkg->can ("unload")) {
3703 eval {
3337 $cb->(); 3704 $cb->($pkg);
3705 1
3706 } or warn "$pkg unloaded, but with errors: $@";
3707 }
3708
3709 warn "... clearing $pkg";
3710 clear_package $pkg;
3338 } 3711 }
3339 3712
3340 Symbol::delete_package $k; 3713 warn "unloading all perl modules loaded from $LIBDIR";
3714 while (my ($k, $v) = each %INC) {
3715 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716
3717 warn "... unloading $k";
3718 delete $INC{$k};
3719
3720 $k =~ s/\.pm$//;
3721 $k =~ s/\//::/g;
3722
3723 if (my $cb = $k->can ("unload_module")) {
3724 $cb->();
3725 }
3726
3727 clear_package $k;
3341 } 3728 }
3342 3729
3343 warn "getting rid of safe::, as good as possible"; 3730 warn "getting rid of safe::, as good as possible";
3344 Symbol::delete_package "safe::$_" 3731 clear_package "safe::$_"
3345 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3732 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3346 3733
3347 warn "unloading cf.pm \"a bit\""; 3734 warn "unloading cf.pm \"a bit\"";
3348 delete $INC{"cf.pm"}; 3735 delete $INC{"cf.pm"};
3349 delete $INC{"cf/pod.pm"}; 3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3350 3737
3351 # don't, removes xs symbols, too, 3738 # don't, removes xs symbols, too,
3352 # and global variables created in xs 3739 # and global variables created in xs
3353 #Symbol::delete_package __PACKAGE__; 3740 #clear_package __PACKAGE__;
3354 3741
3355 warn "unload completed, starting to reload now"; 3742 warn "unload completed, starting to reload now";
3356 3743
3357 warn "reloading cf.pm"; 3744 warn "reloading cf.pm";
3358 require cf; 3745 require cf;
3359 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3360 3747
3361 warn "loading config and database again"; 3748 warn "loading config and database again";
3362 cf::reload_config; 3749 cf::reload_config;
3363 3750
3364 warn "loading extensions"; 3751 warn "loading extensions";
3365 cf::load_extensions; 3752 cf::load_extensions;
3366 3753
3754 if ($REATTACH_ON_RELOAD) {
3367 warn "reattaching attachments to objects/players"; 3755 warn "reattaching attachments to objects/players";
3368 _global_reattach; # objects, sockets 3756 _global_reattach; # objects, sockets
3369 warn "reattaching attachments to maps"; 3757 warn "reattaching attachments to maps";
3370 reattach $_ for values %MAP; 3758 reattach $_ for values %MAP;
3371 warn "reattaching attachments to players"; 3759 warn "reattaching attachments to players";
3372 reattach $_ for values %PLAYER; 3760 reattach $_ for values %PLAYER;
3761 }
3373 3762
3763 warn "running post_init jobs";
3764 (pop @POST_INIT)->(1) while @POST_INIT;
3765
3374 warn "leaving sync_job"; 3766 warn "leaving sync_job";
3375 3767
3376 1 3768 1
3377 } or do { 3769 } or do {
3378 warn $@; 3770 warn $@;
3379 warn "error while reloading, exiting."; 3771 cf::cleanup "error while reloading, exiting.";
3380 exit 1;
3381 }; 3772 };
3382 3773
3383 warn "reloaded"; 3774 warn "reloaded";
3775 --$RELOAD;
3776 }
3777
3778 $t1 = EV::time - $t1;
3779 warn "reload completed in ${t1}s\n";
3384}; 3780};
3385 3781
3386our $RELOAD_WATCHER; # used only during reload 3782our $RELOAD_WATCHER; # used only during reload
3387 3783
3388sub reload_perl() { 3784sub reload_perl() {
3389 # doing reload synchronously and two reloads happen back-to-back, 3785 # doing reload synchronously and two reloads happen back-to-back,
3390 # coro crashes during coro_state_free->destroy here. 3786 # coro crashes during coro_state_free->destroy here.
3391 3787
3392 $RELOAD_WATCHER ||= Event->timer ( 3788 $RELOAD_WATCHER ||= cf::async {
3393 reentrant => 0, 3789 Coro::AIO::aio_wait cache_extensions;
3394 after => 0, 3790
3395 data => WF_AUTOCANCEL, 3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3396 cb => sub {
3397 do_reload_perl; 3792 do_reload_perl;
3398 undef $RELOAD_WATCHER; 3793 undef $RELOAD_WATCHER;
3399 }, 3794 };
3400 ); 3795 };
3401} 3796}
3402 3797
3403register_command "reload" => sub { 3798register_command "reload" => sub {
3404 my ($who, $arg) = @_; 3799 my ($who, $arg) = @_;
3405 3800
3406 if ($who->flag (FLAG_WIZ)) { 3801 if ($who->flag (FLAG_WIZ)) {
3407 $who->message ("reloading server."); 3802 $who->message ("reloading server.");
3803 async {
3804 $Coro::current->{desc} = "perl_reload";
3408 async { reload_perl }; 3805 reload_perl;
3806 };
3409 } 3807 }
3410}; 3808};
3411 3809
3412unshift @INC, $LIBDIR; 3810unshift @INC, $LIBDIR;
3413 3811
3415 3813
3416our @WAIT_FOR_TICK; 3814our @WAIT_FOR_TICK;
3417our @WAIT_FOR_TICK_BEGIN; 3815our @WAIT_FOR_TICK_BEGIN;
3418 3816
3419sub wait_for_tick { 3817sub wait_for_tick {
3420 return unless $TICK_WATCHER->is_active;
3421 return if $Coro::current == $Coro::main; 3818 return if tick_inhibit || $Coro::current == $Coro::main;
3422 3819
3423 my $signal = new Coro::Signal; 3820 my $signal = new Coro::Signal;
3424 push @WAIT_FOR_TICK, $signal; 3821 push @WAIT_FOR_TICK, $signal;
3425 $signal->wait; 3822 $signal->wait;
3426} 3823}
3427 3824
3428sub wait_for_tick_begin { 3825sub wait_for_tick_begin {
3429 return unless $TICK_WATCHER->is_active;
3430 return if $Coro::current == $Coro::main; 3826 return if tick_inhibit || $Coro::current == $Coro::main;
3431 3827
3432 my $signal = new Coro::Signal; 3828 my $signal = new Coro::Signal;
3433 push @WAIT_FOR_TICK_BEGIN, $signal; 3829 push @WAIT_FOR_TICK_BEGIN, $signal;
3434 $signal->wait; 3830 $signal->wait;
3435} 3831}
3436 3832
3437 my $min = 1e6;#d# 3833sub tick {
3438 my $avg = 10;
3439$TICK_WATCHER = Event->timer (
3440 reentrant => 0,
3441 parked => 1,
3442 prio => 0,
3443 at => $NEXT_TICK || $TICK,
3444 data => WF_AUTOCANCEL,
3445 cb => sub {
3446 if ($Coro::current != $Coro::main) { 3834 if ($Coro::current != $Coro::main) {
3447 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3835 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3448 unless ++$bug_warning > 10; 3836 unless ++$bug_warning > 10;
3449 return; 3837 return;
3450 } 3838 }
3451 3839
3452 $NOW = $tick_start = Event::time;
3453
3454 cf::server_tick; # one server iteration 3840 cf::server_tick; # one server iteration
3455 3841
3456 0 && sync_job {#d# 3842 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3457 for(1..10) { 3843 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3458 my $t = Event::time; 3844 Coro::async_pool {
3459 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3845 $Coro::current->{desc} = "runtime saver";
3460 or die; 3846 write_runtime_sync
3461 3847 or warn "ERROR: unable to write runtime file: $!";
3462 $map->width (50);
3463 $map->height (50);
3464 $map->alloc;
3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3466 my $t = Event::time - $t;
3467
3468 #next unless $t < 0.0013;#d#
3469 if ($t < $min) {
3470 $min = $t;
3471 }
3472 $avg = $avg * 0.99 + $t * 0.01;
3473 }
3474 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3475 exit 0;
3476 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3477 }; 3848 };
3849 }
3478 3850
3479 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK;
3481
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
3484 Coro::async_pool {
3485 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 }
3489
3490# my $AFTER = Event::time;
3491# warn $AFTER - $NOW;#d#
3492
3493 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3494 $sig->send; 3852 $sig->send;
3495 } 3853 }
3496 while (my $sig = shift @WAIT_FOR_TICK) { 3854 while (my $sig = shift @WAIT_FOR_TICK) {
3497 $sig->send; 3855 $sig->send;
3498 } 3856 }
3499 3857
3500 $NOW = Event::time; 3858 $LOAD = ($NOW - $TICK_START) / $TICK;
3501
3502 # if we are delayed by four ticks or more, skip them all
3503 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3504
3505 $TICK_WATCHER->at ($NEXT_TICK);
3506 $TICK_WATCHER->start;
3507
3508 $LOAD = ($NOW - $tick_start) / $TICK;
3509 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3859 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3510 3860
3511 _post_tick; 3861 if (0) {
3512 3862 if ($NEXT_TICK) {
3513 3863 my $jitter = $TICK_START - $NEXT_TICK;
3864 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3865 warn "jitter $JITTER\n";#d#
3866 }
3514 }, 3867 }
3515); 3868}
3516 3869
3517{ 3870{
3518 BDB::max_poll_time $TICK * 0.1; 3871 # configure BDB
3519 $BDB_POLL_WATCHER = Event->io ( 3872
3520 reentrant => 0,
3521 fd => BDB::poll_fileno,
3522 poll => 'r',
3523 prio => 0,
3524 data => WF_AUTOCANCEL,
3525 cb => \&BDB::poll_cb,
3526 );
3527 BDB::min_parallel 8; 3873 BDB::min_parallel 8;
3528 3874 BDB::max_poll_reqs $TICK * 0.1;
3529 BDB::set_sync_prepare { 3875 $AnyEvent::BDB::WATCHER->priority (1);
3530 my $status;
3531 my $current = $Coro::current;
3532 (
3533 sub {
3534 $status = $!;
3535 $current->ready; undef $current;
3536 },
3537 sub {
3538 Coro::schedule while defined $current;
3539 $! = $status;
3540 },
3541 )
3542 };
3543 3876
3544 unless ($DB_ENV) { 3877 unless ($DB_ENV) {
3545 $DB_ENV = BDB::db_env_create; 3878 $DB_ENV = BDB::db_env_create;
3879 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3880 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3881 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3882 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3883 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3546 3884
3547 cf::sync_job { 3885 cf::sync_job {
3548 eval { 3886 eval {
3549 BDB::db_env_open 3887 BDB::db_env_open
3550 $DB_ENV, 3888 $DB_ENV,
3552 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3890 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3553 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3891 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3554 0666; 3892 0666;
3555 3893
3556 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3894 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3557
3558 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3559 $DB_ENV->set_lk_detect;
3560 }; 3895 };
3561 3896
3562 cf::cleanup "db_env_open(db): $@" if $@; 3897 cf::cleanup "db_env_open(db): $@" if $@;
3563 }; 3898 };
3564 } 3899 }
3900
3901 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3902 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3903 };
3904 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3905 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3906 };
3907 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3908 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3909 };
3565} 3910}
3566 3911
3567{ 3912{
3913 # configure IO::AIO
3914
3568 IO::AIO::min_parallel 8; 3915 IO::AIO::min_parallel 8;
3569
3570 undef $Coro::AIO::WATCHER;
3571 IO::AIO::max_poll_time $TICK * 0.1; 3916 IO::AIO::max_poll_time $TICK * 0.1;
3572 $AIO_POLL_WATCHER = Event->io ( 3917 undef $AnyEvent::AIO::WATCHER;
3573 reentrant => 0,
3574 data => WF_AUTOCANCEL,
3575 fd => IO::AIO::poll_fileno,
3576 poll => 'r',
3577 prio => 6,
3578 cb => \&IO::AIO::poll_cb,
3579 );
3580} 3918}
3581 3919
3582my $_log_backtrace; 3920my $_log_backtrace;
3583 3921
3584sub _log_backtrace { 3922sub _log_backtrace {
3587 $msg =~ s/\n//; 3925 $msg =~ s/\n//;
3588 3926
3589 # limit the # of concurrent backtraces 3927 # limit the # of concurrent backtraces
3590 if ($_log_backtrace < 2) { 3928 if ($_log_backtrace < 2) {
3591 ++$_log_backtrace; 3929 ++$_log_backtrace;
3930 my $perl_bt = Carp::longmess $msg;
3592 async { 3931 async {
3932 $Coro::current->{desc} = "abt $msg";
3933
3593 my @bt = fork_call { 3934 my @bt = fork_call {
3594 @addr = map { sprintf "%x", $_ } @addr; 3935 @addr = map { sprintf "%x", $_ } @addr;
3595 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3936 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3596 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3937 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3597 or die "addr2line: $!"; 3938 or die "addr2line: $!";
3605 } 3946 }
3606 3947
3607 @funcs 3948 @funcs
3608 }; 3949 };
3609 3950
3610 LOG llevInfo, "[ABT] $msg\n"; 3951 LOG llevInfo, "[ABT] $perl_bt\n";
3952 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3611 LOG llevInfo, "[ABT] $_\n" for @bt; 3953 LOG llevInfo, "[ABT] $_\n" for @bt;
3612 --$_log_backtrace; 3954 --$_log_backtrace;
3613 }; 3955 };
3614 } else { 3956 } else {
3615 LOG llevInfo, "[ABT] $msg\n"; 3957 LOG llevInfo, "[ABT] $msg\n";
3616 LOG llevInfo, "[ABT] [suppressed]\n"; 3958 LOG llevInfo, "[ABT] [suppressed]\n";
3617 } 3959 }
3618} 3960}
3619 3961
3620# load additional modules 3962# load additional modules
3621use cf::pod; 3963require "cf/$_.pm" for @EXTRA_MODULES;
3622 3964
3623END { cf::emergency_save } 3965END { cf::emergency_save }
3624 3966
36251 39671
3626 3968

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines