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.405 by root, Mon Dec 17 08:03:22 2007 UTC vs.
Revision 1.473 by root, Fri Jun 26 16:32:10 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict qw(vars subs);
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use EV 1.86; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
37use Guard ();
15use Coro 4.32 (); 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;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5; 56use Digest::MD5;
31use Fcntl; 57use Fcntl;
32use YAML::Syck (); 58use YAML ();
33use IO::AIO 2.51 (); 59use IO::AIO ();
34use Time::HiRes; 60use Time::HiRes;
35use Compress::LZF; 61use Compress::LZF;
36use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
37 65
38# configure various modules to our taste 66# configure various modules to our taste
39# 67#
40$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 76
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 78
51our %COMMAND = (); 79our %COMMAND = ();
52our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
55our %EXTCMD = (); 83our %EXTCMD = ();
56our %EXTICMD = (); 84our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
59 87
60our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 89our @EVENT;
62 90
63our $CONFDIR = confdir; 91our $CONFDIR = confdir;
64our $DATADIR = datadir; 92our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
74our %RESOURCE; 105our %RESOURCE;
75 106
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 109our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default on
82 111
83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 115our $DB_ENV;
88 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
89our %CFG; 119our %CFG;
90 120
91our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 122our $RUNTIME;
93our $NOW; 123our $NOW;
99# used to convert map paths into valid unix filenames by replacing / by ∕ 129# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 130our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 131
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
134our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
105 140
106binmode STDOUT; 141binmode STDOUT;
107binmode STDERR; 142binmode STDERR;
108 143
109# read virtual server time, if available 144# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
114} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
115 152
116mkdir $_ 153mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 155
119our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 231
195 LOG llevError, $msg; 232 LOG llevError, $msg;
196 }; 233 };
197} 234}
235
236$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "=="
238
239 if ($Coro::current == $Coro::main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d#
242 }#d#
243
244 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate
247};
248
249$SIG{__DIE__} = sub { }; #d#?
198 250
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 261for my $pkg (qw(
210 cf::global cf::attachable 262 cf::global cf::attachable
211 cf::object cf::object::player 263 cf::object cf::object::player
212 cf::client cf::player 264 cf::client cf::player
213 cf::arch cf::living 265 cf::arch cf::living
266 cf::map cf::mapspace
214 cf::map cf::party cf::region 267 cf::party cf::region
215)) { 268)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 270}
219 271
220$EV::DIED = sub { 272$EV::DIED = sub {
221 warn "error in event callback: @_"; 273 warn "error in event callback: @_";
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 316
265sub encode_json($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
266sub decode_json($) { $json_coder->decode ($_[0]) } 318sub decode_json($) { $json_coder->decode ($_[0]) }
267 319
320=item cf::post_init { BLOCK }
321
322Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again.
324
325The cdoeblock will have a single boolean argument to indicate whether this
326is a reload or not.
327
328=cut
329
330sub post_init(&) {
331 push @POST_INIT, shift;
332}
333
268=item cf::lock_wait $string 334=item cf::lock_wait $string
269 335
270Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
271 337
272=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
273 339
274Wait until the given lock is available and then acquires it and returns 340Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
277returned. 343returned.
278 344
279Locks are *not* recursive, locking from the same coro twice results in a 345Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 346deadlocked coro.
286 352
287Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
288 354
289=cut 355=cut
290 356
291our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 358
294sub lock_wait($) { 359sub lock_wait($) {
295 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 361}
308 362
309sub lock_acquire($) { 363sub lock_acquire($) {
310 my ($key) = @_; 364 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 365}
324 366
325sub lock_active($) { 367sub lock_active($) {
326 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 369}
330 370
331sub freeze_mainloop { 371sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 372 tick_inhibit_inc;
333 373
334 my $guard = Coro::guard { 374 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start;
336 };
337 $TICK_WATCHER->stop;
338 $guard
339} 375}
340 376
341=item cf::periodic $interval, $cb 377=item cf::periodic $interval, $cb
342 378
343Like EV::periodic, but randomly selects a starting point so that the actions 379Like EV::periodic, but randomly selects a starting point so that the actions
398 } 434 }
399 } 435 }
400}; 436};
401 437
402sub get_slot($;$$) { 438sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main;
440
403 my ($time, $pri, $name) = @_; 441 my ($time, $pri, $name) = @_;
404 442
405 $time = $TICK * .6 if $time > $TICK * .6; 443 $time = $TICK * .6 if $time > $TICK * .6;
406 my $sig = new Coro::Signal; 444 my $sig = new Coro::Signal;
407 445
444 # this is the main coro, too bad, we have to block 482 # this is the main coro, too bad, we have to block
445 # till the operation succeeds, freezing the server :/ 483 # till the operation succeeds, freezing the server :/
446 484
447 LOG llevError, Carp::longmess "sync job";#d# 485 LOG llevError, Carp::longmess "sync job";#d#
448 486
449 # TODO: use suspend/resume instead
450 # (but this is cancel-safe)
451 my $freeze_guard = freeze_mainloop; 487 my $freeze_guard = freeze_mainloop;
452 488
453 my $busy = 1; 489 my $busy = 1;
454 my @res; 490 my @res;
455 491
466 } else { 502 } else {
467 EV::loop EV::LOOP_ONESHOT; 503 EV::loop EV::LOOP_ONESHOT;
468 } 504 }
469 } 505 }
470 506
471 $time = EV::time - $time; 507 my $time = EV::time - $time;
472 508
473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
475
476 $tick_start += $time; # do not account sync jobs to server load 509 $TICK_START += $time; # do not account sync jobs to server load
477 510
478 wantarray ? @res : $res[0] 511 wantarray ? @res : $res[0]
479 } else { 512 } else {
480 # we are in another coroutine, how wonderful, everything just works 513 # we are in another coroutine, how wonderful, everything just works
481 514
523 reset_signals; 556 reset_signals;
524 &$cb 557 &$cb
525 }, @args; 558 }, @args;
526 559
527 wantarray ? @res : $res[-1] 560 wantarray ? @res : $res[-1]
561}
562
563=item $coin = coin_from_name $name
564
565=cut
566
567our %coin_alias = (
568 "silver" => "silvercoin",
569 "silvercoin" => "silvercoin",
570 "silvercoins" => "silvercoin",
571 "gold" => "goldcoin",
572 "goldcoin" => "goldcoin",
573 "goldcoins" => "goldcoin",
574 "platinum" => "platinacoin",
575 "platinumcoin" => "platinacoin",
576 "platinumcoins" => "platinacoin",
577 "platina" => "platinacoin",
578 "platinacoin" => "platinacoin",
579 "platinacoins" => "platinacoin",
580 "royalty" => "royalty",
581 "royalties" => "royalty",
582);
583
584sub coin_from_name($) {
585 $coin_alias{$_[0]}
586 ? cf::arch::find $coin_alias{$_[0]}
587 : undef
528} 588}
529 589
530=item $value = cf::db_get $family => $key 590=item $value = cf::db_get $family => $key
531 591
532Returns a single value from the environment database. 592Returns a single value from the environment database.
671 731
672############################################################################# 732#############################################################################
673 733
674=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
675 735
676Many objects in crossfire are so-called attachable objects. That means you can 736Many objects in deliantra are so-called attachable objects. That means you can
677attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
678to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
679 739
680In the following description, CLASS can be any of C<global>, C<object> 740In the following description, CLASS can be any of C<global>, C<object>
681C<player>, C<client> or C<map> (i.e. the attachable objects in 741C<player>, C<client> or C<map> (i.e. the attachable objects in
731=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
732 792
733Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
734given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
735 795
736Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
737that are attached at load/instantiate time, thus the need for a name. 797that are attached at load/instantiate time, thus the need for a name.
738 798
739These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
740 800
741=over 4 801=over 4
969 } 1029 }
970 1030
971 0 1031 0
972} 1032}
973 1033
974=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
975 1035
976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
977 1037
978Generate an object-specific event with the given arguments. 1038Generate an object-specific event with the given arguments.
979 1039
1032 1092
1033sub reattach { 1093sub reattach {
1034 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
1035 my ($obj) = @_; 1095 my ($obj) = @_;
1036 1096
1097 # no longer needed after getting rid of delete_package?
1037 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1098 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1038 1099
1039 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
1040 1101
1041 @$registry = (); 1102 @$registry = ();
1042 1103
1088 utf8::decode (my $decname = $filename); 1149 utf8::decode (my $decname = $filename);
1089 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
1090 $decname, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
1091 1152
1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1093 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1095 aio_fsync $fh if $cf::USE_FSYNC; 1156 if ($cf::USE_FSYNC) {
1157 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;
1158 aio_fsync $fh;
1159 }
1096 close $fh; 1160 aio_close $fh;
1097 1161
1098 if (@$objs) { 1162 if (@$objs) {
1099 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1163 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1100 chmod SAVE_MODE, $fh; 1164 aio_chmod $fh, SAVE_MODE;
1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1102 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
1103 aio_fsync $fh if $cf::USE_FSYNC; 1167 if ($cf::USE_FSYNC) {
1168 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;
1169 aio_fsync $fh;
1170 }
1104 close $fh; 1171 aio_close $fh;
1105 aio_rename "$filename.pst~", "$filename.pst"; 1172 aio_rename "$filename.pst~", "$filename.pst";
1106 } 1173 }
1107 } else { 1174 } else {
1108 aio_unlink "$filename.pst"; 1175 aio_unlink "$filename.pst";
1109 } 1176 }
1110 1177
1111 aio_rename "$filename~", $filename; 1178 aio_rename "$filename~", $filename;
1179
1180 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC;
1112 } else { 1182 } else {
1113 warn "FATAL: $filename~: $!\n"; 1183 warn "unable to save objects: $filename~: $!\n";
1114 } 1184 }
1115 } else { 1185 } else {
1116 aio_unlink $filename; 1186 aio_unlink $filename;
1117 aio_unlink "$filename.pst"; 1187 aio_unlink "$filename.pst";
1118 } 1188 }
1209 my ($name, $cb) = @_; 1279 my ($name, $cb) = @_;
1210 1280
1211 $EXTICMD{$name} = $cb; 1281 $EXTICMD{$name} = $cb;
1212} 1282}
1213 1283
1284use File::Glob ();
1285
1214cf::player->attach ( 1286cf::player->attach (
1215 on_command => sub { 1287 on_command => sub {
1216 my ($pl, $name, $params) = @_; 1288 my ($pl, $name, $params) = @_;
1217 1289
1218 my $cb = $COMMAND{$name} 1290 my $cb = $COMMAND{$name}
1250 1322
1251 cf::override; 1323 cf::override;
1252 }, 1324 },
1253); 1325);
1254 1326
1327# "readahead" all extensions
1328sub cache_extensions {
1329 my $grp = IO::AIO::aio_group;
1330
1331 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1332 for (grep /\.ext$/, @{$_[0]}) {
1333 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1334 }
1335 };
1336
1337 $grp
1338}
1339
1255sub load_extensions { 1340sub load_extensions {
1256 cf::sync_job { 1341 cf::sync_job {
1257 my %todo; 1342 my %todo;
1258 1343
1259 for my $path (<$LIBDIR/*.ext>) { 1344 for my $path (<$LIBDIR/*.ext>) {
1278 1363
1279 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1364 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1280 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1365 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1281 1366
1282 $ext{source} = 1367 $ext{source} =
1283 "package $pkg; use strict; use utf8;\n" 1368 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1284 . "#line 1 \"$path\"\n{\n" 1369 . "#line 1 \"$path\"\n{\n"
1285 . $source 1370 . $source
1286 . "\n};\n1"; 1371 . "\n};\n1";
1287 1372
1288 $todo{$base} = \%ext; 1373 $todo{$base} = \%ext;
1304 my $msg = $@ ? "$v->{path}: $@\n" 1389 my $msg = $@ ? "$v->{path}: $@\n"
1305 : "$v->{base}: extension inactive.\n"; 1390 : "$v->{base}: extension inactive.\n";
1306 1391
1307 if (exists $v->{meta}{mandatory}) { 1392 if (exists $v->{meta}{mandatory}) {
1308 warn $msg; 1393 warn $msg;
1309 warn "mandatory extension failed to load, exiting.\n"; 1394 cf::cleanup "mandatory extension failed to load, exiting.";
1310 exit 1;
1311 } 1395 }
1312 1396
1313 warn $msg; 1397 warn $msg;
1314 } 1398 }
1315 1399
1329 1413
1330=back 1414=back
1331 1415
1332=head2 CORE EXTENSIONS 1416=head2 CORE EXTENSIONS
1333 1417
1334Functions and methods that extend core crossfire objects. 1418Functions and methods that extend core deliantra objects.
1335 1419
1336=cut 1420=cut
1337 1421
1338package cf::player; 1422package cf::player;
1339 1423
1382 1466
1383sub exists($) { 1467sub exists($) {
1384 my ($login) = @_; 1468 my ($login) = @_;
1385 1469
1386 $cf::PLAYER{$login} 1470 $cf::PLAYER{$login}
1387 or cf::sync_job { !aio_stat path $login } 1471 or !aio_stat path $login
1388} 1472}
1389 1473
1390sub find($) { 1474sub find($) {
1391 return $cf::PLAYER{$_[0]} || do { 1475 return $cf::PLAYER{$_[0]} || do {
1392 my $login = $_[0]; 1476 my $login = $_[0];
1404 my $f = new_from_file cf::object::thawer path $login 1488 my $f = new_from_file cf::object::thawer path $login
1405 or return; 1489 or return;
1406 1490
1407 my $pl = cf::player::load_pl $f 1491 my $pl = cf::player::load_pl $f
1408 or return; 1492 or return;
1493
1409 local $cf::PLAYER_LOADING{$login} = $pl; 1494 local $cf::PLAYER_LOADING{$login} = $pl;
1410 $f->resolve_delayed_derefs; 1495 $f->resolve_delayed_derefs;
1411 $cf::PLAYER{$login} = $pl 1496 $cf::PLAYER{$login} = $pl
1412 } 1497 }
1413 } 1498 }
1423 1508
1424 return if $pl->{deny_save}; 1509 return if $pl->{deny_save};
1425 1510
1426 aio_mkdir playerdir $pl, 0770; 1511 aio_mkdir playerdir $pl, 0770;
1427 $pl->{last_save} = $cf::RUNTIME; 1512 $pl->{last_save} = $cf::RUNTIME;
1513
1514 cf::get_slot 0.01;
1428 1515
1429 $pl->save_pl ($path); 1516 $pl->save_pl ($path);
1430 cf::cede_to_tick; 1517 cf::cede_to_tick;
1431} 1518}
1432 1519
1464 my ($pl) = @_; 1551 my ($pl) = @_;
1465 1552
1466 my $name = $pl->ob->name; 1553 my $name = $pl->ob->name;
1467 1554
1468 $pl->{deny_save} = 1; 1555 $pl->{deny_save} = 1;
1469 $pl->password ("*"); # this should lock out the player until we nuked the dir 1556 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1470 1557
1471 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1472 $pl->deactivate; 1559 $pl->deactivate;
1560 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1561 $pl->ob->check_score;
1473 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1562 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1474 $pl->ns->destroy if $pl->ns; 1563 $pl->ns->destroy if $pl->ns;
1475 1564
1476 my $path = playerdir $pl; 1565 my $path = playerdir $pl;
1477 my $temp = "$path~$cf::RUNTIME~deleting~"; 1566 my $temp = "$path~$cf::RUNTIME~deleting~";
1516 1605
1517 for my $login (@$dirs) { 1606 for my $login (@$dirs) {
1518 my $path = path $login; 1607 my $path = path $login;
1519 1608
1520 # a .pst is a dead give-away for a valid player 1609 # a .pst is a dead give-away for a valid player
1521 unless (-e "$path.pst") { 1610 # if no pst file found, open and chekc for blocked users
1611 if (aio_stat "$path.pst") {
1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1612 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1523 aio_read $fh, 0, 512, my $buf, 0 or next; 1613 aio_read $fh, 0, 512, my $buf, 0 or next;
1524 $buf !~ /^password -------------$/m or next; # official not-valid tag 1614 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 } 1615 }
1526 1616
1557 } 1647 }
1558 1648
1559 \@paths 1649 \@paths
1560} 1650}
1561 1651
1562=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1652=item $protocol_xml = $player->expand_cfpod ($cfpod)
1563 1653
1564Expand crossfire pod fragments into protocol xml. 1654Expand deliantra pod fragments into protocol xml.
1565
1566=cut
1567
1568use re 'eval';
1569
1570my $group;
1571my $interior; $interior = qr{
1572 # match a pod interior sequence sans C<< >>
1573 (?:
1574 \ (.*?)\ (?{ $group = $^N })
1575 | < (??{$interior}) >
1576 )
1577}x;
1578
1579sub expand_cfpod {
1580 my ($self, $pod) = @_;
1581
1582 my $xml;
1583
1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1587
1588 $group =~ s/&/&amp;/g;
1589 $group =~ s/</&lt;/g;
1590
1591 $xml .= $group;
1592 } elsif ($pod =~ m%\G
1593 ([BCGHITU])
1594 <
1595 (?:
1596 ([^<>]*) (?{ $group = $^N })
1597 | < $interior >
1598 )
1599 >
1600 %gcsx
1601 ) {
1602 my ($code, $data) = ($1, $group);
1603
1604 if ($code eq "B") {
1605 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1606 } elsif ($code eq "I") {
1607 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1608 } elsif ($code eq "U") {
1609 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1610 } elsif ($code eq "C") {
1611 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1612 } elsif ($code eq "T") {
1613 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1614 } elsif ($code eq "G") {
1615 my ($male, $female) = split /\|/, $data;
1616 $data = $self->gender ? $female : $male;
1617 $xml .= expand_cfpod ($self, $data);
1618 } elsif ($code eq "H") {
1619 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1621 "")
1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1631 }
1632 }
1633
1634 for ($xml) {
1635 # create single paragraphs (very hackish)
1636 s/(?<=\S)\n(?=\w)/ /g;
1637
1638 # compress some whitespace
1639 s/\s+\n/\n/g; # ws line-ends
1640 s/\n\n+/\n/g; # double lines
1641 s/^\n+//; # beginning lines
1642 s/\n+$//; # ending lines
1643 }
1644
1645 $xml
1646}
1647
1648no re 'eval';
1649
1650sub hintmode {
1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1652 $_[0]{hintmode}
1653}
1654 1655
1655=item $player->ext_reply ($msgid, @msg) 1656=item $player->ext_reply ($msgid, @msg)
1656 1657
1657Sends an ext reply to the player. 1658Sends an ext reply to the player.
1658 1659
1725our $MAX_RESET = 3600; 1726our $MAX_RESET = 3600;
1726our $DEFAULT_RESET = 3000; 1727our $DEFAULT_RESET = 3000;
1727 1728
1728sub generate_random_map { 1729sub generate_random_map {
1729 my ($self, $rmp) = @_; 1730 my ($self, $rmp) = @_;
1731
1732 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1733
1730 # mit "rum" bekleckern, nicht 1734 # mit "rum" bekleckern, nicht
1731 $self->_create_random_map ( 1735 $self->_create_random_map (
1732 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1733 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1734 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1856 1860
1857# the temporary/swap location 1861# the temporary/swap location
1858sub save_path { 1862sub save_path {
1859 my ($self) = @_; 1863 my ($self) = @_;
1860 1864
1861 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1862 "$TMPDIR/$path.map" 1866 "$TMPDIR/$path.map"
1863} 1867}
1864 1868
1865# the unique path, undef == no special unique path 1869# the unique path, undef == no special unique path
1866sub uniq_path { 1870sub uniq_path {
1867 my ($self) = @_; 1871 my ($self) = @_;
1868 1872
1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1870 "$UNIQUEDIR/$path" 1874 "$UNIQUEDIR/$path"
1871}
1872
1873# and all this just because we cannot iterate over
1874# all maps in C++...
1875sub change_all_map_light {
1876 my ($change) = @_;
1877
1878 $_->change_map_light ($change)
1879 for grep $_->outdoor, values %cf::MAP;
1880} 1875}
1881 1876
1882sub decay_objects { 1877sub decay_objects {
1883 my ($self) = @_; 1878 my ($self) = @_;
1884 1879
1968sub find { 1963sub find {
1969 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1970 1965
1971 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1972 1967
1973 cf::lock_wait "map_data:$path";#d#remove 1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1974 cf::lock_wait "map_find:$path"; 1969 my $guard2 = cf::lock_acquire "map_find:$path";
1975 1970
1976 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1977 my $guard1 = cf::lock_acquire "map_find:$path";
1978 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1979
1980 my $map = new_from_path cf::map $path 1972 my $map = new_from_path cf::map $path
1981 or return; 1973 or return;
1982 1974
1983 $map->{last_save} = $cf::RUNTIME; 1975 $map->{last_save} = $cf::RUNTIME;
1984 1976
1986 or return; 1978 or return;
1987 1979
1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1980 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1989 # doing this can freeze the server in a sync job, obviously 1981 # doing this can freeze the server in a sync job, obviously
1990 #$cf::WAIT_FOR_TICK->wait; 1982 #$cf::WAIT_FOR_TICK->wait;
1983 undef $guard2;
1991 undef $guard1; 1984 undef $guard1;
1992 undef $guard2;
1993 $map->reset; 1985 $map->reset;
1994 return find $path; 1986 return find $path;
1995 } 1987 }
1996 1988
1997 $cf::MAP{$path} = $map 1989 $cf::MAP{$path} = $map
2024 my $f = new_from_file cf::object::thawer $self->{load_path}; 2016 my $f = new_from_file cf::object::thawer $self->{load_path};
2025 $f->skip_block; 2017 $f->skip_block;
2026 $self->_load_objects ($f) 2018 $self->_load_objects ($f)
2027 or return; 2019 or return;
2028 2020
2029 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2021 $self->post_load_original
2030 if delete $self->{load_original}; 2022 if delete $self->{load_original};
2031 2023
2032 if (my $uniq = $self->uniq_path) { 2024 if (my $uniq = $self->uniq_path) {
2033 utf8::encode $uniq; 2025 utf8::encode $uniq;
2034 unless (aio_stat $uniq) { 2026 unless (aio_stat $uniq) {
2052 unless ($self->{deny_activate}) { 2044 unless ($self->{deny_activate}) {
2053 $self->decay_objects; 2045 $self->decay_objects;
2054 $self->fix_auto_apply; 2046 $self->fix_auto_apply;
2055 $self->update_buttons; 2047 $self->update_buttons;
2056 cf::cede_to_tick; 2048 cf::cede_to_tick;
2057 $self->set_darkness_map;
2058 cf::cede_to_tick;
2059 $self->activate; 2049 $self->activate;
2060 } 2050 }
2061 2051
2062 $self->{last_save} = $cf::RUNTIME; 2052 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME); 2053 $self->last_access ($cf::RUNTIME);
2064 2054
2065 $self->in_memory (cf::MAP_IN_MEMORY); 2055 $self->in_memory (cf::MAP_ACTIVE);
2066 } 2056 }
2067 2057
2068 $self->post_load; 2058 $self->post_load;
2069} 2059}
2070 2060
2128 my ($path, $origin, $load) = @_; 2118 my ($path, $origin, $load) = @_;
2129 2119
2130 $path = normalise $path, $origin && $origin->{path}; 2120 $path = normalise $path, $origin && $origin->{path};
2131 2121
2132 if (my $map = $cf::MAP{$path}) { 2122 if (my $map = $cf::MAP{$path}) {
2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2123 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2134 } 2124 }
2135 2125
2136 $MAP_PREFETCH{$path} |= $load; 2126 $MAP_PREFETCH{$path} |= $load;
2137 2127
2138 $MAP_PREFETCHER ||= cf::async { 2128 $MAP_PREFETCHER ||= cf::async {
2175 cf::async { 2165 cf::async {
2176 $Coro::current->{desc} = "map player save"; 2166 $Coro::current->{desc} = "map player save";
2177 $_->contr->save for $self->players; 2167 $_->contr->save for $self->players;
2178 }; 2168 };
2179 2169
2170 cf::get_slot 0.02;
2171
2180 if ($uniq) { 2172 if ($uniq) {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2173 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2182 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2174 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2183 } else { 2175 } else {
2184 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2176 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2192 $self->save; 2184 $self->save;
2193 2185
2194 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2186 my $lock = cf::lock_acquire "map_data:$self->{path}";
2195 2187
2196 return if $self->players; 2188 return if $self->players;
2197 return if $self->in_memory != cf::MAP_IN_MEMORY; 2189 return if $self->in_memory != cf::MAP_ACTIVE;
2198 return if $self->{deny_save}; 2190 return if $self->{deny_save};
2199 2191
2200 $self->in_memory (cf::MAP_SWAPPED); 2192 $self->in_memory (cf::MAP_SWAPPED);
2201 2193
2202 $self->deactivate; 2194 $self->deactivate;
2320 2312
2321sub unique_maps() { 2313sub unique_maps() {
2322 [ 2314 [
2323 map { 2315 map {
2324 utf8::decode $_; 2316 utf8::decode $_;
2325 /\.map$/ 2317 s/\.map$//; # TODO future compatibility hack
2318 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2319 ? ()
2326 ? normalise $_ 2320 : normalise $_
2327 : ()
2328 } @{ aio_readdir $UNIQUEDIR or [] } 2321 } @{ aio_readdir $UNIQUEDIR or [] }
2329 ] 2322 ]
2330} 2323}
2331 2324
2332package cf;
2333
2334=back 2325=back
2335 2326
2336=head3 cf::object 2327=head3 cf::object
2337 2328
2338=cut 2329=cut
2341 2332
2342=over 4 2333=over 4
2343 2334
2344=item $ob->inv_recursive 2335=item $ob->inv_recursive
2345 2336
2346Returns the inventory of the object _and_ their inventories, recursively. 2337Returns the inventory of the object I<and> their inventories, recursively,
2338but I<not> the object itself.
2347 2339
2348=cut 2340=cut
2349 2341
2350sub inv_recursive_; 2342sub inv_recursive_;
2351sub inv_recursive_ { 2343sub inv_recursive_ {
2356 inv_recursive_ inv $_[0] 2348 inv_recursive_ inv $_[0]
2357} 2349}
2358 2350
2359=item $ref = $ob->ref 2351=item $ref = $ob->ref
2360 2352
2361creates and returns a persistent reference to an objetc that can be stored as a string. 2353Creates and returns a persistent reference to an object that can be stored as a string.
2362 2354
2363=item $ob = cf::object::deref ($refstring) 2355=item $ob = cf::object::deref ($refstring)
2364 2356
2365returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2357returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2366even if the object actually exists. May block. 2358even if the object actually exists. May block.
2398can be C<undef>. Does the right thing when the player is currently in a 2390can be C<undef>. Does the right thing when the player is currently in a
2399dialogue with the given NPC character. 2391dialogue with the given NPC character.
2400 2392
2401=cut 2393=cut
2402 2394
2395our $SAY_CHANNEL = {
2396 id => "say",
2397 title => "Map",
2398 reply => "say ",
2399 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2400};
2401
2402our $CHAT_CHANNEL = {
2403 id => "chat",
2404 title => "Chat",
2405 reply => "chat ",
2406 tooltip => "Player chat and shouts, global to the server.",
2407};
2408
2403# rough implementation of a future "reply" method that works 2409# rough implementation of a future "reply" method that works
2404# with dialog boxes. 2410# with dialog boxes.
2405#TODO: the first argument must go, split into a $npc->reply_to ( method 2411#TODO: the first argument must go, split into a $npc->reply_to ( method
2406sub cf::object::player::reply($$$;$) { 2412sub cf::object::player::reply($$$;$) {
2407 my ($self, $npc, $msg, $flags) = @_; 2413 my ($self, $npc, $msg, $flags) = @_;
2418 my $dialog = $pl->{npc_dialog}; 2424 my $dialog = $pl->{npc_dialog};
2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2425 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2420 2426
2421 } else { 2427 } else {
2422 $msg = $npc->name . " says: $msg" if $npc; 2428 $msg = $npc->name . " says: $msg" if $npc;
2423 $self->message ($msg, $flags); 2429 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2424 } 2430 }
2425 } 2431 }
2426} 2432}
2427 2433
2428=item $object->send_msg ($channel, $msg, $color, [extra...]) 2434=item $object->send_msg ($channel, $msg, $color, [extra...])
2453 2459
2454=item $player_object->enter_link 2460=item $player_object->enter_link
2455 2461
2456Freezes the player and moves him/her to a special map (C<{link}>). 2462Freezes the player and moves him/her to a special map (C<{link}>).
2457 2463
2458The player should be reasonably safe there for short amounts of time. You 2464The player should be reasonably safe there for short amounts of time (e.g.
2459I<MUST> call C<leave_link> as soon as possible, though. 2465for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2466though, as the palyer cannot control the character while it is on the link
2467map.
2460 2468
2461Will never block. 2469Will never block.
2462 2470
2463=item $player_object->leave_link ($map, $x, $y) 2471=item $player_object->leave_link ($map, $x, $y)
2464 2472
2522 2530
2523 $map->load; 2531 $map->load;
2524 $map->load_neighbours; 2532 $map->load_neighbours;
2525 2533
2526 return unless $self->contr->active; 2534 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2527 $self->activate_recursive; 2536 $self->activate_recursive;
2528 2537
2529 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2530 $self->enter_map ($map, $x, $y); 2539 $self->enter_map ($map, $x, $y);
2531} 2540}
2535Moves the player to the given map-path and coordinates by first freezing 2544Moves the player to the given map-path and coordinates by first freezing
2536her, loading and preparing them map, calling the provided $check callback 2545her, loading and preparing them map, calling the provided $check callback
2537that has to return the map if sucecssful, and then unfreezes the player on 2546that has to return the map if sucecssful, and then unfreezes the player on
2538the new (success) or old (failed) map position. In either case, $done will 2547the new (success) or old (failed) map position. In either case, $done will
2539be called at the end of this process. 2548be called at the end of this process.
2549
2550Note that $check will be called with a potentially non-loaded map, so if
2551it needs a loaded map it has to call C<< ->load >>.
2540 2552
2541=cut 2553=cut
2542 2554
2543our $GOTOGEN; 2555our $GOTOGEN;
2544 2556
2623} 2635}
2624 2636
2625sub prepare_random_map { 2637sub prepare_random_map {
2626 my ($exit) = @_; 2638 my ($exit) = @_;
2627 2639
2628 my $guard = cf::lock_acquire "exit_prepare:$exit";
2629
2630 # all this does is basically replace the /! path by 2640 # all this does is basically replace the /! path by
2631 # a new random map path (?random/...) with a seed 2641 # a new random map path (?random/...) with a seed
2632 # that depends on the exit object 2642 # that depends on the exit object
2633 2643
2634 my $rmp = parse_random_map_params $exit->msg; 2644 my $rmp = parse_random_map_params $exit->msg;
2636 if ($exit->map) { 2646 if ($exit->map) {
2637 $rmp->{region} = $exit->region->name; 2647 $rmp->{region} = $exit->region->name;
2638 $rmp->{origin_map} = $exit->map->path; 2648 $rmp->{origin_map} = $exit->map->path;
2639 $rmp->{origin_x} = $exit->x; 2649 $rmp->{origin_x} = $exit->x;
2640 $rmp->{origin_y} = $exit->y; 2650 $rmp->{origin_y} = $exit->y;
2651
2652 $exit->map->touch;
2641 } 2653 }
2642 2654
2643 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2644 2656
2645 my $data = cf::encode_json $rmp; 2657 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2646 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2647 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2648 2660
2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2650 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2651 undef $fh; 2663 undef $fh;
2652 aio_rename "$meta~", $meta; 2664 aio_rename "$meta~", $meta;
2653 2665
2666 my $slaying = "?random/$md5";
2667
2668 if ($exit->valid) {
2654 $exit->slaying ("?random/$md5"); 2669 $exit->slaying ("?random/$md5");
2655 $exit->msg (undef); 2670 $exit->msg (undef);
2671 }
2656 } 2672 }
2657} 2673}
2658 2674
2659sub cf::object::player::enter_exit { 2675sub cf::object::player::enter_exit {
2660 my ($self, $exit) = @_; 2676 my ($self, $exit) = @_;
2661 2677
2662 return unless $self->type == cf::PLAYER; 2678 return unless $self->type == cf::PLAYER;
2663 2679
2664 if ($exit->slaying eq "/!") {
2665 #TODO: this should de-fi-ni-te-ly not be a sync-job
2666 # the problem is that $exit might not survive long enough
2667 # so it needs to be done right now, right here
2668 cf::sync_job { prepare_random_map $exit };
2669 }
2670
2671 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2672 my $hp = $exit->stats->hp;
2673 my $sp = $exit->stats->sp;
2674
2675 $self->enter_link; 2680 $self->enter_link;
2676 2681
2677 # if exit is damned, update players death & WoR home-position
2678 $self->contr->savebed ($slaying, $hp, $sp)
2679 if $exit->flag (FLAG_DAMNED);
2680
2681 (async { 2682 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2683 $Coro::current->{desc} = "enter_exit";
2683 2684
2684 $self->deactivate_recursive; # just to be sure
2685 unless (eval { 2685 unless (eval {
2686 $self->deactivate_recursive; # just to be sure
2687
2688 # random map handling
2689 {
2690 my $guard = cf::lock_acquire "exit_prepare:$exit";
2691
2692 prepare_random_map $exit
2693 if $exit->slaying eq "/!";
2694 }
2695
2696 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2697 my $x = $exit->stats->hp;
2698 my $y = $exit->stats->sp;
2699
2686 $self->goto ($slaying, $hp, $sp); 2700 $self->goto ($map, $x, $y);
2687 2701
2702 # if exit is damned, update players death & WoR home-position
2703 $self->contr->savebed ($map, $x, $y)
2704 if $exit->flag (cf::FLAG_DAMNED);
2705
2688 1; 2706 1
2689 }) { 2707 }) {
2690 $self->message ("Something went wrong deep within the crossfire server. " 2708 $self->message ("Something went wrong deep within the deliantra server. "
2691 . "I'll try to bring you back to the map you were before. " 2709 . "I'll try to bring you back to the map you were before. "
2692 . "Please report this to the dungeon master!", 2710 . "Please report this to the dungeon master!",
2693 cf::NDI_UNIQUE | cf::NDI_RED); 2711 cf::NDI_UNIQUE | cf::NDI_RED);
2694 2712
2695 warn "ERROR in enter_exit: $@"; 2713 warn "ERROR in enter_exit: $@";
2761 id => "infobox", 2779 id => "infobox",
2762 title => "Body Parts", 2780 title => "Body Parts",
2763 reply => undef, 2781 reply => undef,
2764 tooltip => "Shows which body parts you posess and are available", 2782 tooltip => "Shows which body parts you posess and are available",
2765 }, 2783 },
2784 "c/statistics" => {
2785 id => "infobox",
2786 title => "Statistics",
2787 reply => undef,
2788 tooltip => "Shows your primary statistics",
2789 },
2790 "c/skills" => {
2791 id => "infobox",
2792 title => "Skills",
2793 reply => undef,
2794 tooltip => "Shows your experience per skill and item power",
2795 },
2796 "c/shopitems" => {
2797 id => "infobox",
2798 title => "Shop Items",
2799 reply => undef,
2800 tooltip => "Shows the items currently for sale in this shop",
2801 },
2802 "c/resistances" => {
2803 id => "infobox",
2804 title => "Resistances",
2805 reply => undef,
2806 tooltip => "Shows your resistances",
2807 },
2808 "c/pets" => {
2809 id => "infobox",
2810 title => "Pets",
2811 reply => undef,
2812 tooltip => "Shows information abotu your pets/a specific pet",
2813 },
2814 "c/perceiveself" => {
2815 id => "infobox",
2816 title => "Perceive Self",
2817 reply => undef,
2818 tooltip => "You gained detailed knowledge about yourself",
2819 },
2766 "c/uptime" => { 2820 "c/uptime" => {
2767 id => "infobox", 2821 id => "infobox",
2768 title => "Uptime", 2822 title => "Uptime",
2769 reply => undef, 2823 reply => undef,
2770 tooltip => "How long the server has been running since last restart", 2824 tooltip => "How long the server has been running since last restart",
2773 id => "infobox", 2827 id => "infobox",
2774 title => "Map Info", 2828 title => "Map Info",
2775 reply => undef, 2829 reply => undef,
2776 tooltip => "Information related to the maps", 2830 tooltip => "Information related to the maps",
2777 }, 2831 },
2832 "c/party" => {
2833 id => "party",
2834 title => "Party",
2835 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party",
2837 },
2838 "c/death" => {
2839 id => "death",
2840 title => "Death",
2841 reply => undef,
2842 tooltip => "Reason for and more info about your most recent death",
2843 },
2844 "c/say" => $SAY_CHANNEL,
2845 "c/chat" => $CHAT_CHANNEL,
2778); 2846);
2779 2847
2780sub cf::client::send_msg { 2848sub cf::client::send_msg {
2781 my ($self, $channel, $msg, $color, @extra) = @_; 2849 my ($self, $channel, $msg, $color, @extra) = @_;
2782 2850
2783 $msg = $self->pl->expand_cfpod ($msg); 2851 $msg = $self->pl->expand_cfpod ($msg)
2852 unless $color & cf::NDI_VERBATIM;
2784 2853
2785 $color &= cf::NDI_CLIENT_MASK; # just in case... 2854 $color &= cf::NDI_CLIENT_MASK; # just in case...
2786 2855
2787 # check predefined channels, for the benefit of C 2856 # check predefined channels, for the benefit of C
2788 if ($CHANNEL{$channel}) { 2857 if ($CHANNEL{$channel}) {
2789 $channel = $CHANNEL{$channel}; 2858 $channel = $CHANNEL{$channel};
2790 2859
2791 $self->ext_msg (channel_info => $channel) 2860 $self->ext_msg (channel_info => $channel);
2792 if $self->can_msg;
2793
2794 $channel = $channel->{id}; 2861 $channel = $channel->{id};
2795 2862
2796 } elsif (ref $channel) { 2863 } elsif (ref $channel) {
2797 # send meta info to client, if not yet sent 2864 # send meta info to client, if not yet sent
2798 unless (exists $self->{channel}{$channel->{id}}) { 2865 unless (exists $self->{channel}{$channel->{id}}) {
2799 $self->{channel}{$channel->{id}} = $channel; 2866 $self->{channel}{$channel->{id}} = $channel;
2800 $self->ext_msg (channel_info => $channel) 2867 $self->ext_msg (channel_info => $channel);
2801 if $self->can_msg;
2802 } 2868 }
2803 2869
2804 $channel = $channel->{id}; 2870 $channel = $channel->{id};
2805 } 2871 }
2806 2872
2807 return unless @extra || length $msg; 2873 return unless @extra || length $msg;
2808 2874
2809 if ($self->can_msg) {
2810 # default colour, mask it out 2875 # default colour, mask it out
2811 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2812 if $color & cf::NDI_DEF; 2877 if $color & cf::NDI_DEF;
2813 2878
2814 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2879 my $pkt = "msg "
2880 . $self->{json_coder}->encode (
2815 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2816 } else { 2882 );
2817 if ($color >= 0) {
2818 # replace some tags by gcfclient-compatible ones
2819 for ($msg) {
2820 1 while
2821 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2822 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2823 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2824 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2825 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2826 }
2827 2883
2828 $color &= cf::NDI_COLOR_MASK; 2884 # try lzf for large packets
2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2886 if 1024 <= length $pkt and $self->{can_lzf};
2829 2887
2830 utf8::encode $msg; 2888 # split very large packets
2831 2889 if (8192 < length $pkt and $self->{can_lzf}) {
2832 if (0 && $msg =~ /\[/) { 2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 # COMMAND/INFO 2891 $pkt = "frag";
2834 $self->send_packet ("drawextinfo $color 10 8 $msg")
2835 } else {
2836 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2837 $self->send_packet ("drawinfo $color $msg")
2838 }
2839 }
2840 } 2892 }
2893
2894 $self->send_packet ($pkt);
2841} 2895}
2842 2896
2843=item $client->ext_msg ($type, @msg) 2897=item $client->ext_msg ($type, @msg)
2844 2898
2845Sends an ext event to the client. 2899Sends an ext event to the client.
3019 3073
3020The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
3021 3075
3022 cf::object 3076 cf::object
3023 contr pay_amount pay_player map x y force_find force_add destroy 3077 contr pay_amount pay_player map x y force_find force_add destroy
3024 insert remove name archname title slaying race decrease_ob_nr 3078 insert remove name archname title slaying race decrease split
3079 value
3025 3080
3026 cf::object::player 3081 cf::object::player
3027 player 3082 player
3028 3083
3029 cf::player 3084 cf::player
3034 3089
3035=cut 3090=cut
3036 3091
3037for ( 3092for (
3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3093 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3039 insert remove inv name archname title slaying race 3094 insert remove inv nrof name archname title slaying race
3040 decrease_ob_nr destroy)], 3095 decrease split destroy change_exp value msg lore send_msg)],
3041 ["cf::object::player" => qw(player)], 3096 ["cf::object::player" => qw(player)],
3042 ["cf::player" => qw(peaceful)], 3097 ["cf::player" => qw(peaceful send_msg)],
3043 ["cf::map" => qw(trigger)], 3098 ["cf::map" => qw(trigger)],
3044) { 3099) {
3045 no strict 'refs'; 3100 no strict 'refs';
3046 my ($pkg, @funs) = @$_; 3101 my ($pkg, @funs) = @$_;
3047 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3064 my ($code, %vars) = @_; 3119 my ($code, %vars) = @_;
3065 3120
3066 my $qcode = $code; 3121 my $qcode = $code;
3067 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3068 $qcode =~ s/\n/\\n/g; 3123 $qcode =~ s/\n/\\n/g;
3124
3125 %vars = (_dummy => 0) unless %vars;
3069 3126
3070 local $_; 3127 local $_;
3071 local @safe::cf::_safe_eval_args = values %vars; 3128 local @safe::cf::_safe_eval_args = values %vars;
3072 3129
3073 my $eval = 3130 my $eval =
3218 $RESOURCE{$name} = $info; 3275 $RESOURCE{$name} = $info;
3219 } 3276 }
3220 3277
3221 cf::cede_to_tick; 3278 cf::cede_to_tick;
3222 } 3279 }
3223
3224 if (my $soundconf = delete $res->{"res/sound.conf"}) {
3225 $soundconf = $enc->decode (delete $soundconf->{data});
3226
3227 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3228 my $sound = $soundconf->{compat}[$_]
3229 or next;
3230
3231 my $face = cf::face::find "sound/$sound->[1]";
3232 cf::sound::set $sound->[0] => $face;
3233 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3234 }
3235
3236 while (my ($k, $v) = each %{$soundconf->{event}}) {
3237 my $face = cf::face::find "sound/$v";
3238 cf::sound::set $k => $face;
3239 }
3240 }
3241 } 3280 }
3281
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3242 3283
3243 1 3284 1
3244} 3285}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3245 3306
3246register_exticmd fx_want => sub { 3307register_exticmd fx_want => sub {
3247 my ($ns, $want) = @_; 3308 my ($ns, $want) = @_;
3248 3309
3249 while (my ($k, $v) = each %$want) { 3310 while (my ($k, $v) = each %$want) {
3250 $ns->fx_want ($k, $v); 3311 $ns->fx_want ($k, $v);
3251 } 3312 }
3252}; 3313};
3314
3315sub load_resource_file($) {
3316 my $guard = lock_acquire "load_resource_file";
3317
3318 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100;
3320 cf::arch::commit_load;
3321
3322 $status
3323}
3253 3324
3254sub reload_regions { 3325sub reload_regions {
3255 # HACK to clear player env face cache, we need some signal framework 3326 # HACK to clear player env face cache, we need some signal framework
3256 # for this (global event?) 3327 # for this (global event?)
3257 %ext::player_env::MUSIC_FACE_CACHE = (); 3328 %ext::player_env::MUSIC_FACE_CACHE = ();
3271} 3342}
3272 3343
3273sub reload_archetypes { 3344sub reload_archetypes {
3274 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
3275 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
3276 #d# NEED to laod twice to resolve forward references
3277 # this really needs to be done in an extra post-pass
3278 # (which needs to be synchronous, so solve it differently)
3279 load_resource_file "$DATADIR/archetypes"
3280 or die "unable to load archetypes\n";
3281} 3347}
3282 3348
3283sub reload_treasures { 3349sub reload_treasures {
3284 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
3285 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
3286} 3352}
3287 3353
3288sub reload_resources { 3354sub reload_resources {
3289 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
3290 3356
3357 reload_facedata;
3358 reload_archetypes;
3291 reload_regions; 3359 reload_regions;
3292 reload_facedata;
3293 #reload_archetypes;#d#
3294 reload_archetypes;
3295 reload_treasures; 3360 reload_treasures;
3296 3361
3297 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
3298}
3299
3300sub init {
3301 reload_resources;
3302} 3363}
3303 3364
3304sub reload_config { 3365sub reload_config {
3305 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
3306 or return; 3367 or return;
3307 3368
3308 local $/; 3369 local $/;
3309 *CFG = YAML::Syck::Load <$fh>; 3370 *CFG = YAML::Load <$fh>;
3310 3371
3311 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3312 3373
3313 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3314 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3320 }; 3381 };
3321 warn $@ if $@; 3382 warn $@ if $@;
3322 } 3383 }
3323} 3384}
3324 3385
3386sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!";
3389 flock $fh, &Fcntl::LOCK_EX
3390 or die "$PIDFILE: flock: $!";
3391 $fh
3392}
3393
3394# make sure only one server instance is running at any one time
3395sub atomic {
3396 my $fh = pidfile;
3397
3398 my $pid = <$fh>;
3399 kill 9, $pid if $pid > 0;
3400
3401 seek $fh, 0, 0;
3402 print $fh $$;
3403}
3404
3325sub main { 3405sub main {
3406 cf::init_globals; # initialise logging
3407
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419
3326 # we must not ever block the main coroutine 3420 # we must not ever block the main coroutine
3327 local $Coro::idle = sub { 3421 local $Coro::idle = sub {
3328 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3422 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3329 (async { 3423 (async {
3330 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3424 $Coro::current->{desc} = "IDLE BUG HANDLER";
3331 EV::loop EV::LOOP_ONESHOT; 3425 EV::loop EV::LOOP_ONESHOT;
3332 })->prio (Coro::PRIO_MAX); 3426 })->prio (Coro::PRIO_MAX);
3333 }; 3427 };
3334 3428
3429 evthread_start IO::AIO::poll_fileno;
3430
3431 cf::sync_job {
3432 reload_resources;
3335 reload_config; 3433 reload_config;
3336 db_init; 3434 db_init;
3435
3436 cf::load_settings;
3437 cf::load_materials;
3438 cf::init_uuid;
3439 cf::init_signals;
3440 cf::init_commands;
3441 cf::init_skills;
3442
3443 cf::init_beforeplay;
3444
3445 atomic;
3446
3337 load_extensions; 3447 load_extensions;
3338 3448
3339 $TICK_WATCHER->start; 3449 utime time, time, $RUNTIMEFILE;
3340 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3450
3451 # no (long-running) fork's whatsoever before this point(!)
3452 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3453
3454 (pop @POST_INIT)->(0) while @POST_INIT;
3455 };
3456
3341 EV::loop; 3457 EV::loop;
3342} 3458}
3343 3459
3344############################################################################# 3460#############################################################################
3345# initialisation and cleanup 3461# initialisation and cleanup
3352 cf::cleanup "SIG$signal"; 3468 cf::cleanup "SIG$signal";
3353 }; 3469 };
3354 } 3470 }
3355} 3471}
3356 3472
3357sub write_runtime { 3473sub write_runtime_sync {
3358 my $runtime = "$LOCALDIR/runtime";
3359
3360 # first touch the runtime file to show we are still running: 3474 # first touch the runtime file to show we are still running:
3361 # the fsync below can take a very very long time. 3475 # the fsync below can take a very very long time.
3362 3476
3363 IO::AIO::aio_utime $runtime, undef, undef; 3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3364 3478
3365 my $guard = cf::lock_acquire "write_runtime"; 3479 my $guard = cf::lock_acquire "write_runtime";
3366 3480
3367 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3368 or return; 3482 or return;
3369 3483
3370 my $value = $cf::RUNTIME + 90 + 10; 3484 my $value = $cf::RUNTIME + 90 + 10;
3371 # 10 is the runtime save interval, for a monotonic clock 3485 # 10 is the runtime save interval, for a monotonic clock
3372 # 60 allows for the watchdog to kill the server. 3486 # 60 allows for the watchdog to kill the server.
3382 aio_utime $fh, undef, undef; 3496 aio_utime $fh, undef, undef;
3383 3497
3384 close $fh 3498 close $fh
3385 or return; 3499 or return;
3386 3500
3387 aio_rename "$runtime~", $runtime 3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3388 and return; 3502 and return;
3389 3503
3390 warn "runtime file written.\n"; 3504 warn "runtime file written.\n";
3391 3505
3392 1 3506 1
3507}
3508
3509our $uuid_lock;
3510our $uuid_skip;
3511
3512sub write_uuid_sync($) {
3513 $uuid_skip ||= $_[0];
3514
3515 return if $uuid_lock;
3516 local $uuid_lock = 1;
3517
3518 my $uuid = "$LOCALDIR/uuid";
3519
3520 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3521 or return;
3522
3523 my $value = uuid_seq uuid_cur;
3524
3525 unless ($value) {
3526 warn "cowardly refusing to write zero uuid value!\n";
3527 return;
3528 }
3529
3530 my $value = uuid_str $value + $uuid_skip;
3531 $uuid_skip = 0;
3532
3533 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3534 and return;
3535
3536 # always fsync - this file is important
3537 aio_fsync $fh
3538 and return;
3539
3540 close $fh
3541 or return;
3542
3543 aio_rename "$uuid~", $uuid
3544 and return;
3545
3546 warn "uuid file written ($value).\n";
3547
3548 1
3549
3550}
3551
3552sub write_uuid($$) {
3553 my ($skip, $sync) = @_;
3554
3555 $sync ? write_uuid_sync $skip
3556 : async { write_uuid_sync $skip };
3393} 3557}
3394 3558
3395sub emergency_save() { 3559sub emergency_save() {
3396 my $freeze_guard = cf::freeze_mainloop; 3560 my $freeze_guard = cf::freeze_mainloop;
3397 3561
3398 warn "enter emergency perl save\n"; 3562 warn "emergency_perl_save: enter\n";
3399 3563
3400 cf::sync_job { 3564 cf::sync_job {
3565 # this is a trade-off: we want to be very quick here, so
3566 # save all maps without fsync, and later call a global sync
3567 # (which in turn might be very very slow)
3568 local $USE_FSYNC = 0;
3569
3401 # use a peculiar iteration method to avoid tripping on perl 3570 # use a peculiar iteration method to avoid tripping on perl
3402 # refcount bugs in for. also avoids problems with players 3571 # refcount bugs in for. also avoids problems with players
3403 # and maps saved/destroyed asynchronously. 3572 # and maps saved/destroyed asynchronously.
3404 warn "begin emergency player save\n"; 3573 warn "emergency_perl_save: begin player save\n";
3405 for my $login (keys %cf::PLAYER) { 3574 for my $login (keys %cf::PLAYER) {
3406 my $pl = $cf::PLAYER{$login} or next; 3575 my $pl = $cf::PLAYER{$login} or next;
3407 $pl->valid or next; 3576 $pl->valid or next;
3408 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3409 $pl->save; 3578 $pl->save;
3410 } 3579 }
3411 warn "end emergency player save\n"; 3580 warn "emergency_perl_save: end player save\n";
3412 3581
3413 warn "begin emergency map save\n"; 3582 warn "emergency_perl_save: begin map save\n";
3414 for my $path (keys %cf::MAP) { 3583 for my $path (keys %cf::MAP) {
3415 my $map = $cf::MAP{$path} or next; 3584 my $map = $cf::MAP{$path} or next;
3416 $map->valid or next; 3585 $map->valid or next;
3417 $map->save; 3586 $map->save;
3418 } 3587 }
3419 warn "end emergency map save\n"; 3588 warn "emergency_perl_save: end map save\n";
3420 3589
3421 warn "begin emergency database checkpoint\n"; 3590 warn "emergency_perl_save: begin database checkpoint\n";
3422 BDB::db_env_txn_checkpoint $DB_ENV; 3591 BDB::db_env_txn_checkpoint $DB_ENV;
3423 warn "end emergency database checkpoint\n"; 3592 warn "emergency_perl_save: end database checkpoint\n";
3593
3594 warn "emergency_perl_save: begin write uuid\n";
3595 write_uuid_sync 1;
3596 warn "emergency_perl_save: end write uuid\n";
3424 }; 3597 };
3425 3598
3599 warn "emergency_perl_save: starting sync()\n";
3600 IO::AIO::aio_sync sub {
3601 warn "emergency_perl_save: finished sync()\n";
3602 };
3603
3426 warn "leave emergency perl save\n"; 3604 warn "emergency_perl_save: leave\n";
3427} 3605}
3428 3606
3429sub post_cleanup { 3607sub post_cleanup {
3430 my ($make_core) = @_; 3608 my ($make_core) = @_;
3431 3609
3432 warn Carp::longmess "post_cleanup backtrace" 3610 warn Carp::longmess "post_cleanup backtrace"
3433 if $make_core; 3611 if $make_core;
3612
3613 my $fh = pidfile;
3614 unlink $PIDFILE if <$fh> == $$;
3615}
3616
3617# a safer delete_package, copied from Symbol
3618sub clear_package($) {
3619 my $pkg = shift;
3620
3621 # expand to full symbol table name if needed
3622 unless ($pkg =~ /^main::.*::$/) {
3623 $pkg = "main$pkg" if $pkg =~ /^::/;
3624 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3625 $pkg .= '::' unless $pkg =~ /::$/;
3626 }
3627
3628 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3629 my $stem_symtab = *{$stem}{HASH};
3630
3631 defined $stem_symtab and exists $stem_symtab->{$leaf}
3632 or return;
3633
3634 # clear all symbols
3635 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3636 for my $name (keys %$leaf_symtab) {
3637 _gv_clear *{"$pkg$name"};
3638# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3639 }
3640 warn "cleared package $pkg\n";#d#
3434} 3641}
3435 3642
3436sub do_reload_perl() { 3643sub do_reload_perl() {
3437 # can/must only be called in main 3644 # can/must only be called in main
3438 if ($Coro::current != $Coro::main) { 3645 if ($Coro::current != $Coro::main) {
3439 warn "can only reload from main coroutine"; 3646 warn "can only reload from main coroutine";
3440 return; 3647 return;
3441 } 3648 }
3442 3649
3650 return if $RELOAD++;
3651
3652 my $t1 = EV::time;
3653
3654 while ($RELOAD) {
3443 warn "reloading..."; 3655 warn "reloading...";
3444 3656
3445 warn "entering sync_job"; 3657 warn "entering sync_job";
3446 3658
3447 cf::sync_job { 3659 cf::sync_job {
3448 cf::write_runtime; # external watchdog should not bark 3660 cf::write_runtime_sync; # external watchdog should not bark
3449 cf::emergency_save; 3661 cf::emergency_save;
3450 cf::write_runtime; # external watchdog should not bark 3662 cf::write_runtime_sync; # external watchdog should not bark
3451 3663
3452 warn "syncing database to disk"; 3664 warn "syncing database to disk";
3453 BDB::db_env_txn_checkpoint $DB_ENV; 3665 BDB::db_env_txn_checkpoint $DB_ENV;
3454 3666
3455 # if anything goes wrong in here, we should simply crash as we already saved 3667 # if anything goes wrong in here, we should simply crash as we already saved
3456 3668
3457 warn "flushing outstanding aio requests"; 3669 warn "flushing outstanding aio requests";
3458 for (;;) {
3459 BDB::flush;
3460 IO::AIO::flush;
3461 Coro::cede_notself;
3462 last unless IO::AIO::nreqs || BDB::nreqs; 3670 while (IO::AIO::nreqs || BDB::nreqs) {
3463 warn "iterate..."; 3671 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3464 }
3465
3466 ++$RELOAD;
3467
3468 warn "cancelling all extension coros";
3469 $_->cancel for values %EXT_CORO;
3470 %EXT_CORO = ();
3471
3472 warn "removing commands";
3473 %COMMAND = ();
3474
3475 warn "removing ext/exti commands";
3476 %EXTCMD = ();
3477 %EXTICMD = ();
3478
3479 warn "unloading/nuking all extensions";
3480 for my $pkg (@EXTS) {
3481 warn "... unloading $pkg";
3482
3483 if (my $cb = $pkg->can ("unload")) {
3484 eval {
3485 $cb->($pkg);
3486 1
3487 } or warn "$pkg unloaded, but with errors: $@";
3488 } 3672 }
3489 3673
3490 warn "... nuking $pkg"; 3674 warn "cancelling all extension coros";
3491 Symbol::delete_package $pkg; 3675 $_->cancel for values %EXT_CORO;
3492 } 3676 %EXT_CORO = ();
3493 3677
3494 warn "unloading all perl modules loaded from $LIBDIR"; 3678 warn "removing commands";
3495 while (my ($k, $v) = each %INC) { 3679 %COMMAND = ();
3496 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3497 3680
3681 warn "removing ext/exti commands";
3682 %EXTCMD = ();
3683 %EXTICMD = ();
3684
3685 warn "unloading/nuking all extensions";
3686 for my $pkg (@EXTS) {
3498 warn "... unloading $k"; 3687 warn "... unloading $pkg";
3499 delete $INC{$k};
3500 3688
3501 $k =~ s/\.pm$//;
3502 $k =~ s/\//::/g;
3503
3504 if (my $cb = $k->can ("unload_module")) { 3689 if (my $cb = $pkg->can ("unload")) {
3690 eval {
3505 $cb->(); 3691 $cb->($pkg);
3692 1
3693 } or warn "$pkg unloaded, but with errors: $@";
3694 }
3695
3696 warn "... clearing $pkg";
3697 clear_package $pkg;
3506 } 3698 }
3507 3699
3508 Symbol::delete_package $k; 3700 warn "unloading all perl modules loaded from $LIBDIR";
3701 while (my ($k, $v) = each %INC) {
3702 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3703
3704 warn "... unloading $k";
3705 delete $INC{$k};
3706
3707 $k =~ s/\.pm$//;
3708 $k =~ s/\//::/g;
3709
3710 if (my $cb = $k->can ("unload_module")) {
3711 $cb->();
3712 }
3713
3714 clear_package $k;
3509 } 3715 }
3510 3716
3511 warn "getting rid of safe::, as good as possible"; 3717 warn "getting rid of safe::, as good as possible";
3512 Symbol::delete_package "safe::$_" 3718 clear_package "safe::$_"
3513 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3719 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3514 3720
3515 warn "unloading cf.pm \"a bit\""; 3721 warn "unloading cf.pm \"a bit\"";
3516 delete $INC{"cf.pm"}; 3722 delete $INC{"cf.pm"};
3517 delete $INC{"cf/pod.pm"}; 3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3518 3724
3519 # don't, removes xs symbols, too, 3725 # don't, removes xs symbols, too,
3520 # and global variables created in xs 3726 # and global variables created in xs
3521 #Symbol::delete_package __PACKAGE__; 3727 #clear_package __PACKAGE__;
3522 3728
3523 warn "unload completed, starting to reload now"; 3729 warn "unload completed, starting to reload now";
3524 3730
3525 warn "reloading cf.pm"; 3731 warn "reloading cf.pm";
3526 require cf; 3732 require cf;
3527 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3528 3734
3529 warn "loading config and database again"; 3735 warn "loading config and database again";
3530 cf::reload_config; 3736 cf::reload_config;
3531 3737
3532 warn "loading extensions"; 3738 warn "loading extensions";
3533 cf::load_extensions; 3739 cf::load_extensions;
3534 3740
3741 if ($REATTACH_ON_RELOAD) {
3535 warn "reattaching attachments to objects/players"; 3742 warn "reattaching attachments to objects/players";
3536 _global_reattach; # objects, sockets 3743 _global_reattach; # objects, sockets
3537 warn "reattaching attachments to maps"; 3744 warn "reattaching attachments to maps";
3538 reattach $_ for values %MAP; 3745 reattach $_ for values %MAP;
3539 warn "reattaching attachments to players"; 3746 warn "reattaching attachments to players";
3540 reattach $_ for values %PLAYER; 3747 reattach $_ for values %PLAYER;
3748 }
3541 3749
3750 warn "running post_init jobs";
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3752
3542 warn "leaving sync_job"; 3753 warn "leaving sync_job";
3543 3754
3544 1 3755 1
3545 } or do { 3756 } or do {
3546 warn $@; 3757 warn $@;
3547 warn "error while reloading, exiting."; 3758 cf::cleanup "error while reloading, exiting.";
3548 exit 1;
3549 }; 3759 };
3550 3760
3551 warn "reloaded"; 3761 warn "reloaded";
3762 --$RELOAD;
3763 }
3764
3765 $t1 = EV::time - $t1;
3766 warn "reload completed in ${t1}s\n";
3552}; 3767};
3553 3768
3554our $RELOAD_WATCHER; # used only during reload 3769our $RELOAD_WATCHER; # used only during reload
3555 3770
3556sub reload_perl() { 3771sub reload_perl() {
3557 # doing reload synchronously and two reloads happen back-to-back, 3772 # doing reload synchronously and two reloads happen back-to-back,
3558 # coro crashes during coro_state_free->destroy here. 3773 # coro crashes during coro_state_free->destroy here.
3559 3774
3775 $RELOAD_WATCHER ||= cf::async {
3776 Coro::AIO::aio_wait cache_extensions;
3777
3560 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3779 do_reload_perl;
3561 undef $RELOAD_WATCHER; 3780 undef $RELOAD_WATCHER;
3562 do_reload_perl; 3781 };
3563 }; 3782 };
3564} 3783}
3565 3784
3566register_command "reload" => sub { 3785register_command "reload" => sub {
3567 my ($who, $arg) = @_; 3786 my ($who, $arg) = @_;
3581 3800
3582our @WAIT_FOR_TICK; 3801our @WAIT_FOR_TICK;
3583our @WAIT_FOR_TICK_BEGIN; 3802our @WAIT_FOR_TICK_BEGIN;
3584 3803
3585sub wait_for_tick { 3804sub wait_for_tick {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 3805 return if tick_inhibit || $Coro::current == $Coro::main;
3588 3806
3589 my $signal = new Coro::Signal; 3807 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK, $signal; 3808 push @WAIT_FOR_TICK, $signal;
3591 $signal->wait; 3809 $signal->wait;
3592} 3810}
3593 3811
3594sub wait_for_tick_begin { 3812sub wait_for_tick_begin {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 3813 return if tick_inhibit || $Coro::current == $Coro::main;
3597 3814
3598 my $signal = new Coro::Signal; 3815 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK_BEGIN, $signal; 3816 push @WAIT_FOR_TICK_BEGIN, $signal;
3600 $signal->wait; 3817 $signal->wait;
3601} 3818}
3602 3819
3603$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3820sub tick {
3604 if ($Coro::current != $Coro::main) { 3821 if ($Coro::current != $Coro::main) {
3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3822 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3606 unless ++$bug_warning > 10; 3823 unless ++$bug_warning > 10;
3607 return; 3824 return;
3608 } 3825 }
3609 3826
3610 $NOW = $tick_start = EV::now;
3611
3612 cf::server_tick; # one server iteration 3827 cf::server_tick; # one server iteration
3613
3614 $RUNTIME += $TICK;
3615 $NEXT_TICK = $_[0]->at;
3616 3828
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3829 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3830 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 3831 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 3832 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 3833 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 3834 or warn "ERROR: unable to write runtime file: $!";
3623 }; 3835 };
3624 } 3836 }
3625 3837
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3838 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3628 } 3840 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 3841 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 3842 $sig->send;
3631 } 3843 }
3632 3844
3633 $LOAD = ($NOW - $tick_start) / $TICK; 3845 $LOAD = ($NOW - $TICK_START) / $TICK;
3634 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3846 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3635 3847
3636 _post_tick; 3848 if (0) {
3637}; 3849 if ($NEXT_TICK) {
3638$TICK_WATCHER->priority (EV::MAXPRI); 3850 my $jitter = $TICK_START - $NEXT_TICK;
3851 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3852 warn "jitter $JITTER\n";#d#
3853 }
3854 }
3855}
3639 3856
3640{ 3857{
3641 # configure BDB 3858 # configure BDB
3642 3859
3643 BDB::min_parallel 8; 3860 BDB::min_parallel 8;
3644 BDB::max_poll_reqs $TICK * 0.1; 3861 BDB::max_poll_reqs $TICK * 0.1;
3645 $Coro::BDB::WATCHER->priority (1); 3862 $AnyEvent::BDB::WATCHER->priority (1);
3646 3863
3647 unless ($DB_ENV) { 3864 unless ($DB_ENV) {
3648 $DB_ENV = BDB::db_env_create; 3865 $DB_ENV = BDB::db_env_create;
3649 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3866 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3650 | BDB::LOG_AUTOREMOVE, 1); 3867 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3868 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3651 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3869 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3652 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3870 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3653 3871
3654 cf::sync_job { 3872 cf::sync_job {
3655 eval { 3873 eval {
3681{ 3899{
3682 # configure IO::AIO 3900 # configure IO::AIO
3683 3901
3684 IO::AIO::min_parallel 8; 3902 IO::AIO::min_parallel 8;
3685 IO::AIO::max_poll_time $TICK * 0.1; 3903 IO::AIO::max_poll_time $TICK * 0.1;
3686 $Coro::AIO::WATCHER->priority (1); 3904 undef $AnyEvent::AIO::WATCHER;
3687} 3905}
3688 3906
3689my $_log_backtrace; 3907my $_log_backtrace;
3690 3908
3691sub _log_backtrace { 3909sub _log_backtrace {
3694 $msg =~ s/\n//; 3912 $msg =~ s/\n//;
3695 3913
3696 # limit the # of concurrent backtraces 3914 # limit the # of concurrent backtraces
3697 if ($_log_backtrace < 2) { 3915 if ($_log_backtrace < 2) {
3698 ++$_log_backtrace; 3916 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg;
3699 async { 3918 async {
3700 $Coro::current->{desc} = "abt $msg"; 3919 $Coro::current->{desc} = "abt $msg";
3701 3920
3702 my @bt = fork_call { 3921 my @bt = fork_call {
3703 @addr = map { sprintf "%x", $_ } @addr; 3922 @addr = map { sprintf "%x", $_ } @addr;
3714 } 3933 }
3715 3934
3716 @funcs 3935 @funcs
3717 }; 3936 };
3718 3937
3719 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $perl_bt\n";
3939 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3720 LOG llevInfo, "[ABT] $_\n" for @bt; 3940 LOG llevInfo, "[ABT] $_\n" for @bt;
3721 --$_log_backtrace; 3941 --$_log_backtrace;
3722 }; 3942 };
3723 } else { 3943 } else {
3724 LOG llevInfo, "[ABT] $msg\n"; 3944 LOG llevInfo, "[ABT] $msg\n";
3725 LOG llevInfo, "[ABT] [suppressed]\n"; 3945 LOG llevInfo, "[ABT] [suppressed]\n";
3726 } 3946 }
3727} 3947}
3728 3948
3729# load additional modules 3949# load additional modules
3730use cf::pod; 3950require "cf/$_.pm" for @EXTRA_MODULES;
3731 3951
3732END { cf::emergency_save } 3952END { cf::emergency_save }
3733 3953
37341 39541
3735 3955

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines