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.398 by root, Wed Dec 5 11:08:34 2007 UTC vs.
Revision 1.539 by root, Tue May 4 22:49:21 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# 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 Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.1 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
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 2.01 (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.51 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 75
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 76# strictly for debugging
44$YAML::Syck::ImplicitUnicode = 1; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 78
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 80
50our %COMMAND = (); 81our %COMMAND = ();
51our %COMMAND_TIME = (); 82our %COMMAND_TIME = ();
54our %EXTCMD = (); 85our %EXTCMD = ();
55our %EXTICMD = (); 86our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 87our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 88our %EXT_MAP = (); # pluggable maps
58 89
59our $RELOAD; # number of reloads so far 90our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 91our @EVENT;
92our @REFLECT; # set by XS
93our %REFLECT; # set by us
61 94
62our $CONFDIR = confdir; 95our $CONFDIR = confdir;
63our $DATADIR = datadir; 96our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 97our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 98our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 99our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 100our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 101our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 102our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 103our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 104our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 105our $BDBDIR = "$LOCALDIR/db";
106our $PIDFILE = "$LOCALDIR/pid";
107our $RUNTIMEFILE = "$LOCALDIR/runtime";
108
109our %RESOURCE; # unused
110
111our $OUTPUT_RATE_MIN = 3000;
112our $OUTPUT_RATE_MAX = 1000000;
113
114our $MAX_LINKS = 32; # how many chained exits to follow
115our $VERBOSE_IO = 1;
73 116
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 117our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 118our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 119our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 120our $USE_FSYNC = 1; # use fsync to write maps - default on
81 121
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 122our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 123our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 124our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 125our $DB_ENV;
87 126
127our @EXTRA_MODULES = qw(pod match mapscript);
128
88our %CFG; 129our %CFG;
89 130
90our $UPTIME; $UPTIME ||= time; 131our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 132our $RUNTIME;
133our $NOW;
92 134
93our (%PLAYER, %PLAYER_LOADING); # all users 135our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 136our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 137our $LINK_MAP; # the special {link} map, which is always available
96 138
97# used to convert map paths into valid unix filenames by replacing / by ∕ 139# used to convert map paths into valid unix filenames by replacing / by ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 140our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 141
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 142our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 143our $LOADAVG; # same thing, but with alpha-smoothing
144our $JITTER; # average jitter
102our $tick_start; # for load detecting purposes 145our $TICK_START; # for load detecting purposes
146
147our @POST_INIT;
148
149our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
150our $REALLY_UNLOOP; # never set to true, please :)
103 151
104binmode STDOUT; 152binmode STDOUT;
105binmode STDERR; 153binmode STDERR;
106 154
107# read virtual server time, if available 155# read virtual server time, if available
108unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 156unless ($RUNTIME || !-e $RUNTIMEFILE) {
109 open my $fh, "<", "$LOCALDIR/runtime" 157 open my $fh, "<", $RUNTIMEFILE
110 or die "unable to read runtime file: $!"; 158 or die "unable to read $RUNTIMEFILE file: $!";
111 $RUNTIME = <$fh> + 0.; 159 $RUNTIME = <$fh> + 0.;
112} 160}
161
162eval "sub TICK() { $TICK } 1" or die;
113 163
114mkdir $_ 164mkdir $_
115 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 165 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
116 166
117our $EMERGENCY_POSITION; 167our $EMERGENCY_POSITION;
118 168
119sub cf::map::normalise; 169sub cf::map::normalise;
170
171sub in_main() {
172 $Coro::current == $Coro::main
173}
174
175#############################################################################
176
177%REFLECT = ();
178for (@REFLECT) {
179 my $reflect = JSON::XS::decode_json $_;
180 $REFLECT{$reflect->{class}} = $reflect;
181}
182
183# this is decidedly evil
184$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
120 185
121############################################################################# 186#############################################################################
122 187
123=head2 GLOBAL VARIABLES 188=head2 GLOBAL VARIABLES
124 189
171returns directly I<after> the tick processing (and consequently, can only wake one process 236returns directly I<after> the tick processing (and consequently, can only wake one process
172per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 237per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
173 238
174=item @cf::INVOKE_RESULTS 239=item @cf::INVOKE_RESULTS
175 240
176This array contains the results of the last C<invoke ()> call. When 241This array contains the results of the last C<invoke ()> call. When
177C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 242C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
178that call. 243that call.
179 244
245=item %cf::REFLECT
246
247Contains, for each (C++) class name, a hash reference with information
248about object members (methods, scalars, arrays and flags) and other
249metadata, which is useful for introspection.
250
180=back 251=back
181 252
182=cut 253=cut
183 254
184BEGIN { 255sub error(@) { LOG llevError, join "", @_ }
185 *CORE::GLOBAL::warn = sub { 256sub warn (@) { LOG llevWarn , join "", @_ }
257sub info (@) { LOG llevInfo , join "", @_ }
258sub debug(@) { LOG llevDebug, join "", @_ }
259sub trace(@) { LOG llevTrace, join "", @_ }
260
261$Coro::State::WARNHOOK = sub {
186 my $msg = join "", @_; 262 my $msg = join "", @_;
187 263
188 $msg .= "\n" 264 $msg .= "\n"
189 unless $msg =~ /\n$/; 265 unless $msg =~ /\n$/;
190 266
191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 267 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
192 268
193 LOG llevError, $msg; 269 LOG llevWarn, $msg;
194 }; 270};
195} 271
272$Coro::State::DIEHOOK = sub {
273 return unless $^S eq 0; # "eq", not "=="
274
275 error Carp::longmess $_[0];
276
277 if (in_main) {#d#
278 error "DIEHOOK called in main context, Coro bug?\n";#d#
279 return;#d#
280 }#d#
281
282 # kill coroutine otherwise
283 Coro::terminate
284};
196 285
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 286@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 287@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 288@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 289@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 296for my $pkg (qw(
208 cf::global cf::attachable 297 cf::global cf::attachable
209 cf::object cf::object::player 298 cf::object cf::object::player
210 cf::client cf::player 299 cf::client cf::player
211 cf::arch cf::living 300 cf::arch cf::living
301 cf::map cf::mapspace
212 cf::map cf::party cf::region 302 cf::party cf::region
213)) { 303)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 304 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 305}
217 306
218$EV::DIED = sub { 307$EV::DIED = sub {
219 warn "error in event callback: @_"; 308 Carp::cluck "error in event callback: @_";
220}; 309};
221 310
222############################################################################# 311#############################################################################
223 312
224=head2 UTILITY FUNCTIONS 313=head2 UTILITY FUNCTIONS
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 350our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 351
263sub encode_json($) { $json_coder->encode ($_[0]) } 352sub encode_json($) { $json_coder->encode ($_[0]) }
264sub decode_json($) { $json_coder->decode ($_[0]) } 353sub decode_json($) { $json_coder->decode ($_[0]) }
265 354
355=item cf::post_init { BLOCK }
356
357Execute the given codeblock, I<after> all extensions have been (re-)loaded,
358but I<before> the server starts ticking again.
359
360The cdoeblock will have a single boolean argument to indicate whether this
361is a reload or not.
362
363=cut
364
365sub post_init(&) {
366 push @POST_INIT, shift;
367}
368
266=item cf::lock_wait $string 369=item cf::lock_wait $string
267 370
268Wait until the given lock is available. See cf::lock_acquire. 371Wait until the given lock is available. See cf::lock_acquire.
269 372
270=item my $lock = cf::lock_acquire $string 373=item my $lock = cf::lock_acquire $string
271 374
272Wait until the given lock is available and then acquires it and returns 375Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 376a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 377for example when the coroutine gets canceled), the lock is automatically
275returned. 378returned.
276 379
277Locks are *not* recursive, locking from the same coro twice results in a 380Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 381deadlocked coro.
284 387
285Return true if the lock is currently active, i.e. somebody has locked it. 388Return true if the lock is currently active, i.e. somebody has locked it.
286 389
287=cut 390=cut
288 391
289our %LOCK; 392our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 393
292sub lock_wait($) { 394sub lock_wait($) {
293 my ($key) = @_; 395 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 396}
306 397
307sub lock_acquire($) { 398sub lock_acquire($) {
308 my ($key) = @_; 399 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 400}
322 401
323sub lock_active($) { 402sub lock_active($) {
324 my ($key) = @_; 403 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 404}
328 405
329sub freeze_mainloop { 406sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 407 tick_inhibit_inc;
331 408
332 my $guard = Coro::guard { 409 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 410}
338 411
339=item cf::periodic $interval, $cb 412=item cf::periodic $interval, $cb
340 413
341Like EV::periodic, but randomly selects a starting point so that the actions 414Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer. 415get spread over time.
343 416
344=cut 417=cut
345 418
346sub periodic($$) { 419sub periodic($$) {
347 my ($interval, $cb) = @_; 420 my ($interval, $cb) = @_;
364 437
365=cut 438=cut
366 439
367our @SLOT_QUEUE; 440our @SLOT_QUEUE;
368our $SLOT_QUEUE; 441our $SLOT_QUEUE;
442our $SLOT_DECAY = 0.9;
369 443
370$SLOT_QUEUE->cancel if $SLOT_QUEUE; 444$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async { 445$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager"); 446 $Coro::current->desc ("timeslot manager");
373 447
374 my $signal = new Coro::Signal; 448 my $signal = new Coro::Signal;
449 my $busy;
375 450
376 while () { 451 while () {
377 next_job: 452 next_job:
453
378 my $avail = cf::till_tick; 454 my $avail = cf::till_tick;
379 if ($avail > 0.01) { 455
380 for (0 .. $#SLOT_QUEUE) { 456 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) { 457 if ($SLOT_QUEUE[$_][0] <= $avail) {
458 $busy = 0;
382 my $job = splice @SLOT_QUEUE, $_, 1, (); 459 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send; 460 $job->[2]->send;
384 Coro::cede; 461 Coro::cede;
385 goto next_job; 462 goto next_job;
386 } 463 } else {
464 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
387 } 465 }
388 } 466 }
389 467
390 if (@SLOT_QUEUE) { 468 if (@SLOT_QUEUE) {
391 # we do not use wait_for_tick() as it returns immediately when tick is inactive 469 # we do not use wait_for_tick() as it returns immediately when tick is inactive
392 push @cf::WAIT_FOR_TICK, $signal; 470 push @cf::WAIT_FOR_TICK, $signal;
393 $signal->wait; 471 $signal->wait;
394 } else { 472 } else {
473 $busy = 0;
395 Coro::schedule; 474 Coro::schedule;
396 } 475 }
397 } 476 }
398}; 477};
399 478
400sub get_slot($;$$) { 479sub get_slot($;$$) {
480 return if tick_inhibit || $Coro::current == $Coro::main;
481
401 my ($time, $pri, $name) = @_; 482 my ($time, $pri, $name) = @_;
402 483
403 $time = $TICK * .6 if $time > $TICK * .6; 484 $time = clamp $time, 0.01, $TICK * .6;
485
404 my $sig = new Coro::Signal; 486 my $sig = new Coro::Signal;
405 487
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 488 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 489 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready; 490 $SLOT_QUEUE->ready;
434=cut 516=cut
435 517
436sub sync_job(&) { 518sub sync_job(&) {
437 my ($job) = @_; 519 my ($job) = @_;
438 520
439 if ($Coro::current == $Coro::main) { 521 if (in_main) {
440 my $time = EV::time; 522 my $time = AE::time;
441 523
442 # this is the main coro, too bad, we have to block 524 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 525 # till the operation succeeds, freezing the server :/
444 526
445 LOG llevError, Carp::longmess "sync job";#d# 527 #LOG llevError, Carp::longmess "sync job";#d#
446 528
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 529 my $freeze_guard = freeze_mainloop;
450 530
451 my $busy = 1; 531 my $busy = 1;
452 my @res; 532 my @res;
453 533
454 (async { 534 (async {
455 $Coro::current->desc ("sync job coro"); 535 $Coro::current->desc ("sync job coro");
456 @res = eval { $job->() }; 536 @res = eval { $job->() };
457 warn $@ if $@; 537 error $@ if $@;
458 undef $busy; 538 undef $busy;
459 })->prio (Coro::PRIO_MAX); 539 })->prio (Coro::PRIO_MAX);
460 540
461 while ($busy) { 541 while ($busy) {
462 if (Coro::nready) { 542 if (Coro::nready) {
464 } else { 544 } else {
465 EV::loop EV::LOOP_ONESHOT; 545 EV::loop EV::LOOP_ONESHOT;
466 } 546 }
467 } 547 }
468 548
469 $time = EV::time - $time; 549 my $time = AE::time - $time;
470 550
471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
473
474 $tick_start += $time; # do not account sync jobs to server load 551 $TICK_START += $time; # do not account sync jobs to server load
475 552
476 wantarray ? @res : $res[0] 553 wantarray ? @res : $res[0]
477 } else { 554 } else {
478 # we are in another coroutine, how wonderful, everything just works 555 # we are in another coroutine, how wonderful, everything just works
479 556
523 }, @args; 600 }, @args;
524 601
525 wantarray ? @res : $res[-1] 602 wantarray ? @res : $res[-1]
526} 603}
527 604
605sub objinfo {
606 (
607 "counter value" => cf::object::object_count,
608 "objects created" => cf::object::create_count,
609 "objects destroyed" => cf::object::destroy_count,
610 "freelist size" => cf::object::free_count,
611 "allocated objects" => cf::object::objects_size,
612 "active objects" => cf::object::actives_size,
613 )
614}
615
616=item $coin = coin_from_name $name
617
618=cut
619
620our %coin_alias = (
621 "silver" => "silvercoin",
622 "silvercoin" => "silvercoin",
623 "silvercoins" => "silvercoin",
624 "gold" => "goldcoin",
625 "goldcoin" => "goldcoin",
626 "goldcoins" => "goldcoin",
627 "platinum" => "platinacoin",
628 "platinumcoin" => "platinacoin",
629 "platinumcoins" => "platinacoin",
630 "platina" => "platinacoin",
631 "platinacoin" => "platinacoin",
632 "platinacoins" => "platinacoin",
633 "royalty" => "royalty",
634 "royalties" => "royalty",
635);
636
637sub coin_from_name($) {
638 $coin_alias{$_[0]}
639 ? cf::arch::find $coin_alias{$_[0]}
640 : undef
641}
642
528=item $value = cf::db_get $family => $key 643=item $value = cf::db_get $family => $key
529 644
530Returns a single value from the environment database. 645Returns a single value from the environment database.
531 646
532=item cf::db_put $family => $key => $value 647=item cf::db_put $family => $key => $value
540within each server. 655within each server.
541 656
542=cut 657=cut
543 658
544sub db_table($) { 659sub db_table($) {
660 cf::error "db_get called from main context"
661 if $Coro::current == $Coro::main;
662
545 my ($name) = @_; 663 my ($name) = @_;
546 my $db = BDB::db_create $DB_ENV; 664 my $db = BDB::db_create $DB_ENV;
547 665
548 eval { 666 eval {
549 $db->set_flags (BDB::CHKSUM); 667 $db->set_flags (BDB::CHKSUM);
559} 677}
560 678
561our $DB; 679our $DB;
562 680
563sub db_init { 681sub db_init {
564 cf::sync_job {
565 $DB ||= db_table "db"; 682 $DB ||= db_table "db";
566 };
567} 683}
568 684
569sub db_get($$) { 685sub db_get($$) {
570 my $key = "$_[0]/$_[1]"; 686 my $key = "$_[0]/$_[1]";
571 687
572 cf::sync_job { 688 cf::error "db_get called from main context"
689 if $Coro::current == $Coro::main;
690
573 BDB::db_get $DB, undef, $key, my $data; 691 BDB::db_get $DB, undef, $key, my $data;
574 692
575 $! ? () 693 $! ? ()
576 : $data 694 : $data
577 }
578} 695}
579 696
580sub db_put($$$) { 697sub db_put($$$) {
581 BDB::dbreq_pri 4; 698 BDB::dbreq_pri 4;
582 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 699 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
638 755
639 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
640 my $data = $process->(\@data); 757 my $data = $process->(\@data);
641 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
642 759
643 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
644 761
645 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
646 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
647 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
648 765
658 775
659=cut 776=cut
660 777
661sub datalog($@) { 778sub datalog($@) {
662 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
663 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
664} 781}
665 782
666=back 783=back
667 784
668=cut 785=cut
669 786
670############################################################################# 787#############################################################################
671 788
672=head2 ATTACHABLE OBJECTS 789=head2 ATTACHABLE OBJECTS
673 790
674Many objects in crossfire are so-called attachable objects. That means you can 791Many objects in deliantra are so-called attachable objects. That means you can
675attach callbacks/event handlers (a collection of which is called an "attachment") 792attach callbacks/event handlers (a collection of which is called an "attachment")
676to it. All such attachable objects support the following methods. 793to it. All such attachable objects support the following methods.
677 794
678In the following description, CLASS can be any of C<global>, C<object> 795In the following description, CLASS can be any of C<global>, C<object>
679C<player>, C<client> or C<map> (i.e. the attachable objects in 796C<player>, C<client> or C<map> (i.e. the attachable objects in
729=item cf::CLASS::attachment $name, ... 846=item cf::CLASS::attachment $name, ...
730 847
731Register an attachment by C<$name> through which attachable objects of the 848Register an attachment by C<$name> through which attachable objects of the
732given CLASS can refer to this attachment. 849given CLASS can refer to this attachment.
733 850
734Some classes such as crossfire maps and objects can specify attachments 851Some classes such as deliantra maps and objects can specify attachments
735that are attached at load/instantiate time, thus the need for a name. 852that are attached at load/instantiate time, thus the need for a name.
736 853
737These calls expect any number of the following handler/hook descriptions: 854These calls expect any number of the following handler/hook descriptions:
738 855
739=over 4 856=over 4
863 980
864 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
865 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
866 983
867 } elsif (ref $type) { 984 } elsif (ref $type) {
868 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
869 986
870 } else { 987 } else {
871 shift @arg; 988 shift @arg;
872 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
873 } 990 }
874 } 991 }
875} 992}
876 993
877sub _object_attach { 994sub _object_attach {
887 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
888 } 1005 }
889 1006
890 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
891 } else { 1008 } else {
892 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
893 } 1010 }
894 1011
895 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
896} 1013}
897 1014
956 1073
957 for (@$callbacks) { 1074 for (@$callbacks) {
958 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
959 1076
960 if ($@) { 1077 if ($@) {
961 warn "$@";
962 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
963 override; 1079 override;
964 } 1080 }
965 1081
966 return 1 if $override; 1082 return 1 if $override;
967 } 1083 }
968 1084
969 0 1085 0
970} 1086}
971 1087
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1088=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1089
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1091
976Generate an object-specific event with the given arguments. 1092Generate an object-specific event with the given arguments.
977 1093
1030 1146
1031sub reattach { 1147sub reattach {
1032 # basically do the same as instantiate, without calling instantiate 1148 # basically do the same as instantiate, without calling instantiate
1033 my ($obj) = @_; 1149 my ($obj) = @_;
1034 1150
1151 # no longer needed after getting rid of delete_package?
1035 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1152 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1036 1153
1037 my $registry = $obj->registry; 1154 my $registry = $obj->registry;
1038 1155
1039 @$registry = (); 1156 @$registry = ();
1040 1157
1045 for (@$attach) { 1162 for (@$attach) {
1046 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1047 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1048 } 1165 }
1049 } else { 1166 } else {
1050 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1051 } 1168 }
1052 } 1169 }
1053} 1170}
1054 1171
1055cf::attachable->attach ( 1172cf::attachable->attach (
1082 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1083 1200
1084 sync_job { 1201 sync_job {
1085 if (length $$rdata) { 1202 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1089 1207
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1209 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 aio_fsync $fh if $cf::USE_FSYNC; 1211 if ($cf::USE_FSYNC) {
1212 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1213 aio_fsync $fh;
1214 }
1094 close $fh; 1215 aio_close $fh;
1095 1216
1096 if (@$objs) { 1217 if (@$objs) {
1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1218 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1219 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1101 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1224 aio_fsync $fh;
1225 }
1102 close $fh; 1226 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1228 }
1105 } else { 1229 } else {
1106 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
1107 } 1231 }
1108 1232
1109 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1234
1235 $filename =~ s%/[^/]+$%%;
1236 aio_pathsync $filename if $cf::USE_FSYNC;
1110 } else { 1237 } else {
1111 warn "FATAL: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1112 } 1239 }
1113 } else { 1240 } else {
1114 aio_unlink $filename; 1241 aio_unlink $filename;
1115 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1116 } 1243 }
1140 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs}; 1268 $av = $st->{objs};
1142 } 1269 }
1143 1270
1144 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1145 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1146 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1147 1275
1148 ($data, $av) 1276 ($data, $av)
1149} 1277}
1150 1278
1151=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
1207 my ($name, $cb) = @_; 1335 my ($name, $cb) = @_;
1208 1336
1209 $EXTICMD{$name} = $cb; 1337 $EXTICMD{$name} = $cb;
1210} 1338}
1211 1339
1340use File::Glob ();
1341
1212cf::player->attach ( 1342cf::player->attach (
1213 on_command => sub { 1343 on_unknown_command => sub {
1214 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1215 1345
1216 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1217 or return; 1347 or return;
1218 1348
1241 1371
1242 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1243 if $reply; 1373 if $reply;
1244 1374
1245 } else { 1375 } else {
1246 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1247 } 1377 }
1248 1378
1249 cf::override; 1379 cf::override;
1250 }, 1380 },
1251); 1381);
1252 1382
1383# "readahead" all extensions
1384sub cache_extensions {
1385 my $grp = IO::AIO::aio_group;
1386
1387 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1388 for (grep /\.ext$/, @{$_[0]}) {
1389 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1390 }
1391 };
1392
1393 $grp
1394}
1395
1253sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1254 cf::sync_job { 1399 cf::sync_job {
1255 my %todo; 1400 my %todo;
1256 1401
1257 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1258 next unless -r $path; 1403 next unless -r $path;
1276 1421
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279 1424
1280 $ext{source} = 1425 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n" 1426 "package $pkg; use common::sense;\n"
1282 . "#line 1 \"$path\"\n{\n" 1427 . "#line 1 \"$path\"\n{\n"
1283 . $source 1428 . $source
1284 . "\n};\n1"; 1429 . "\n};\n1";
1285 1430
1286 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1287 } 1432 }
1288 1433
1434 my $pass = 0;
1289 my %done; 1435 my %done;
1290 while (%todo) { 1436 while (%todo) {
1291 my $progress; 1437 my $progress;
1292 1438
1439 ++$pass;
1440
1441 ext:
1293 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1294 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1295 goto skip 1444 next ext
1296 unless exists $done{$_}; 1445 unless exists $done{$_};
1297 } 1446 }
1298 1447
1299 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1300 1449
1301 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1302 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1303 : "$v->{base}: extension inactive.\n"; 1454 undef $@; # work around perl 5.10.0 utf-8 caching bug
1304 1455
1456 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1305 if (exists $v->{meta}{mandatory}) { 1457 if exists $v->{meta}{mandatory};
1306 warn $msg; 1458
1307 warn "mandatory extension failed to load, exiting.\n"; 1459 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1308 exit 1; 1460 delete $todo{$k};
1309 } 1461 } else {
1310 1462 $done{$k} = delete $todo{$k};
1311 warn $msg; 1463 push @EXTS, $v->{pkg};
1464 $progress = 1;
1465
1466 info "$v->{base}: extension inactive.\n"
1467 unless $active;
1312 } 1468 }
1313
1314 $done{$k} = delete $todo{$k};
1315 push @EXTS, $v->{pkg};
1316 $progress = 1;
1317 } 1469 }
1318 1470
1319 skip: 1471 unless ($progress) {
1320 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1472 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1321 unless $progress; 1473
1474 while (my ($k, $v) = each %todo) {
1475 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1476 if exists $v->{meta}{mandatory};
1477 }
1478 }
1322 } 1479 }
1323 }; 1480 };
1324} 1481}
1325 1482
1326############################################################################# 1483#############################################################################
1327 1484
1328=back 1485=back
1329 1486
1330=head2 CORE EXTENSIONS 1487=head2 CORE EXTENSIONS
1331 1488
1332Functions and methods that extend core crossfire objects. 1489Functions and methods that extend core deliantra objects.
1333 1490
1334=cut 1491=cut
1335 1492
1336package cf::player; 1493package cf::player;
1337 1494
1380 1537
1381sub exists($) { 1538sub exists($) {
1382 my ($login) = @_; 1539 my ($login) = @_;
1383 1540
1384 $cf::PLAYER{$login} 1541 $cf::PLAYER{$login}
1385 or cf::sync_job { !aio_stat path $login } 1542 or !aio_stat path $login
1386} 1543}
1387 1544
1388sub find($) { 1545sub find($) {
1389 return $cf::PLAYER{$_[0]} || do { 1546 return $cf::PLAYER{$_[0]} || do {
1390 my $login = $_[0]; 1547 my $login = $_[0];
1402 my $f = new_from_file cf::object::thawer path $login 1559 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1560 or return;
1404 1561
1405 my $pl = cf::player::load_pl $f 1562 my $pl = cf::player::load_pl $f
1406 or return; 1563 or return;
1564
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1565 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1566 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1567 $cf::PLAYER{$login} = $pl
1410 } 1568 }
1411 } 1569 }
1412} 1570}
1413 1571
1572cf::player->attach (
1573 on_load => sub {
1574 my ($pl, $path) = @_;
1575
1576 # restore slots saved in save, below
1577 my $slots = delete $pl->{_slots};
1578
1579 $pl->ob->current_weapon ($slots->[0]);
1580 $pl->combat_ob ($slots->[1]);
1581 $pl->ranged_ob ($slots->[2]);
1582 },
1583);
1584
1414sub save($) { 1585sub save($) {
1415 my ($pl) = @_; 1586 my ($pl) = @_;
1416 1587
1417 return if $pl->{deny_save}; 1588 return if $pl->{deny_save};
1418 1589
1421 1592
1422 return if $pl->{deny_save}; 1593 return if $pl->{deny_save};
1423 1594
1424 aio_mkdir playerdir $pl, 0770; 1595 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1596 $pl->{last_save} = $cf::RUNTIME;
1597
1598 cf::get_slot 0.01;
1599
1600 # save slots, to be restored later
1601 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1426 1602
1427 $pl->save_pl ($path); 1603 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1604 cf::cede_to_tick;
1429} 1605}
1430 1606
1462 my ($pl) = @_; 1638 my ($pl) = @_;
1463 1639
1464 my $name = $pl->ob->name; 1640 my $name = $pl->ob->name;
1465 1641
1466 $pl->{deny_save} = 1; 1642 $pl->{deny_save} = 1;
1467 $pl->password ("*"); # this should lock out the player until we nuked the dir 1643 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1468 1644
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1645 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1470 $pl->deactivate; 1646 $pl->deactivate;
1647 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1648 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1472 $pl->ns->destroy if $pl->ns; 1649 $pl->ns->destroy if $pl->ns;
1473 1650
1474 my $path = playerdir $pl; 1651 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1652 my $temp = "$path~$cf::RUNTIME~deleting~";
1514 1691
1515 for my $login (@$dirs) { 1692 for my $login (@$dirs) {
1516 my $path = path $login; 1693 my $path = path $login;
1517 1694
1518 # a .pst is a dead give-away for a valid player 1695 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1696 # if no pst file found, open and chekc for blocked users
1697 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1698 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1699 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1700 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1701 }
1524 1702
1528 1706
1529 \@logins 1707 \@logins
1530} 1708}
1531 1709
1532=item $player->maps 1710=item $player->maps
1711
1712=item cf::player::maps $login
1533 1713
1534Returns an arrayref of map paths that are private for this 1714Returns an arrayref of map paths that are private for this
1535player. May block. 1715player. May block.
1536 1716
1537=cut 1717=cut
1555 } 1735 }
1556 1736
1557 \@paths 1737 \@paths
1558} 1738}
1559 1739
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1740=item $protocol_xml = $player->expand_cfpod ($cfpod)
1561 1741
1562Expand crossfire pod fragments into protocol xml. 1742Expand deliantra pod fragments into protocol xml.
1563
1564=cut
1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1577sub expand_cfpod {
1578 my ($self, $pod) = @_;
1579
1580 my $xml;
1581
1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1585
1586 $group =~ s/&/&amp;/g;
1587 $group =~ s/</&lt;/g;
1588
1589 $xml .= $group;
1590 } elsif ($pod =~ m%\G
1591 ([BCGHITU])
1592 <
1593 (?:
1594 ([^<>]*) (?{ $group = $^N })
1595 | < $interior >
1596 )
1597 >
1598 %gcsx
1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1619 "")
1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1631
1632 for ($xml) {
1633 # create single paragraphs (very hackish)
1634 s/(?<=\S)\n(?=\w)/ /g;
1635
1636 # compress some whitespace
1637 s/\s+\n/\n/g; # ws line-ends
1638 s/\n\n+/\n/g; # double lines
1639 s/^\n+//; # beginning lines
1640 s/\n+$//; # ending lines
1641 }
1642
1643 $xml
1644}
1645
1646no re 'eval';
1647
1648sub hintmode {
1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1650 $_[0]{hintmode}
1651}
1652 1743
1653=item $player->ext_reply ($msgid, @msg) 1744=item $player->ext_reply ($msgid, @msg)
1654 1745
1655Sends an ext reply to the player. 1746Sends an ext reply to the player.
1656 1747
1688 1779
1689=cut 1780=cut
1690 1781
1691sub find_by_path($) { 1782sub find_by_path($) {
1692 my ($path) = @_; 1783 my ($path) = @_;
1784
1785 $path =~ s/^~[^\/]*//; # skip ~login
1693 1786
1694 my ($match, $specificity); 1787 my ($match, $specificity);
1695 1788
1696 for my $region (list) { 1789 for my $region (list) {
1697 if ($region->{match} && $path =~ $region->{match}) { 1790 if ($region->{match} && $path =~ $region->{match}) {
1723our $MAX_RESET = 3600; 1816our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1817our $DEFAULT_RESET = 3000;
1725 1818
1726sub generate_random_map { 1819sub generate_random_map {
1727 my ($self, $rmp) = @_; 1820 my ($self, $rmp) = @_;
1821
1822 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1823
1728 # mit "rum" bekleckern, nicht 1824 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1825 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1826 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1827 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1828 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1829 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1830 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1831 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1832 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1751 1847
1752sub register { 1848sub register {
1753 my (undef, $regex, $prio) = @_; 1849 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1850 my $pkg = caller;
1755 1851
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1852 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1853
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1855}
1761 1856
1762# also paths starting with '/' 1857# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1859
1765sub thawer_merge { 1860sub thawer_merge {
1766 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1767 1862
1768 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
1854 1949
1855# the temporary/swap location 1950# the temporary/swap location
1856sub save_path { 1951sub save_path {
1857 my ($self) = @_; 1952 my ($self) = @_;
1858 1953
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1954 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1955 "$TMPDIR/$path.map"
1861} 1956}
1862 1957
1863# the unique path, undef == no special unique path 1958# the unique path, undef == no special unique path
1864sub uniq_path { 1959sub uniq_path {
1865 my ($self) = @_; 1960 my ($self) = @_;
1866 1961
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1962 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1963 "$UNIQUEDIR/$path"
1869}
1870
1871# and all this just because we cannot iterate over
1872# all maps in C++...
1873sub change_all_map_light {
1874 my ($change) = @_;
1875
1876 $_->change_map_light ($change)
1877 for grep $_->outdoor, values %cf::MAP;
1878} 1964}
1879 1965
1880sub decay_objects { 1966sub decay_objects {
1881 my ($self) = @_; 1967 my ($self) = @_;
1882 1968
1966sub find { 2052sub find {
1967 my ($path, $origin) = @_; 2053 my ($path, $origin) = @_;
1968 2054
1969 $path = normalise $path, $origin && $origin->path; 2055 $path = normalise $path, $origin && $origin->path;
1970 2056
1971 cf::lock_wait "map_data:$path";#d#remove 2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 2058 my $guard2 = cf::lock_acquire "map_find:$path";
1973 2059
1974 $cf::MAP{$path} || do { 2060 $cf::MAP{$path} || do {
1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1978 my $map = new_from_path cf::map $path 2061 my $map = new_from_path cf::map $path
1979 or return; 2062 or return;
1980 2063
1981 $map->{last_save} = $cf::RUNTIME; 2064 $map->{last_save} = $cf::RUNTIME;
1982 2065
1984 or return; 2067 or return;
1985 2068
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2069 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2070 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2071 #$cf::WAIT_FOR_TICK->wait;
2072 undef $guard2;
1989 undef $guard1; 2073 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2074 $map->reset;
1992 return find $path; 2075 return find $path;
1993 } 2076 }
1994 2077
1995 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
1996 } 2079 }
1997} 2080}
1998 2081
1999sub pre_load { } 2082sub pre_load { }
2000sub post_load { } 2083#sub post_load { } # XS
2001 2084
2002sub load { 2085sub load {
2003 my ($self) = @_; 2086 my ($self) = @_;
2004 2087
2005 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2105 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2106 $f->skip_block;
2024 $self->_load_objects ($f) 2107 $self->_load_objects ($f)
2025 or return; 2108 or return;
2026 2109
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2110 $self->post_load_original
2028 if delete $self->{load_original}; 2111 if delete $self->{load_original};
2029 2112
2030 if (my $uniq = $self->uniq_path) { 2113 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2114 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2115 unless (aio_stat $uniq) {
2050 unless ($self->{deny_activate}) { 2133 unless ($self->{deny_activate}) {
2051 $self->decay_objects; 2134 $self->decay_objects;
2052 $self->fix_auto_apply; 2135 $self->fix_auto_apply;
2053 $self->update_buttons; 2136 $self->update_buttons;
2054 cf::cede_to_tick; 2137 cf::cede_to_tick;
2055 $self->set_darkness_map;
2056 cf::cede_to_tick;
2057 $self->activate; 2138 $self->activate;
2058 } 2139 }
2059 2140
2060 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2142 $self->last_access ($cf::RUNTIME);
2062 2143
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2144 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2145 }
2065 2146
2066 $self->post_load; 2147 $self->post_load;
2067} 2148}
2068 2149
2150# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath
2069sub customise_for { 2153sub customise_for {
2070 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2071 2155
2072 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2073 if $self->per_player; 2157 if $self->per_player;
2089 or next; 2173 or next;
2090 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2091 or next; 2175 or next;
2092 $neigh->load; 2176 $neigh->load;
2093 2177
2178 # now find the diagonal neighbours
2094 push @neigh, 2179 push @neigh,
2095 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2096 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2097 } 2182 }
2098 2183
2105} 2190}
2106 2191
2107sub find_sync { 2192sub find_sync {
2108 my ($path, $origin) = @_; 2193 my ($path, $origin) = @_;
2109 2194
2110 cf::sync_job { find $path, $origin } 2195 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2196 if $Coro::current == $Coro::main;
2197
2198 find $path, $origin
2111} 2199}
2112 2200
2113sub do_load_sync { 2201sub do_load_sync {
2114 my ($map) = @_; 2202 my ($map) = @_;
2115 2203
2116 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2204 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2117 if $Coro::current == $Coro::main; 2205 if $Coro::current == $Coro::main;
2118 2206
2119 cf::sync_job { $map->load }; 2207 $map->load;
2120} 2208}
2121 2209
2122our %MAP_PREFETCH; 2210our %MAP_PREFETCH;
2123our $MAP_PREFETCHER = undef; 2211our $MAP_PREFETCHER = undef;
2124 2212
2126 my ($path, $origin, $load) = @_; 2214 my ($path, $origin, $load) = @_;
2127 2215
2128 $path = normalise $path, $origin && $origin->{path}; 2216 $path = normalise $path, $origin && $origin->{path};
2129 2217
2130 if (my $map = $cf::MAP{$path}) { 2218 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2219 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2220 }
2133 2221
2134 $MAP_PREFETCH{$path} |= $load; 2222 $MAP_PREFETCH{$path} |= $load;
2135 2223
2136 $MAP_PREFETCHER ||= cf::async { 2224 $MAP_PREFETCHER ||= cf::async {
2150 $MAP_PREFETCHER->prio (6); 2238 $MAP_PREFETCHER->prio (6);
2151 2239
2152 () 2240 ()
2153} 2241}
2154 2242
2243# common code, used by both ->save and ->swapout
2155sub save { 2244sub _save {
2156 my ($self) = @_; 2245 my ($self) = @_;
2157
2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
2159 2246
2160 $self->{last_save} = $cf::RUNTIME; 2247 $self->{last_save} = $cf::RUNTIME;
2161 2248
2162 return unless $self->dirty; 2249 return unless $self->dirty;
2163 2250
2172 2259
2173 cf::async { 2260 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2261 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2262 $_->contr->save for $self->players;
2176 }; 2263 };
2264
2265 cf::get_slot 0.02;
2177 2266
2178 if ($uniq) { 2267 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2268 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2269 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2270 } else {
2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2271 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2183 } 2272 }
2184} 2273}
2185 2274
2275sub save {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 $self->_save;
2281}
2282
2186sub swap_out { 2283sub swap_out {
2187 my ($self) = @_; 2284 my ($self) = @_;
2188 2285
2189 # save first because save cedes
2190 $self->save;
2191
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2287
2288 return if $self->in_memory != cf::MAP_ACTIVE;
2289 return if $self->{deny_save};
2194 return if $self->players; 2290 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
2196 return if $self->{deny_save};
2197 2291
2292 # first deactivate the map and "unlink" it from the core
2293 $self->deactivate;
2294 $_->clear_links_to ($self) for values %cf::MAP;
2198 $self->in_memory (cf::MAP_SWAPPED); 2295 $self->in_memory (cf::MAP_SWAPPED);
2296
2297 # then atomically save
2298 $self->_save;
2299
2300 # then free the map
2301 $self->clear;
2302}
2303
2304sub reset_at {
2305 my ($self) = @_;
2306
2307 # TODO: safety, remove and allow resettable per-player maps
2308 return 1e99 if $self->{deny_reset};
2309
2310 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2311 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2312
2313 $time + $to
2314}
2315
2316sub should_reset {
2317 my ($self) = @_;
2318
2319 $self->reset_at <= $cf::RUNTIME
2320}
2321
2322sub reset {
2323 my ($self) = @_;
2324
2325 my $lock = cf::lock_acquire "map_data:$self->{path}";
2326
2327 return if $self->players;
2328
2329 cf::trace "resetting map ", $self->path, "\n";
2330
2331 $self->in_memory (cf::MAP_SWAPPED);
2332
2333 # need to save uniques path
2334 unless ($self->{deny_save}) {
2335 my $uniq = $self->uniq_path; utf8::encode $uniq;
2336
2337 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2338 if $uniq;
2339 }
2340
2341 delete $cf::MAP{$self->path};
2199 2342
2200 $self->deactivate; 2343 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP; 2344 $_->clear_links_to ($self) for values %cf::MAP;
2202 $self->clear; 2345 $self->clear;
2203}
2204
2205sub reset_at {
2206 my ($self) = @_;
2207
2208 # TODO: safety, remove and allow resettable per-player maps
2209 return 1e99 if $self->{deny_reset};
2210
2211 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2212 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2213
2214 $time + $to
2215}
2216
2217sub should_reset {
2218 my ($self) = @_;
2219
2220 $self->reset_at <= $cf::RUNTIME
2221}
2222
2223sub reset {
2224 my ($self) = @_;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227
2228 return if $self->players;
2229
2230 warn "resetting map ", $self->path;
2231
2232 $self->in_memory (cf::MAP_SWAPPED);
2233
2234 # need to save uniques path
2235 unless ($self->{deny_save}) {
2236 my $uniq = $self->uniq_path; utf8::encode $uniq;
2237
2238 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2239 if $uniq;
2240 }
2241
2242 delete $cf::MAP{$self->path};
2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
2246 $self->clear;
2247 2346
2248 $self->unlink_save; 2347 $self->unlink_save;
2249 $self->destroy; 2348 $self->destroy;
2250} 2349}
2251 2350
2259 2358
2260 delete $cf::MAP{$self->path}; 2359 delete $cf::MAP{$self->path};
2261 2360
2262 $self->unlink_save; 2361 $self->unlink_save;
2263 2362
2264 bless $self, "cf::map"; 2363 bless $self, "cf::map::wrap";
2265 delete $self->{deny_reset}; 2364 delete $self->{deny_reset};
2266 $self->{deny_save} = 1; 2365 $self->{deny_save} = 1;
2267 $self->reset_timeout (1); 2366 $self->reset_timeout (1);
2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2367 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2269 2368
2318 2417
2319sub unique_maps() { 2418sub unique_maps() {
2320 [ 2419 [
2321 map { 2420 map {
2322 utf8::decode $_; 2421 utf8::decode $_;
2323 /\.map$/ 2422 s/\.map$//; # TODO future compatibility hack
2423 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2424 ? ()
2324 ? normalise $_ 2425 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2426 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2427 ]
2328} 2428}
2329 2429
2330package cf; 2430=item cf::map::static_maps
2431
2432Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2433file in the shared directory excluding F</styles> and F</editor>). May
2434block.
2435
2436=cut
2437
2438sub static_maps() {
2439 my @dirs = "";
2440 my @maps;
2441
2442 while (@dirs) {
2443 my $dir = shift @dirs;
2444
2445 next if $dir eq "/styles" || $dir eq "/editor";
2446
2447 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2448 or return;
2449
2450 for (@$files) {
2451 s/\.map$// or next;
2452 utf8::decode $_;
2453 push @maps, "$dir/$_";
2454 }
2455
2456 push @dirs, map "$dir/$_", @$dirs;
2457 }
2458
2459 \@maps
2460}
2331 2461
2332=back 2462=back
2333 2463
2334=head3 cf::object 2464=head3 cf::object
2335 2465
2339 2469
2340=over 4 2470=over 4
2341 2471
2342=item $ob->inv_recursive 2472=item $ob->inv_recursive
2343 2473
2344Returns the inventory of the object _and_ their inventories, recursively. 2474Returns the inventory of the object I<and> their inventories, recursively,
2475but I<not> the object itself.
2345 2476
2346=cut 2477=cut
2347 2478
2348sub inv_recursive_; 2479sub inv_recursive_;
2349sub inv_recursive_ { 2480sub inv_recursive_ {
2354 inv_recursive_ inv $_[0] 2485 inv_recursive_ inv $_[0]
2355} 2486}
2356 2487
2357=item $ref = $ob->ref 2488=item $ref = $ob->ref
2358 2489
2359creates and returns a persistent reference to an objetc that can be stored as a string. 2490Creates and returns a persistent reference to an object that can be stored as a string.
2360 2491
2361=item $ob = cf::object::deref ($refstring) 2492=item $ob = cf::object::deref ($refstring)
2362 2493
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2494returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block. 2495even if the object actually exists. May block.
2396can be C<undef>. Does the right thing when the player is currently in a 2527can be C<undef>. Does the right thing when the player is currently in a
2397dialogue with the given NPC character. 2528dialogue with the given NPC character.
2398 2529
2399=cut 2530=cut
2400 2531
2532our $SAY_CHANNEL = {
2533 id => "say",
2534 title => "Map",
2535 reply => "say ",
2536 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2537};
2538
2539our $CHAT_CHANNEL = {
2540 id => "chat",
2541 title => "Chat",
2542 reply => "chat ",
2543 tooltip => "Player chat and shouts, global to the server.",
2544};
2545
2401# rough implementation of a future "reply" method that works 2546# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2547# with dialog boxes.
2403#TODO: the first argument must go, split into a $npc->reply_to ( method 2548#TODO: the first argument must go, split into a $npc->reply_to ( method
2404sub cf::object::player::reply($$$;$) { 2549sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2550 my ($self, $npc, $msg, $flags) = @_;
2416 my $dialog = $pl->{npc_dialog}; 2561 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2562 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418 2563
2419 } else { 2564 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2565 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2566 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2567 }
2423 } 2568 }
2424} 2569}
2425 2570
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2571=item $object->send_msg ($channel, $msg, $color, [extra...])
2451 2596
2452=item $player_object->enter_link 2597=item $player_object->enter_link
2453 2598
2454Freezes the player and moves him/her to a special map (C<{link}>). 2599Freezes the player and moves him/her to a special map (C<{link}>).
2455 2600
2456The player should be reasonably safe there for short amounts of time. You 2601The player should be reasonably safe there for short amounts of time (e.g.
2457I<MUST> call C<leave_link> as soon as possible, though. 2602for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2603though, as the player cannot control the character while it is on the link
2604map.
2458 2605
2459Will never block. 2606Will never block.
2460 2607
2461=item $player_object->leave_link ($map, $x, $y) 2608=item $player_object->leave_link ($map, $x, $y)
2462 2609
2482sub cf::object::player::enter_link { 2629sub cf::object::player::enter_link {
2483 my ($self) = @_; 2630 my ($self) = @_;
2484 2631
2485 $self->deactivate_recursive; 2632 $self->deactivate_recursive;
2486 2633
2634 ++$self->{_link_recursion};
2635
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2636 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2637
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2638 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2639 if $self->map && $self->map->{path} ne "{link}";
2491 2640
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2641 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2642}
2494 2643
2495sub cf::object::player::leave_link { 2644sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2645 my ($self, $map, $x, $y) = @_;
2497 2646
2514 ($x, $y) = (-1, -1) 2663 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2664 unless (defined $x) && (defined $y);
2516 2665
2517 # use -1 or undef as default coordinates, not 0, 0 2666 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2667 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2668 if $x <= 0 && $y <= 0;
2520 2669
2521 $map->load; 2670 $map->load;
2522 $map->load_neighbours; 2671 $map->load_neighbours;
2523 2672
2524 return unless $self->contr->active; 2673 return unless $self->contr->active;
2525 $self->activate_recursive;
2526 2674
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2675 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2676 if ($self->enter_map ($map, $x, $y)) {
2529} 2677 # entering was successful
2678 delete $self->{_link_recursion};
2679 # only activate afterwards, to support waiting in hooks
2680 $self->activate_recursive;
2681 }
2530 2682
2683}
2684
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2685=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2532 2686
2533Moves the player to the given map-path and coordinates by first freezing 2687Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2688her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2689that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2690the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process. 2691be called at the end of this process.
2538 2692
2693Note that $check will be called with a potentially non-loaded map, so if
2694it needs a loaded map it has to call C<< ->load >>.
2695
2539=cut 2696=cut
2540 2697
2541our $GOTOGEN; 2698our $GOTOGEN;
2542 2699
2543sub cf::object::player::goto { 2700sub cf::object::player::goto {
2544 my ($self, $path, $x, $y, $check, $done) = @_; 2701 my ($self, $path, $x, $y, $check, $done) = @_;
2702
2703 if ($self->{_link_recursion} >= $MAX_LINKS) {
2704 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2705 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2706 ($path, $x, $y) = @$EMERGENCY_POSITION;
2707 }
2545 2708
2546 # do generation counting so two concurrent goto's will be executed in-order 2709 # do generation counting so two concurrent goto's will be executed in-order
2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2710 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2548 2711
2549 $self->enter_link; 2712 $self->enter_link;
2573 my $map = eval { 2736 my $map = eval {
2574 my $map = defined $path ? cf::map::find $path : undef; 2737 my $map = defined $path ? cf::map::find $path : undef;
2575 2738
2576 if ($map) { 2739 if ($map) {
2577 $map = $map->customise_for ($self); 2740 $map = $map->customise_for ($self);
2578 $map = $check->($map) if $check && $map; 2741 $map = $check->($map, $x, $y, $self) if $check && $map;
2579 } else { 2742 } else {
2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2743 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2581 } 2744 }
2582 2745
2583 $map 2746 $map
2591 if ($gen == $self->{_goto_generation}) { 2754 if ($gen == $self->{_goto_generation}) {
2592 delete $self->{_goto_generation}; 2755 delete $self->{_goto_generation};
2593 $self->leave_link ($map, $x, $y); 2756 $self->leave_link ($map, $x, $y);
2594 } 2757 }
2595 2758
2596 $done->() if $done; 2759 $done->($self) if $done;
2597 })->prio (1); 2760 })->prio (1);
2598} 2761}
2599 2762
2600=item $player_object->enter_exit ($exit_object) 2763=item $player_object->enter_exit ($exit_object)
2601 2764
2621} 2784}
2622 2785
2623sub prepare_random_map { 2786sub prepare_random_map {
2624 my ($exit) = @_; 2787 my ($exit) = @_;
2625 2788
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2789 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2790 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2791 # that depends on the exit object
2631 2792
2632 my $rmp = parse_random_map_params $exit->msg; 2793 my $rmp = parse_random_map_params $exit->msg;
2634 if ($exit->map) { 2795 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2796 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2797 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2798 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2799 $rmp->{origin_y} = $exit->y;
2800
2801 $exit->map->touch;
2639 } 2802 }
2640 2803
2641 $rmp->{random_seed} ||= $exit->random_seed; 2804 $rmp->{random_seed} ||= $exit->random_seed;
2642 2805
2643 my $data = cf::encode_json $rmp; 2806 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2807 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2808 my $meta = "$RANDOMDIR/$md5.meta";
2646 2809
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2810 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2811 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2812 undef $fh;
2650 aio_rename "$meta~", $meta; 2813 aio_rename "$meta~", $meta;
2651 2814
2815 my $slaying = "?random/$md5";
2816
2817 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2818 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2819 $exit->msg (undef);
2820 }
2654 } 2821 }
2655} 2822}
2656 2823
2657sub cf::object::player::enter_exit { 2824sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2825 my ($self, $exit) = @_;
2659 2826
2660 return unless $self->type == cf::PLAYER; 2827 return unless $self->type == cf::PLAYER;
2661 2828
2662 if ($exit->slaying eq "/!") {
2663 #TODO: this should de-fi-ni-te-ly not be a sync-job
2664 # the problem is that $exit might not survive long enough
2665 # so it needs to be done right now, right here
2666 cf::sync_job { prepare_random_map $exit };
2667 }
2668
2669 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2670 my $hp = $exit->stats->hp;
2671 my $sp = $exit->stats->sp;
2672
2673 $self->enter_link; 2829 $self->enter_link;
2674 2830
2675 # if exit is damned, update players death & WoR home-position
2676 $self->contr->savebed ($slaying, $hp, $sp)
2677 if $exit->flag (FLAG_DAMNED);
2678
2679 (async { 2831 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2832 $Coro::current->{desc} = "enter_exit";
2681 2833
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 2834 unless (eval {
2835 $self->deactivate_recursive; # just to be sure
2836
2837 # random map handling
2838 {
2839 my $guard = cf::lock_acquire "exit_prepare:$exit";
2840
2841 prepare_random_map $exit
2842 if $exit->slaying eq "/!";
2843 }
2844
2845 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2846 my $x = $exit->stats->hp;
2847 my $y = $exit->stats->sp;
2848
2684 $self->goto ($slaying, $hp, $sp); 2849 $self->goto ($map, $x, $y);
2685 2850
2851 # if exit is damned, update players death & WoR home-position
2852 $self->contr->savebed ($map, $x, $y)
2853 if $exit->flag (cf::FLAG_DAMNED);
2854
2686 1; 2855 1
2687 }) { 2856 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2857 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "I'll try to bring you back to the map you were before. " 2858 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 2859 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2860 cf::NDI_UNIQUE | cf::NDI_RED);
2692 2861
2693 warn "ERROR in enter_exit: $@"; 2862 error "ERROR in enter_exit: $@";
2694 $self->leave_link; 2863 $self->leave_link;
2695 } 2864 }
2696 })->prio (1); 2865 })->prio (1);
2697} 2866}
2698 2867
2710sub cf::client::send_drawinfo { 2879sub cf::client::send_drawinfo {
2711 my ($self, $text, $flags) = @_; 2880 my ($self, $text, $flags) = @_;
2712 2881
2713 utf8::encode $text; 2882 utf8::encode $text;
2714 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2883 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2884}
2885
2886=item $client->send_big_packet ($pkt)
2887
2888Like C<send_packet>, but tries to compress large packets, and fragments
2889them as required.
2890
2891=cut
2892
2893our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2894
2895sub cf::client::send_big_packet {
2896 my ($self, $pkt) = @_;
2897
2898 # try lzf for large packets
2899 $pkt = "lzf " . Compress::LZF::compress $pkt
2900 if 1024 <= length $pkt and $self->{can_lzf};
2901
2902 # split very large packets
2903 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2904 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2905 $pkt = "frag";
2906 }
2907
2908 $self->send_packet ($pkt);
2715} 2909}
2716 2910
2717=item $client->send_msg ($channel, $msg, $color, [extra...]) 2911=item $client->send_msg ($channel, $msg, $color, [extra...])
2718 2912
2719Send a drawinfo or msg packet to the client, formatting the msg for the 2913Send a drawinfo or msg packet to the client, formatting the msg for the
2723 2917
2724=cut 2918=cut
2725 2919
2726# non-persistent channels (usually the info channel) 2920# non-persistent channels (usually the info channel)
2727our %CHANNEL = ( 2921our %CHANNEL = (
2922 "c/motd" => {
2923 id => "infobox",
2924 title => "MOTD",
2925 reply => undef,
2926 tooltip => "The message of the day",
2927 },
2728 "c/identify" => { 2928 "c/identify" => {
2729 id => "infobox", 2929 id => "infobox",
2730 title => "Identify", 2930 title => "Identify",
2731 reply => undef, 2931 reply => undef,
2732 tooltip => "Items recently identified", 2932 tooltip => "Items recently identified",
2734 "c/examine" => { 2934 "c/examine" => {
2735 id => "infobox", 2935 id => "infobox",
2736 title => "Examine", 2936 title => "Examine",
2737 reply => undef, 2937 reply => undef,
2738 tooltip => "Signs and other items you examined", 2938 tooltip => "Signs and other items you examined",
2939 },
2940 "c/shopinfo" => {
2941 id => "infobox",
2942 title => "Shop Info",
2943 reply => undef,
2944 tooltip => "What your bargaining skill tells you about the shop",
2739 }, 2945 },
2740 "c/book" => { 2946 "c/book" => {
2741 id => "infobox", 2947 id => "infobox",
2742 title => "Book", 2948 title => "Book",
2743 reply => undef, 2949 reply => undef,
2759 id => "infobox", 2965 id => "infobox",
2760 title => "Body Parts", 2966 title => "Body Parts",
2761 reply => undef, 2967 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 2968 tooltip => "Shows which body parts you posess and are available",
2763 }, 2969 },
2970 "c/statistics" => {
2971 id => "infobox",
2972 title => "Statistics",
2973 reply => undef,
2974 tooltip => "Shows your primary statistics",
2975 },
2976 "c/skills" => {
2977 id => "infobox",
2978 title => "Skills",
2979 reply => undef,
2980 tooltip => "Shows your experience per skill and item power",
2981 },
2982 "c/shopitems" => {
2983 id => "infobox",
2984 title => "Shop Items",
2985 reply => undef,
2986 tooltip => "Shows the items currently for sale in this shop",
2987 },
2988 "c/resistances" => {
2989 id => "infobox",
2990 title => "Resistances",
2991 reply => undef,
2992 tooltip => "Shows your resistances",
2993 },
2994 "c/pets" => {
2995 id => "infobox",
2996 title => "Pets",
2997 reply => undef,
2998 tooltip => "Shows information abotu your pets/a specific pet",
2999 },
3000 "c/perceiveself" => {
3001 id => "infobox",
3002 title => "Perceive Self",
3003 reply => undef,
3004 tooltip => "You gained detailed knowledge about yourself",
3005 },
2764 "c/uptime" => { 3006 "c/uptime" => {
2765 id => "infobox", 3007 id => "infobox",
2766 title => "Uptime", 3008 title => "Uptime",
2767 reply => undef, 3009 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 3010 tooltip => "How long the server has been running since last restart",
2771 id => "infobox", 3013 id => "infobox",
2772 title => "Map Info", 3014 title => "Map Info",
2773 reply => undef, 3015 reply => undef,
2774 tooltip => "Information related to the maps", 3016 tooltip => "Information related to the maps",
2775 }, 3017 },
3018 "c/party" => {
3019 id => "party",
3020 title => "Party",
3021 reply => "gsay ",
3022 tooltip => "Messages and chat related to your party",
3023 },
3024 "c/death" => {
3025 id => "death",
3026 title => "Death",
3027 reply => undef,
3028 tooltip => "Reason for and more info about your most recent death",
3029 },
3030 "c/say" => $SAY_CHANNEL,
3031 "c/chat" => $CHAT_CHANNEL,
2776); 3032);
2777 3033
2778sub cf::client::send_msg { 3034sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 3035 my ($self, $channel, $msg, $color, @extra) = @_;
2780 3036
2781 $msg = $self->pl->expand_cfpod ($msg); 3037 $msg = $self->pl->expand_cfpod ($msg)
3038 unless $color & cf::NDI_VERBATIM;
2782 3039
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 3040 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 3041
2785 # check predefined channels, for the benefit of C 3042 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 3043 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 3044 $channel = $CHANNEL{$channel};
2788 3045
2789 $self->ext_msg (channel_info => $channel) 3046 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 3047 $channel = $channel->{id};
2793 3048
2794 } elsif (ref $channel) { 3049 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 3050 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 3051 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 3052 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 3053 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 3054 }
2801 3055
2802 $channel = $channel->{id}; 3056 $channel = $channel->{id};
2803 } 3057 }
2804 3058
2805 return unless @extra || length $msg; 3059 return unless @extra || length $msg;
2806 3060
2807 if ($self->can_msg) {
2808 # default colour, mask it out 3061 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3062 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 3063 if $color & cf::NDI_DEF;
2811 3064
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3065 my $pkt = "msg "
3066 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3067 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 3068 );
2815 if ($color >= 0) {
2816 # replace some tags by gcfclient-compatible ones
2817 for ($msg) {
2818 1 while
2819 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2820 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2821 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2822 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2823 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2824 }
2825 3069
2826 $color &= cf::NDI_COLOR_MASK; 3070 $self->send_big_packet ($pkt);
2827
2828 utf8::encode $msg;
2829
2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2833 } else {
2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2835 $self->send_packet ("drawinfo $color $msg")
2836 }
2837 }
2838 }
2839} 3071}
2840 3072
2841=item $client->ext_msg ($type, @msg) 3073=item $client->ext_msg ($type, @msg)
2842 3074
2843Sends an ext event to the client. 3075Sends an ext event to the client.
2846 3078
2847sub cf::client::ext_msg($$@) { 3079sub cf::client::ext_msg($$@) {
2848 my ($self, $type, @msg) = @_; 3080 my ($self, $type, @msg) = @_;
2849 3081
2850 if ($self->extcmd == 2) { 3082 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove 3084 } elsif ($self->extcmd == 1) { # TODO: remove
2853 push @msg, msgtype => "event_$type"; 3085 push @msg, msgtype => "event_$type";
2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 } 3087 }
2856} 3088}
2857 3089
2858=item $client->ext_reply ($msgid, @msg) 3090=item $client->ext_reply ($msgid, @msg)
2859 3091
2863 3095
2864sub cf::client::ext_reply($$@) { 3096sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_; 3097 my ($self, $id, @msg) = @_;
2866 3098
2867 if ($self->extcmd == 2) { 3099 if ($self->extcmd == 2) {
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3100 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) { 3101 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove 3102 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id; 3103 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3104 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 } 3105 }
2874} 3106}
2875 3107
2876=item $success = $client->query ($flags, "text", \&cb) 3108=item $success = $client->query ($flags, "text", \&cb)
2877 3109
2948 3180
2949 $ns->ext_reply ($reply, @reply) 3181 $ns->ext_reply ($reply, @reply)
2950 if $reply; 3182 if $reply;
2951 3183
2952 } else { 3184 } else {
2953 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3185 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2954 } 3186 }
2955 3187
2956 cf::override; 3188 cf::override;
2957 }, 3189 },
2958); 3190);
2978 3210
2979 $coro 3211 $coro
2980} 3212}
2981 3213
2982cf::client->attach ( 3214cf::client->attach (
2983 on_destroy => sub { 3215 on_client_destroy => sub {
2984 my ($ns) = @_; 3216 my ($ns) = @_;
2985 3217
2986 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3218 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2987 }, 3219 },
2988); 3220);
3004our $safe_hole = new Safe::Hole; 3236our $safe_hole = new Safe::Hole;
3005 3237
3006$SIG{FPE} = 'IGNORE'; 3238$SIG{FPE} = 'IGNORE';
3007 3239
3008$safe->permit_only (Opcode::opset qw( 3240$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math 3241 :base_core :base_mem :base_orig :base_math :base_loop
3010 grepstart grepwhile mapstart mapwhile 3242 grepstart grepwhile mapstart mapwhile
3011 sort time 3243 sort time
3012)); 3244));
3013 3245
3014# here we export the classes and methods available to script code 3246# here we export the classes and methods available to script code
3017 3249
3018The following functions and methods are available within a safe environment: 3250The following functions and methods are available within a safe environment:
3019 3251
3020 cf::object 3252 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3253 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3254 insert remove name archname title slaying race decrease split
3255 value
3023 3256
3024 cf::object::player 3257 cf::object::player
3025 player 3258 player
3026 3259
3027 cf::player 3260 cf::player
3032 3265
3033=cut 3266=cut
3034 3267
3035for ( 3268for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3269 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3270 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3271 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3272 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3273 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3274 ["cf::map" => qw(trigger)],
3042) { 3275) {
3043 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3276 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3277 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3046 for @funs; 3278 for @funs;
3047} 3279}
3048 3280
3063 3295
3064 my $qcode = $code; 3296 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3297 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3298 $qcode =~ s/\n/\\n/g;
3067 3299
3300 %vars = (_dummy => 0) unless %vars;
3301
3302 my @res;
3068 local $_; 3303 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars;
3070 3304
3071 my $eval = 3305 my $eval =
3072 "do {\n" 3306 "do {\n"
3073 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3307 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3074 . "#line 0 \"{$qcode}\"\n" 3308 . "#line 0 \"{$qcode}\"\n"
3075 . $code 3309 . $code
3076 . "\n}" 3310 . "\n}"
3077 ; 3311 ;
3078 3312
3313 if ($CFG{safe_eval}) {
3079 sub_generation_inc; 3314 sub_generation_inc;
3315 local @safe::cf::_safe_eval_args = values %vars;
3080 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3316 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3081 sub_generation_inc; 3317 sub_generation_inc;
3318 } else {
3319 local @cf::_safe_eval_args = values %vars;
3320 @res = wantarray ? eval eval : scalar eval $eval;
3321 }
3082 3322
3083 if ($@) { 3323 if ($@) {
3084 warn "$@"; 3324 warn "$@",
3085 warn "while executing safe code '$code'\n"; 3325 "while executing safe code '$code'\n",
3086 warn "with arguments " . (join " ", %vars) . "\n"; 3326 "with arguments " . (join " ", %vars) . "\n";
3087 } 3327 }
3088 3328
3089 wantarray ? @res : $res[0] 3329 wantarray ? @res : $res[0]
3090} 3330}
3091 3331
3105=cut 3345=cut
3106 3346
3107sub register_script_function { 3347sub register_script_function {
3108 my ($fun, $cb) = @_; 3348 my ($fun, $cb) = @_;
3109 3349
3110 no strict 'refs'; 3350 $fun = "safe::$fun" if $CFG{safe_eval};
3111 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3351 *$fun = $safe_hole->wrap ($cb);
3112} 3352}
3113 3353
3114=back 3354=back
3115 3355
3116=cut 3356=cut
3125 # for this (global event?) 3365 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = (); 3366 %ext::player_env::MUSIC_FACE_CACHE = ();
3127 3367
3128 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3368 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3129 3369
3130 warn "loading facedata from $path\n"; 3370 trace "loading facedata from $path\n";
3131 3371
3132 my $facedata; 3372 my $facedata;
3133 0 < aio_load $path, $facedata 3373 0 < aio_load $path, $facedata
3134 or die "$path: $!"; 3374 or die "$path: $!";
3135 3375
3137 3377
3138 $facedata->{version} == 2 3378 $facedata->{version} == 2
3139 or cf::cleanup "$path: version mismatch, cannot proceed."; 3379 or cf::cleanup "$path: version mismatch, cannot proceed.";
3140 3380
3141 # patch in the exptable 3381 # patch in the exptable
3382 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3142 $facedata->{resource}{"res/exp_table"} = { 3383 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC, 3384 type => FT_RSRC,
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3385 data => $exp_table,
3386 hash => (Digest::MD5::md5 $exp_table),
3145 }; 3387 };
3146 cf::cede_to_tick; 3388 cf::cede_to_tick;
3147 3389
3148 { 3390 {
3149 my $faces = $facedata->{faceinfo}; 3391 my $faces = $facedata->{faceinfo};
3150 3392
3151 while (my ($face, $info) = each %$faces) { 3393 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3394 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3395
3153 cf::face::set_visibility $idx, $info->{visibility}; 3396 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3397 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3398 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3399 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3157 3400
3158 cf::cede_to_tick; 3401 cf::cede_to_tick;
3159 } 3402 }
3160 3403
3161 while (my ($face, $info) = each %$faces) { 3404 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3405 next unless $info->{smooth};
3406
3163 my $idx = cf::face::find $face 3407 my $idx = cf::face::find $face
3164 or next; 3408 or next;
3409
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3410 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3411 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3412 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3413 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3414 error "smooth face '$info->{smooth}' not found for face '$face'";
3170 } 3415 }
3171 3416
3172 cf::cede_to_tick; 3417 cf::cede_to_tick;
3173 } 3418 }
3174 } 3419 }
3183 3428
3184 cf::anim::invalidate_all; # d'oh 3429 cf::anim::invalidate_all; # d'oh
3185 } 3430 }
3186 3431
3187 { 3432 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3433 my $res = $facedata->{resource};
3191 3434
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3435 while (my ($name, $info) = each %$res) {
3436 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3437 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197 3438
3198 if ($info->{type} & 1) { 3439 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3199 # prepend meta info 3440 cf::face::set_type $idx, $info->{type};
3200
3201 my $meta = $enc->encode ({
3202 name => $name,
3203 %{ $info->{meta} || {} },
3204 });
3205
3206 $data = pack "(w/a*)*", $meta, $info->{data};
3207 } else { 3441 } else {
3208 $data = $info->{data}; 3442 $RESOURCE{$name} = $info; # unused
3209 } 3443 }
3210 3444
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick; 3445 cf::cede_to_tick;
3215 } 3446 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 } 3447 }
3448
3449 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3450
3236 1 3451 1
3237} 3452}
3238 3453
3239register_exticmd fx_want => sub { 3454register_exticmd fx_want => sub {
3241 3456
3242 while (my ($k, $v) = each %$want) { 3457 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3458 $ns->fx_want ($k, $v);
3244 } 3459 }
3245}; 3460};
3461
3462sub load_resource_file($) {
3463 my $guard = lock_acquire "load_resource_file";
3464
3465 my $status = load_resource_file_ $_[0];
3466 get_slot 0.1, 100;
3467 cf::arch::commit_load;
3468
3469 $status
3470}
3246 3471
3247sub reload_regions { 3472sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3473 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3474 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3475 %ext::player_env::MUSIC_FACE_CACHE = ();
3264} 3489}
3265 3490
3266sub reload_archetypes { 3491sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3492 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3493 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references
3270 # this really needs to be done in an extra post-pass
3271 # (which needs to be synchronous, so solve it differently)
3272 load_resource_file "$DATADIR/archetypes"
3273 or die "unable to load archetypes\n";
3274} 3494}
3275 3495
3276sub reload_treasures { 3496sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3497 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3498 or die "unable to load treasurelists\n";
3279} 3499}
3280 3500
3501sub reload_sound {
3502 trace "loading sound config from $DATADIR/sound\n";
3503
3504 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3505 or die "$DATADIR/sound $!";
3506
3507 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3508
3509 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3510 my $sound = $soundconf->{compat}[$_]
3511 or next;
3512
3513 my $face = cf::face::find "sound/$sound->[1]";
3514 cf::sound::set $sound->[0] => $face;
3515 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3516 }
3517
3518 while (my ($k, $v) = each %{$soundconf->{event}}) {
3519 my $face = cf::face::find "sound/$v";
3520 cf::sound::set $k => $face;
3521 }
3522}
3523
3281sub reload_resources { 3524sub reload_resources {
3282 warn "reloading resource files...\n"; 3525 trace "reloading resource files...\n";
3283 3526
3527 reload_facedata;
3528 reload_sound;
3529 reload_archetypes;
3284 reload_regions; 3530 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3531 reload_treasures;
3289 3532
3290 warn "finished reloading resource files\n"; 3533 trace "finished reloading resource files\n";
3291}
3292
3293sub init {
3294 reload_resources;
3295} 3534}
3296 3535
3297sub reload_config { 3536sub reload_config {
3537 trace "reloading config file...\n";
3538
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3539 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3540 or return;
3300 3541
3301 local $/; 3542 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3543 *CFG = YAML::XS::Load scalar <$fh>;
3303 3544
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3545 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3305 3546
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3547 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3307 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3548 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3308 3549
3309 if (exists $CFG{mlockall}) { 3550 if (exists $CFG{mlockall}) {
3311 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3552 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3312 and die "WARNING: m(un)lockall failed: $!\n"; 3553 and die "WARNING: m(un)lockall failed: $!\n";
3313 }; 3554 };
3314 warn $@ if $@; 3555 warn $@ if $@;
3315 } 3556 }
3557
3558 trace "finished reloading resource files\n";
3559}
3560
3561sub pidfile() {
3562 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3563 or die "$PIDFILE: $!";
3564 flock $fh, &Fcntl::LOCK_EX
3565 or die "$PIDFILE: flock: $!";
3566 $fh
3567}
3568
3569# make sure only one server instance is running at any one time
3570sub atomic {
3571 my $fh = pidfile;
3572
3573 my $pid = <$fh>;
3574 kill 9, $pid if $pid > 0;
3575
3576 seek $fh, 0, 0;
3577 print $fh $$;
3578}
3579
3580sub main_loop {
3581 trace "EV::loop starting\n";
3582 if (1) {
3583 EV::loop;
3584 }
3585 trace "EV::loop returned\n";
3586 goto &main_loop unless $REALLY_UNLOOP;
3316} 3587}
3317 3588
3318sub main { 3589sub main {
3590 cf::init_globals; # initialise logging
3591
3592 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3593 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3594 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3595 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3596
3597 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3598
3319 # we must not ever block the main coroutine 3599 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3600 local $Coro::idle = sub {
3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3601 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3322 (async { 3602 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3603 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3604 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3605 })->prio (Coro::PRIO_MAX);
3326 }; 3606 };
3327 3607
3608 evthread_start IO::AIO::poll_fileno;
3609
3610 cf::sync_job {
3611 cf::init_experience;
3612 cf::init_anim;
3613 cf::init_attackmess;
3614 cf::init_dynamic;
3615
3616 cf::load_settings;
3617 cf::load_materials;
3618
3619 reload_resources;
3328 reload_config; 3620 reload_config;
3329 db_init; 3621 db_init;
3622
3623 cf::init_uuid;
3624 cf::init_signals;
3625 cf::init_skills;
3626
3627 cf::init_beforeplay;
3628
3629 atomic;
3630
3330 load_extensions; 3631 load_extensions;
3331 3632
3332 $TICK_WATCHER->start; 3633 utime time, time, $RUNTIMEFILE;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3634
3334 EV::loop; 3635 # no (long-running) fork's whatsoever before this point(!)
3636 use POSIX ();
3637 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3638
3639 (pop @POST_INIT)->(0) while @POST_INIT;
3640 };
3641
3642 cf::object::thawer::errors_are_fatal 0;
3643 info "parse errors in files are no longer fatal from this point on.\n";
3644
3645 main_loop;
3335} 3646}
3336 3647
3337############################################################################# 3648#############################################################################
3338# initialisation and cleanup 3649# initialisation and cleanup
3339 3650
3340# install some emergency cleanup handlers 3651# install some emergency cleanup handlers
3341BEGIN { 3652BEGIN {
3342 our %SIGWATCHER = (); 3653 our %SIGWATCHER = ();
3343 for my $signal (qw(INT HUP TERM)) { 3654 for my $signal (qw(INT HUP TERM)) {
3344 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3655 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3345 cf::cleanup "SIG$signal"; 3656 cf::cleanup "SIG$signal";
3346 }; 3657 };
3347 } 3658 }
3348} 3659}
3349 3660
3350sub write_runtime { 3661sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime"; 3662 my $t0 = AE::time;
3352 3663
3353 # first touch the runtime file to show we are still running: 3664 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3665 # the fsync below can take a very very long time.
3355 3666
3356 IO::AIO::aio_utime $runtime, undef, undef; 3667 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3357 3668
3358 my $guard = cf::lock_acquire "write_runtime"; 3669 my $guard = cf::lock_acquire "write_runtime";
3359 3670
3360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3671 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3361 or return; 3672 or return;
3362 3673
3363 my $value = $cf::RUNTIME + 90 + 10; 3674 my $value = $cf::RUNTIME + 90 + 10;
3364 # 10 is the runtime save interval, for a monotonic clock 3675 # 10 is the runtime save interval, for a monotonic clock
3365 # 60 allows for the watchdog to kill the server. 3676 # 60 allows for the watchdog to kill the server.
3375 aio_utime $fh, undef, undef; 3686 aio_utime $fh, undef, undef;
3376 3687
3377 close $fh 3688 close $fh
3378 or return; 3689 or return;
3379 3690
3380 aio_rename "$runtime~", $runtime 3691 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3381 and return; 3692 and return;
3382 3693
3383 warn "runtime file written.\n"; 3694 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3384 3695
3385 1 3696 1
3697}
3698
3699our $uuid_lock;
3700our $uuid_skip;
3701
3702sub write_uuid_sync($) {
3703 $uuid_skip ||= $_[0];
3704
3705 return if $uuid_lock;
3706 local $uuid_lock = 1;
3707
3708 my $uuid = "$LOCALDIR/uuid";
3709
3710 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3711 or return;
3712
3713 my $value = uuid_seq uuid_cur;
3714
3715 unless ($value) {
3716 info "cowardly refusing to write zero uuid value!\n";
3717 return;
3718 }
3719
3720 my $value = uuid_str $value + $uuid_skip;
3721 $uuid_skip = 0;
3722
3723 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3724 and return;
3725
3726 # always fsync - this file is important
3727 aio_fsync $fh
3728 and return;
3729
3730 close $fh
3731 or return;
3732
3733 aio_rename "$uuid~", $uuid
3734 and return;
3735
3736 trace "uuid file written ($value).\n";
3737
3738 1
3739
3740}
3741
3742sub write_uuid($$) {
3743 my ($skip, $sync) = @_;
3744
3745 $sync ? write_uuid_sync $skip
3746 : async { write_uuid_sync $skip };
3386} 3747}
3387 3748
3388sub emergency_save() { 3749sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3750 my $freeze_guard = cf::freeze_mainloop;
3390 3751
3391 warn "enter emergency perl save\n"; 3752 info "emergency_perl_save: enter\n";
3753
3754 # this is a trade-off: we want to be very quick here, so
3755 # save all maps without fsync, and later call a global sync
3756 # (which in turn might be very very slow)
3757 local $USE_FSYNC = 0;
3392 3758
3393 cf::sync_job { 3759 cf::sync_job {
3760 cf::write_runtime_sync; # external watchdog should not bark
3761
3394 # use a peculiar iteration method to avoid tripping on perl 3762 # use a peculiar iteration method to avoid tripping on perl
3395 # refcount bugs in for. also avoids problems with players 3763 # refcount bugs in for. also avoids problems with players
3396 # and maps saved/destroyed asynchronously. 3764 # and maps saved/destroyed asynchronously.
3397 warn "begin emergency player save\n"; 3765 info "emergency_perl_save: begin player save\n";
3398 for my $login (keys %cf::PLAYER) { 3766 for my $login (keys %cf::PLAYER) {
3399 my $pl = $cf::PLAYER{$login} or next; 3767 my $pl = $cf::PLAYER{$login} or next;
3400 $pl->valid or next; 3768 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3769 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3402 $pl->save; 3770 $pl->save;
3403 } 3771 }
3404 warn "end emergency player save\n"; 3772 info "emergency_perl_save: end player save\n";
3405 3773
3406 warn "begin emergency map save\n"; 3774 cf::write_runtime_sync; # external watchdog should not bark
3775
3776 info "emergency_perl_save: begin map save\n";
3407 for my $path (keys %cf::MAP) { 3777 for my $path (keys %cf::MAP) {
3408 my $map = $cf::MAP{$path} or next; 3778 my $map = $cf::MAP{$path} or next;
3409 $map->valid or next; 3779 $map->valid or next;
3410 $map->save; 3780 $map->save;
3411 } 3781 }
3412 warn "end emergency map save\n"; 3782 info "emergency_perl_save: end map save\n";
3413 3783
3414 warn "begin emergency database checkpoint\n"; 3784 cf::write_runtime_sync; # external watchdog should not bark
3785
3786 info "emergency_perl_save: begin database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3787 BDB::db_env_txn_checkpoint $DB_ENV;
3416 warn "end emergency database checkpoint\n"; 3788 info "emergency_perl_save: end database checkpoint\n";
3789
3790 info "emergency_perl_save: begin write uuid\n";
3791 write_uuid_sync 1;
3792 info "emergency_perl_save: end write uuid\n";
3793
3794 cf::write_runtime_sync; # external watchdog should not bark
3795
3796 trace "emergency_perl_save: syncing database to disk";
3797 BDB::db_env_txn_checkpoint $DB_ENV;
3798
3799 info "emergency_perl_save: starting sync\n";
3800 IO::AIO::aio_sync sub {
3801 info "emergency_perl_save: finished sync\n";
3802 };
3803
3804 cf::write_runtime_sync; # external watchdog should not bark
3805
3806 trace "emergency_perl_save: flushing outstanding aio requests";
3807 while (IO::AIO::nreqs || BDB::nreqs) {
3808 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3809 }
3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3417 }; 3812 };
3418 3813
3419 warn "leave emergency perl save\n"; 3814 info "emergency_perl_save: leave\n";
3420} 3815}
3421 3816
3422sub post_cleanup { 3817sub post_cleanup {
3423 my ($make_core) = @_; 3818 my ($make_core) = @_;
3424 3819
3820 IO::AIO::flush;
3821
3425 warn Carp::longmess "post_cleanup backtrace" 3822 error Carp::longmess "post_cleanup backtrace"
3426 if $make_core; 3823 if $make_core;
3824
3825 my $fh = pidfile;
3826 unlink $PIDFILE if <$fh> == $$;
3827}
3828
3829# a safer delete_package, copied from Symbol
3830sub clear_package($) {
3831 my $pkg = shift;
3832
3833 # expand to full symbol table name if needed
3834 unless ($pkg =~ /^main::.*::$/) {
3835 $pkg = "main$pkg" if $pkg =~ /^::/;
3836 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3837 $pkg .= '::' unless $pkg =~ /::$/;
3838 }
3839
3840 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3841 my $stem_symtab = *{$stem}{HASH};
3842
3843 defined $stem_symtab and exists $stem_symtab->{$leaf}
3844 or return;
3845
3846 # clear all symbols
3847 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3848 for my $name (keys %$leaf_symtab) {
3849 _gv_clear *{"$pkg$name"};
3850# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3851 }
3427} 3852}
3428 3853
3429sub do_reload_perl() { 3854sub do_reload_perl() {
3430 # can/must only be called in main 3855 # can/must only be called in main
3431 if ($Coro::current != $Coro::main) { 3856 if (in_main) {
3432 warn "can only reload from main coroutine"; 3857 error "can only reload from main coroutine";
3433 return; 3858 return;
3434 } 3859 }
3435 3860
3861 return if $RELOAD++;
3862
3863 my $t1 = AE::time;
3864
3865 while ($RELOAD) {
3436 warn "reloading..."; 3866 info "reloading...";
3437 3867
3438 warn "entering sync_job"; 3868 trace "entering sync_job";
3439 3869
3440 cf::sync_job { 3870 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark
3442 cf::emergency_save; 3871 cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark
3444 3872
3445 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV;
3447
3448 # if anything goes wrong in here, we should simply crash as we already saved
3449
3450 warn "flushing outstanding aio requests";
3451 for (;;) {
3452 BDB::flush;
3453 IO::AIO::flush;
3454 Coro::cede_notself;
3455 last unless IO::AIO::nreqs || BDB::nreqs;
3456 warn "iterate...";
3457 }
3458
3459 ++$RELOAD;
3460
3461 warn "cancelling all extension coros"; 3873 trace "cancelling all extension coros";
3462 $_->cancel for values %EXT_CORO; 3874 $_->cancel for values %EXT_CORO;
3463 %EXT_CORO = (); 3875 %EXT_CORO = ();
3464 3876
3465 warn "removing commands"; 3877 trace "removing commands";
3466 %COMMAND = (); 3878 %COMMAND = ();
3467 3879
3468 warn "removing ext/exti commands"; 3880 trace "removing ext/exti commands";
3469 %EXTCMD = (); 3881 %EXTCMD = ();
3470 %EXTICMD = (); 3882 %EXTICMD = ();
3471 3883
3472 warn "unloading/nuking all extensions"; 3884 trace "unloading/nuking all extensions";
3473 for my $pkg (@EXTS) { 3885 for my $pkg (@EXTS) {
3474 warn "... unloading $pkg"; 3886 trace "... unloading $pkg";
3475 3887
3476 if (my $cb = $pkg->can ("unload")) { 3888 if (my $cb = $pkg->can ("unload")) {
3477 eval { 3889 eval {
3478 $cb->($pkg); 3890 $cb->($pkg);
3479 1 3891 1
3480 } or warn "$pkg unloaded, but with errors: $@"; 3892 } or error "$pkg unloaded, but with errors: $@";
3893 }
3894
3895 trace "... clearing $pkg";
3896 clear_package $pkg;
3481 } 3897 }
3482 3898
3483 warn "... nuking $pkg";
3484 Symbol::delete_package $pkg;
3485 }
3486
3487 warn "unloading all perl modules loaded from $LIBDIR"; 3899 trace "unloading all perl modules loaded from $LIBDIR";
3488 while (my ($k, $v) = each %INC) { 3900 while (my ($k, $v) = each %INC) {
3489 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3901 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3490 3902
3491 warn "... unloading $k"; 3903 trace "... unloading $k";
3492 delete $INC{$k}; 3904 delete $INC{$k};
3493 3905
3494 $k =~ s/\.pm$//; 3906 $k =~ s/\.pm$//;
3495 $k =~ s/\//::/g; 3907 $k =~ s/\//::/g;
3496 3908
3497 if (my $cb = $k->can ("unload_module")) { 3909 if (my $cb = $k->can ("unload_module")) {
3498 $cb->(); 3910 $cb->();
3911 }
3912
3913 clear_package $k;
3499 } 3914 }
3500 3915
3501 Symbol::delete_package $k;
3502 }
3503
3504 warn "getting rid of safe::, as good as possible"; 3916 trace "getting rid of safe::, as good as possible";
3505 Symbol::delete_package "safe::$_" 3917 clear_package "safe::$_"
3506 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3918 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3507 3919
3508 warn "unloading cf.pm \"a bit\""; 3920 trace "unloading cf.pm \"a bit\"";
3509 delete $INC{"cf.pm"}; 3921 delete $INC{"cf.pm"};
3510 delete $INC{"cf/pod.pm"}; 3922 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3511 3923
3512 # don't, removes xs symbols, too, 3924 # don't, removes xs symbols, too,
3513 # and global variables created in xs 3925 # and global variables created in xs
3514 #Symbol::delete_package __PACKAGE__; 3926 #clear_package __PACKAGE__;
3515 3927
3516 warn "unload completed, starting to reload now"; 3928 info "unload completed, starting to reload now";
3517 3929
3518 warn "reloading cf.pm"; 3930 trace "reloading cf.pm";
3519 require cf; 3931 require cf;
3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3932 cf::_connect_to_perl_1;
3521 3933
3522 warn "loading config and database again"; 3934 trace "loading config and database again";
3523 cf::reload_config; 3935 cf::reload_config;
3524 3936
3525 warn "loading extensions"; 3937 trace "loading extensions";
3526 cf::load_extensions; 3938 cf::load_extensions;
3527 3939
3940 if ($REATTACH_ON_RELOAD) {
3528 warn "reattaching attachments to objects/players"; 3941 trace "reattaching attachments to objects/players";
3529 _global_reattach; # objects, sockets 3942 _global_reattach; # objects, sockets
3530 warn "reattaching attachments to maps"; 3943 trace "reattaching attachments to maps";
3531 reattach $_ for values %MAP; 3944 reattach $_ for values %MAP;
3532 warn "reattaching attachments to players"; 3945 trace "reattaching attachments to players";
3533 reattach $_ for values %PLAYER; 3946 reattach $_ for values %PLAYER;
3947 }
3534 3948
3949 trace "running post_init jobs";
3950 (pop @POST_INIT)->(1) while @POST_INIT;
3951
3535 warn "leaving sync_job"; 3952 trace "leaving sync_job";
3536 3953
3537 1 3954 1
3538 } or do { 3955 } or do {
3539 warn $@; 3956 error $@;
3540 warn "error while reloading, exiting."; 3957 cf::cleanup "error while reloading, exiting.";
3541 exit 1; 3958 };
3959
3960 info "reloaded";
3961 --$RELOAD;
3542 }; 3962 }
3543 3963
3544 warn "reloaded"; 3964 $t1 = AE::time - $t1;
3965 info "reload completed in ${t1}s\n";
3545}; 3966};
3546 3967
3547our $RELOAD_WATCHER; # used only during reload 3968our $RELOAD_WATCHER; # used only during reload
3548 3969
3549sub reload_perl() { 3970sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 3971 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 3972 # coro crashes during coro_state_free->destroy here.
3552 3973
3974 $RELOAD_WATCHER ||= cf::async {
3975 Coro::AIO::aio_wait cache_extensions;
3976
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3977 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3978 do_reload_perl;
3554 undef $RELOAD_WATCHER; 3979 undef $RELOAD_WATCHER;
3555 do_reload_perl; 3980 };
3556 }; 3981 };
3557} 3982}
3558 3983
3559register_command "reload" => sub { 3984register_command "reload" => sub {
3560 my ($who, $arg) = @_; 3985 my ($who, $arg) = @_;
3574 3999
3575our @WAIT_FOR_TICK; 4000our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN; 4001our @WAIT_FOR_TICK_BEGIN;
3577 4002
3578sub wait_for_tick { 4003sub wait_for_tick {
3579 return unless $TICK_WATCHER->is_active;
3580 return if $Coro::current == $Coro::main; 4004 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3581 4005
3582 my $signal = new Coro::Signal; 4006 my $signal = new Coro::Signal;
3583 push @WAIT_FOR_TICK, $signal; 4007 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait; 4008 $signal->wait;
3585} 4009}
3586 4010
3587sub wait_for_tick_begin { 4011sub wait_for_tick_begin {
3588 return unless $TICK_WATCHER->is_active;
3589 return if $Coro::current == $Coro::main; 4012 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3590 4013
3591 my $signal = new Coro::Signal; 4014 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 4015 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 4016 $signal->wait;
3594} 4017}
3595 4018
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4019sub tick {
3597 if ($Coro::current != $Coro::main) { 4020 if ($Coro::current != $Coro::main) {
3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4021 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3599 unless ++$bug_warning > 10; 4022 unless ++$bug_warning > 10;
3600 return; 4023 return;
3601 } 4024 }
3602 4025
3603 $NOW = $tick_start = EV::now;
3604
3605 cf::server_tick; # one server iteration 4026 cf::server_tick; # one server iteration
3606 4027
3607 $RUNTIME += $TICK; 4028 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3608 $NEXT_TICK += $TICK;
3609 4029
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4030 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 4031 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 4032 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 4033 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 4034 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 4035 or error "ERROR: unable to write runtime file: $!";
3616 }; 4036 };
3617 } 4037 }
3618 4038
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4039 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3620 $sig->send; 4040 $sig->send;
3621 } 4041 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 4042 while (my $sig = shift @WAIT_FOR_TICK) {
3623 $sig->send; 4043 $sig->send;
3624 } 4044 }
3625 4045
3626 $LOAD = ($NOW - $tick_start) / $TICK; 4046 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4047 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 4048
3629 _post_tick; 4049 if (0) {
3630}; 4050 if ($NEXT_TICK) {
3631$TICK_WATCHER->priority (EV::MAXPRI); 4051 my $jitter = $TICK_START - $NEXT_TICK;
4052 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4053 debug "jitter $JITTER\n";#d#
4054 }
4055 }
4056}
3632 4057
3633{ 4058{
4059 # configure BDB
4060
3634 BDB::min_parallel 8; 4061 BDB::min_parallel 16;
3635 BDB::max_poll_time $TICK * 0.1; 4062 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 4063 $AnyEvent::BDB::WATCHER->priority (1);
3637
3638 BDB::set_sync_prepare {
3639 my $status;
3640 my $current = $Coro::current;
3641 (
3642 sub {
3643 $status = $!;
3644 $current->ready; undef $current;
3645 },
3646 sub {
3647 Coro::schedule while defined $current;
3648 $! = $status;
3649 },
3650 )
3651 };
3652 4064
3653 unless ($DB_ENV) { 4065 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4066 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4067 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4068 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4069 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4070 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4071 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4072
3660 cf::sync_job { 4073 cf::sync_job {
3661 eval { 4074 eval {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4096 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 4097 };
3685} 4098}
3686 4099
3687{ 4100{
4101 # configure IO::AIO
4102
3688 IO::AIO::min_parallel 8; 4103 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4104 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 4105 undef $AnyEvent::AIO::WATCHER;
3693} 4106}
3694 4107
3695my $_log_backtrace; 4108my $_log_backtrace;
3696 4109
3697sub _log_backtrace { 4110sub _log_backtrace {
3700 $msg =~ s/\n//; 4113 $msg =~ s/\n//;
3701 4114
3702 # limit the # of concurrent backtraces 4115 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4116 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4117 ++$_log_backtrace;
4118 my $perl_bt = Carp::longmess $msg;
3705 async { 4119 async {
3706 $Coro::current->{desc} = "abt $msg"; 4120 $Coro::current->{desc} = "abt $msg";
3707 4121
3708 my @bt = fork_call { 4122 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4123 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4134 }
3721 4135
3722 @funcs 4136 @funcs
3723 }; 4137 };
3724 4138
3725 LOG llevInfo, "[ABT] $msg\n"; 4139 LOG llevInfo, "[ABT] $perl_bt\n";
4140 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4141 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4142 --$_log_backtrace;
3728 }; 4143 };
3729 } else { 4144 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4145 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4146 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4147 }
3733} 4148}
3734 4149
3735# load additional modules 4150# load additional modules
3736use cf::pod; 4151require "cf/$_.pm" for @EXTRA_MODULES;
4152cf::_connect_to_perl_2;
3737 4153
3738END { cf::emergency_save } 4154END { cf::emergency_save }
3739 4155
37401 41561
3741 4157

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines