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.406 by root, Mon Dec 17 08:27:44 2007 UTC vs.
Revision 1.480 by root, Thu Oct 8 05:09:43 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 76
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 77# strictly for debugging
45$YAML::Syck::ImplicitUnicode = 1; 78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 79
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 81
51our %COMMAND = (); 82our %COMMAND = ();
52our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
55our %EXTCMD = (); 86our %EXTCMD = ();
56our %EXTICMD = (); 87our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
59 90
60our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 92our @EVENT;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
62 95
63our $CONFDIR = confdir; 96our $CONFDIR = confdir;
64our $DATADIR = datadir; 97our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 100our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 101our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 102our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 104our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 105our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 106our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime";
109
74our %RESOURCE; 110our %RESOURCE;
75 111
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $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 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 114our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 115our $USE_FSYNC = 1; # use fsync to write maps - default on
82 116
83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER; 117our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 118our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 119our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 120our $DB_ENV;
88 121
122our @EXTRA_MODULES = qw(pod mapscript);
123
89our %CFG; 124our %CFG;
90 125
91our $UPTIME; $UPTIME ||= time; 126our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 127our $RUNTIME;
93our $NOW; 128our $NOW;
99# used to convert map paths into valid unix filenames by replacing / by ∕ 134# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 135our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 136
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 137our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 138our $LOADAVG; # same thing, but with alpha-smoothing
139our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 140our $TICK_START; # for load detecting purposes
141
142our @POST_INIT;
143
144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :)
105 146
106binmode STDOUT; 147binmode STDOUT;
107binmode STDERR; 148binmode STDERR;
108 149
109# read virtual server time, if available 150# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 151unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 152 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
114} 155}
156
157eval "sub TICK() { $TICK } 1" or die;
115 158
116mkdir $_ 159mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 161
119our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
120 163
121sub cf::map::normalise; 164sub cf::map::normalise;
165
166#############################################################################
167
168%REFLECT = ();
169for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect;
172}
173
174# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}];
122 176
123############################################################################# 177#############################################################################
124 178
125=head2 GLOBAL VARIABLES 179=head2 GLOBAL VARIABLES
126 180
177 231
178This array contains the results of the last C<invoke ()> call. When 232This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 234that call.
181 235
236=item %cf::REFLECT
237
238Contains, for each (C++) class name, a hash reference with information
239about object members (methods, scalars, arrays and flags) and other
240metadata, which is useful for introspection.
241
182=back 242=back
183 243
184=cut 244=cut
185 245
186BEGIN { 246$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 247 my $msg = join "", @_;
189 248
190 $msg .= "\n" 249 $msg .= "\n"
191 unless $msg =~ /\n$/; 250 unless $msg =~ /\n$/;
192 251
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 252 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 253
195 LOG llevError, $msg; 254 LOG llevError, $msg;
196 }; 255};
197} 256
257$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "=="
259
260 warn Carp::longmess $_[0];
261
262 if ($Coro::current == $Coro::main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d#
265 }#d#
266
267 # kill coroutine otherwise
268 Coro::terminate
269};
198 270
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 271@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 272@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 273@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 274@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 281for my $pkg (qw(
210 cf::global cf::attachable 282 cf::global cf::attachable
211 cf::object cf::object::player 283 cf::object cf::object::player
212 cf::client cf::player 284 cf::client cf::player
213 cf::arch cf::living 285 cf::arch cf::living
286 cf::map cf::mapspace
214 cf::map cf::party cf::region 287 cf::party cf::region
215)) { 288)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 290}
219 291
220$EV::DIED = sub { 292$EV::DIED = sub {
221 warn "error in event callback: @_"; 293 warn "error in event callback: @_";
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 335our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 336
265sub encode_json($) { $json_coder->encode ($_[0]) } 337sub encode_json($) { $json_coder->encode ($_[0]) }
266sub decode_json($) { $json_coder->decode ($_[0]) } 338sub decode_json($) { $json_coder->decode ($_[0]) }
267 339
340=item cf::post_init { BLOCK }
341
342Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again.
344
345The cdoeblock will have a single boolean argument to indicate whether this
346is a reload or not.
347
348=cut
349
350sub post_init(&) {
351 push @POST_INIT, shift;
352}
353
268=item cf::lock_wait $string 354=item cf::lock_wait $string
269 355
270Wait until the given lock is available. See cf::lock_acquire. 356Wait until the given lock is available. See cf::lock_acquire.
271 357
272=item my $lock = cf::lock_acquire $string 358=item my $lock = cf::lock_acquire $string
273 359
274Wait until the given lock is available and then acquires it and returns 360Wait 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, 361a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 362for example when the coroutine gets canceled), the lock is automatically
277returned. 363returned.
278 364
279Locks are *not* recursive, locking from the same coro twice results in a 365Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 366deadlocked coro.
286 372
287Return true if the lock is currently active, i.e. somebody has locked it. 373Return true if the lock is currently active, i.e. somebody has locked it.
288 374
289=cut 375=cut
290 376
291our %LOCK; 377our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 378
294sub lock_wait($) { 379sub lock_wait($) {
295 my ($key) = @_; 380 $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} 381}
308 382
309sub lock_acquire($) { 383sub lock_acquire($) {
310 my ($key) = @_; 384 $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} 385}
324 386
325sub lock_active($) { 387sub lock_active($) {
326 my ($key) = @_; 388 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 389}
330 390
331sub freeze_mainloop { 391sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 392 tick_inhibit_inc;
333 393
334 my $guard = Coro::guard { 394 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start;
336 };
337 $TICK_WATCHER->stop;
338 $guard
339} 395}
340 396
341=item cf::periodic $interval, $cb 397=item cf::periodic $interval, $cb
342 398
343Like EV::periodic, but randomly selects a starting point so that the actions 399Like EV::periodic, but randomly selects a starting point so that the actions
398 } 454 }
399 } 455 }
400}; 456};
401 457
402sub get_slot($;$$) { 458sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main;
460
403 my ($time, $pri, $name) = @_; 461 my ($time, $pri, $name) = @_;
404 462
405 $time = $TICK * .6 if $time > $TICK * .6; 463 $time = $TICK * .6 if $time > $TICK * .6;
406 my $sig = new Coro::Signal; 464 my $sig = new Coro::Signal;
407 465
444 # this is the main coro, too bad, we have to block 502 # this is the main coro, too bad, we have to block
445 # till the operation succeeds, freezing the server :/ 503 # till the operation succeeds, freezing the server :/
446 504
447 LOG llevError, Carp::longmess "sync job";#d# 505 LOG llevError, Carp::longmess "sync job";#d#
448 506
449 # TODO: use suspend/resume instead
450 # (but this is cancel-safe)
451 my $freeze_guard = freeze_mainloop; 507 my $freeze_guard = freeze_mainloop;
452 508
453 my $busy = 1; 509 my $busy = 1;
454 my @res; 510 my @res;
455 511
466 } else { 522 } else {
467 EV::loop EV::LOOP_ONESHOT; 523 EV::loop EV::LOOP_ONESHOT;
468 } 524 }
469 } 525 }
470 526
471 $time = EV::time - $time; 527 my $time = EV::time - $time;
472 528
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 529 $TICK_START += $time; # do not account sync jobs to server load
477 530
478 wantarray ? @res : $res[0] 531 wantarray ? @res : $res[0]
479 } else { 532 } else {
480 # we are in another coroutine, how wonderful, everything just works 533 # we are in another coroutine, how wonderful, everything just works
481 534
523 reset_signals; 576 reset_signals;
524 &$cb 577 &$cb
525 }, @args; 578 }, @args;
526 579
527 wantarray ? @res : $res[-1] 580 wantarray ? @res : $res[-1]
581}
582
583=item $coin = coin_from_name $name
584
585=cut
586
587our %coin_alias = (
588 "silver" => "silvercoin",
589 "silvercoin" => "silvercoin",
590 "silvercoins" => "silvercoin",
591 "gold" => "goldcoin",
592 "goldcoin" => "goldcoin",
593 "goldcoins" => "goldcoin",
594 "platinum" => "platinacoin",
595 "platinumcoin" => "platinacoin",
596 "platinumcoins" => "platinacoin",
597 "platina" => "platinacoin",
598 "platinacoin" => "platinacoin",
599 "platinacoins" => "platinacoin",
600 "royalty" => "royalty",
601 "royalties" => "royalty",
602);
603
604sub coin_from_name($) {
605 $coin_alias{$_[0]}
606 ? cf::arch::find $coin_alias{$_[0]}
607 : undef
528} 608}
529 609
530=item $value = cf::db_get $family => $key 610=item $value = cf::db_get $family => $key
531 611
532Returns a single value from the environment database. 612Returns a single value from the environment database.
671 751
672############################################################################# 752#############################################################################
673 753
674=head2 ATTACHABLE OBJECTS 754=head2 ATTACHABLE OBJECTS
675 755
676Many objects in crossfire are so-called attachable objects. That means you can 756Many objects in deliantra are so-called attachable objects. That means you can
677attach callbacks/event handlers (a collection of which is called an "attachment") 757attach callbacks/event handlers (a collection of which is called an "attachment")
678to it. All such attachable objects support the following methods. 758to it. All such attachable objects support the following methods.
679 759
680In the following description, CLASS can be any of C<global>, C<object> 760In 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 761C<player>, C<client> or C<map> (i.e. the attachable objects in
731=item cf::CLASS::attachment $name, ... 811=item cf::CLASS::attachment $name, ...
732 812
733Register an attachment by C<$name> through which attachable objects of the 813Register an attachment by C<$name> through which attachable objects of the
734given CLASS can refer to this attachment. 814given CLASS can refer to this attachment.
735 815
736Some classes such as crossfire maps and objects can specify attachments 816Some classes such as deliantra maps and objects can specify attachments
737that are attached at load/instantiate time, thus the need for a name. 817that are attached at load/instantiate time, thus the need for a name.
738 818
739These calls expect any number of the following handler/hook descriptions: 819These calls expect any number of the following handler/hook descriptions:
740 820
741=over 4 821=over 4
1032 1112
1033sub reattach { 1113sub reattach {
1034 # basically do the same as instantiate, without calling instantiate 1114 # basically do the same as instantiate, without calling instantiate
1035 my ($obj) = @_; 1115 my ($obj) = @_;
1036 1116
1117 # no longer needed after getting rid of delete_package?
1037 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1118 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1038 1119
1039 my $registry = $obj->registry; 1120 my $registry = $obj->registry;
1040 1121
1041 @$registry = (); 1122 @$registry = ();
1042 1123
1088 utf8::decode (my $decname = $filename); 1169 utf8::decode (my $decname = $filename);
1089 warn sprintf "saving %s (%d,%d)\n", 1170 warn sprintf "saving %s (%d,%d)\n",
1090 $decname, length $$rdata, scalar @$objs; 1171 $decname, length $$rdata, scalar @$objs;
1091 1172
1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1093 chmod SAVE_MODE, $fh; 1174 aio_chmod $fh, SAVE_MODE;
1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1095 aio_fsync $fh if $cf::USE_FSYNC; 1176 if ($cf::USE_FSYNC) {
1177 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;
1178 aio_fsync $fh;
1179 }
1096 close $fh; 1180 aio_close $fh;
1097 1181
1098 if (@$objs) { 1182 if (@$objs) {
1099 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1183 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1100 chmod SAVE_MODE, $fh; 1184 aio_chmod $fh, SAVE_MODE;
1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1185 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1102 aio_write $fh, 0, (length $data), $data, 0; 1186 aio_write $fh, 0, (length $data), $data, 0;
1103 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 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;
1189 aio_fsync $fh;
1190 }
1104 close $fh; 1191 aio_close $fh;
1105 aio_rename "$filename.pst~", "$filename.pst"; 1192 aio_rename "$filename.pst~", "$filename.pst";
1106 } 1193 }
1107 } else { 1194 } else {
1108 aio_unlink "$filename.pst"; 1195 aio_unlink "$filename.pst";
1109 } 1196 }
1110 1197
1111 aio_rename "$filename~", $filename; 1198 aio_rename "$filename~", $filename;
1199
1200 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC;
1112 } else { 1202 } else {
1113 warn "FATAL: $filename~: $!\n"; 1203 warn "unable to save objects: $filename~: $!\n";
1114 } 1204 }
1115 } else { 1205 } else {
1116 aio_unlink $filename; 1206 aio_unlink $filename;
1117 aio_unlink "$filename.pst"; 1207 aio_unlink "$filename.pst";
1118 } 1208 }
1209 my ($name, $cb) = @_; 1299 my ($name, $cb) = @_;
1210 1300
1211 $EXTICMD{$name} = $cb; 1301 $EXTICMD{$name} = $cb;
1212} 1302}
1213 1303
1304use File::Glob ();
1305
1214cf::player->attach ( 1306cf::player->attach (
1215 on_command => sub { 1307 on_command => sub {
1216 my ($pl, $name, $params) = @_; 1308 my ($pl, $name, $params) = @_;
1217 1309
1218 my $cb = $COMMAND{$name} 1310 my $cb = $COMMAND{$name}
1250 1342
1251 cf::override; 1343 cf::override;
1252 }, 1344 },
1253); 1345);
1254 1346
1347# "readahead" all extensions
1348sub cache_extensions {
1349 my $grp = IO::AIO::aio_group;
1350
1351 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1352 for (grep /\.ext$/, @{$_[0]}) {
1353 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1354 }
1355 };
1356
1357 $grp
1358}
1359
1255sub load_extensions { 1360sub load_extensions {
1256 cf::sync_job { 1361 cf::sync_job {
1257 my %todo; 1362 my %todo;
1258 1363
1259 for my $path (<$LIBDIR/*.ext>) { 1364 for my $path (<$LIBDIR/*.ext>) {
1278 1383
1279 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1280 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1281 1386
1282 $ext{source} = 1387 $ext{source} =
1283 "package $pkg; use strict; use utf8;\n" 1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1284 . "#line 1 \"$path\"\n{\n" 1389 . "#line 1 \"$path\"\n{\n"
1285 . $source 1390 . $source
1286 . "\n};\n1"; 1391 . "\n};\n1";
1287 1392
1288 $todo{$base} = \%ext; 1393 $todo{$base} = \%ext;
1304 my $msg = $@ ? "$v->{path}: $@\n" 1409 my $msg = $@ ? "$v->{path}: $@\n"
1305 : "$v->{base}: extension inactive.\n"; 1410 : "$v->{base}: extension inactive.\n";
1306 1411
1307 if (exists $v->{meta}{mandatory}) { 1412 if (exists $v->{meta}{mandatory}) {
1308 warn $msg; 1413 warn $msg;
1309 warn "mandatory extension failed to load, exiting.\n"; 1414 cf::cleanup "mandatory extension failed to load, exiting.";
1310 exit 1;
1311 } 1415 }
1312 1416
1313 warn $msg; 1417 warn $msg;
1314 } 1418 }
1315 1419
1329 1433
1330=back 1434=back
1331 1435
1332=head2 CORE EXTENSIONS 1436=head2 CORE EXTENSIONS
1333 1437
1334Functions and methods that extend core crossfire objects. 1438Functions and methods that extend core deliantra objects.
1335 1439
1336=cut 1440=cut
1337 1441
1338package cf::player; 1442package cf::player;
1339 1443
1382 1486
1383sub exists($) { 1487sub exists($) {
1384 my ($login) = @_; 1488 my ($login) = @_;
1385 1489
1386 $cf::PLAYER{$login} 1490 $cf::PLAYER{$login}
1387 or cf::sync_job { !aio_stat path $login } 1491 or !aio_stat path $login
1388} 1492}
1389 1493
1390sub find($) { 1494sub find($) {
1391 return $cf::PLAYER{$_[0]} || do { 1495 return $cf::PLAYER{$_[0]} || do {
1392 my $login = $_[0]; 1496 my $login = $_[0];
1404 my $f = new_from_file cf::object::thawer path $login 1508 my $f = new_from_file cf::object::thawer path $login
1405 or return; 1509 or return;
1406 1510
1407 my $pl = cf::player::load_pl $f 1511 my $pl = cf::player::load_pl $f
1408 or return; 1512 or return;
1513
1409 local $cf::PLAYER_LOADING{$login} = $pl; 1514 local $cf::PLAYER_LOADING{$login} = $pl;
1410 $f->resolve_delayed_derefs; 1515 $f->resolve_delayed_derefs;
1411 $cf::PLAYER{$login} = $pl 1516 $cf::PLAYER{$login} = $pl
1412 } 1517 }
1413 } 1518 }
1423 1528
1424 return if $pl->{deny_save}; 1529 return if $pl->{deny_save};
1425 1530
1426 aio_mkdir playerdir $pl, 0770; 1531 aio_mkdir playerdir $pl, 0770;
1427 $pl->{last_save} = $cf::RUNTIME; 1532 $pl->{last_save} = $cf::RUNTIME;
1533
1534 cf::get_slot 0.01;
1428 1535
1429 $pl->save_pl ($path); 1536 $pl->save_pl ($path);
1430 cf::cede_to_tick; 1537 cf::cede_to_tick;
1431} 1538}
1432 1539
1464 my ($pl) = @_; 1571 my ($pl) = @_;
1465 1572
1466 my $name = $pl->ob->name; 1573 my $name = $pl->ob->name;
1467 1574
1468 $pl->{deny_save} = 1; 1575 $pl->{deny_save} = 1;
1469 $pl->password ("*"); # this should lock out the player until we nuked the dir 1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1470 1577
1471 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1472 $pl->deactivate; 1579 $pl->deactivate;
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1473 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1582 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1474 $pl->ns->destroy if $pl->ns; 1583 $pl->ns->destroy if $pl->ns;
1475 1584
1476 my $path = playerdir $pl; 1585 my $path = playerdir $pl;
1477 my $temp = "$path~$cf::RUNTIME~deleting~"; 1586 my $temp = "$path~$cf::RUNTIME~deleting~";
1516 1625
1517 for my $login (@$dirs) { 1626 for my $login (@$dirs) {
1518 my $path = path $login; 1627 my $path = path $login;
1519 1628
1520 # a .pst is a dead give-away for a valid player 1629 # a .pst is a dead give-away for a valid player
1521 unless (-e "$path.pst") { 1630 # if no pst file found, open and chekc for blocked users
1631 if (aio_stat "$path.pst") {
1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1632 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1523 aio_read $fh, 0, 512, my $buf, 0 or next; 1633 aio_read $fh, 0, 512, my $buf, 0 or next;
1524 $buf !~ /^password -------------$/m or next; # official not-valid tag 1634 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 } 1635 }
1526 1636
1557 } 1667 }
1558 1668
1559 \@paths 1669 \@paths
1560} 1670}
1561 1671
1562=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1672=item $protocol_xml = $player->expand_cfpod ($cfpod)
1563 1673
1564Expand crossfire pod fragments into protocol xml. 1674Expand 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 1675
1655=item $player->ext_reply ($msgid, @msg) 1676=item $player->ext_reply ($msgid, @msg)
1656 1677
1657Sends an ext reply to the player. 1678Sends an ext reply to the player.
1658 1679
1725our $MAX_RESET = 3600; 1746our $MAX_RESET = 3600;
1726our $DEFAULT_RESET = 3000; 1747our $DEFAULT_RESET = 3000;
1727 1748
1728sub generate_random_map { 1749sub generate_random_map {
1729 my ($self, $rmp) = @_; 1750 my ($self, $rmp) = @_;
1751
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753
1730 # mit "rum" bekleckern, nicht 1754 # mit "rum" bekleckern, nicht
1731 $self->_create_random_map ( 1755 $self->_create_random_map (
1732 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1733 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1734 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1856 1880
1857# the temporary/swap location 1881# the temporary/swap location
1858sub save_path { 1882sub save_path {
1859 my ($self) = @_; 1883 my ($self) = @_;
1860 1884
1861 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1885 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1862 "$TMPDIR/$path.map" 1886 "$TMPDIR/$path.map"
1863} 1887}
1864 1888
1865# the unique path, undef == no special unique path 1889# the unique path, undef == no special unique path
1866sub uniq_path { 1890sub uniq_path {
1867 my ($self) = @_; 1891 my ($self) = @_;
1868 1892
1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1870 "$UNIQUEDIR/$path" 1894 "$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} 1895}
1881 1896
1882sub decay_objects { 1897sub decay_objects {
1883 my ($self) = @_; 1898 my ($self) = @_;
1884 1899
1968sub find { 1983sub find {
1969 my ($path, $origin) = @_; 1984 my ($path, $origin) = @_;
1970 1985
1971 $path = normalise $path, $origin && $origin->path; 1986 $path = normalise $path, $origin && $origin->path;
1972 1987
1973 cf::lock_wait "map_data:$path";#d#remove 1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1974 cf::lock_wait "map_find:$path"; 1989 my $guard2 = cf::lock_acquire "map_find:$path";
1975 1990
1976 $cf::MAP{$path} || do { 1991 $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 1992 my $map = new_from_path cf::map $path
1981 or return; 1993 or return;
1982 1994
1983 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1984 1996
1986 or return; 1998 or return;
1987 1999
1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1989 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
1990 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard2;
1991 undef $guard1; 2004 undef $guard1;
1992 undef $guard2;
1993 $map->reset; 2005 $map->reset;
1994 return find $path; 2006 return find $path;
1995 } 2007 }
1996 2008
1997 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
2024 my $f = new_from_file cf::object::thawer $self->{load_path}; 2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2025 $f->skip_block; 2037 $f->skip_block;
2026 $self->_load_objects ($f) 2038 $self->_load_objects ($f)
2027 or return; 2039 or return;
2028 2040
2029 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->post_load_original
2030 if delete $self->{load_original}; 2042 if delete $self->{load_original};
2031 2043
2032 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
2033 utf8::encode $uniq; 2045 utf8::encode $uniq;
2034 unless (aio_stat $uniq) { 2046 unless (aio_stat $uniq) {
2052 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
2053 $self->decay_objects; 2065 $self->decay_objects;
2054 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
2055 $self->update_buttons; 2067 $self->update_buttons;
2056 cf::cede_to_tick; 2068 cf::cede_to_tick;
2057 $self->set_darkness_map;
2058 cf::cede_to_tick;
2059 $self->activate; 2069 $self->activate;
2060 } 2070 }
2061 2071
2062 $self->{last_save} = $cf::RUNTIME; 2072 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME); 2073 $self->last_access ($cf::RUNTIME);
2064 2074
2065 $self->in_memory (cf::MAP_IN_MEMORY); 2075 $self->in_memory (cf::MAP_ACTIVE);
2066 } 2076 }
2067 2077
2068 $self->post_load; 2078 $self->post_load;
2069} 2079}
2070 2080
2128 my ($path, $origin, $load) = @_; 2138 my ($path, $origin, $load) = @_;
2129 2139
2130 $path = normalise $path, $origin && $origin->{path}; 2140 $path = normalise $path, $origin && $origin->{path};
2131 2141
2132 if (my $map = $cf::MAP{$path}) { 2142 if (my $map = $cf::MAP{$path}) {
2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2143 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2134 } 2144 }
2135 2145
2136 $MAP_PREFETCH{$path} |= $load; 2146 $MAP_PREFETCH{$path} |= $load;
2137 2147
2138 $MAP_PREFETCHER ||= cf::async { 2148 $MAP_PREFETCHER ||= cf::async {
2175 cf::async { 2185 cf::async {
2176 $Coro::current->{desc} = "map player save"; 2186 $Coro::current->{desc} = "map player save";
2177 $_->contr->save for $self->players; 2187 $_->contr->save for $self->players;
2178 }; 2188 };
2179 2189
2190 cf::get_slot 0.02;
2191
2180 if ($uniq) { 2192 if ($uniq) {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2182 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2194 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2183 } else { 2195 } else {
2184 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2192 $self->save; 2204 $self->save;
2193 2205
2194 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2195 2207
2196 return if $self->players; 2208 return if $self->players;
2197 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_ACTIVE;
2198 return if $self->{deny_save}; 2210 return if $self->{deny_save};
2199 2211
2200 $self->in_memory (cf::MAP_SWAPPED); 2212 $self->in_memory (cf::MAP_SWAPPED);
2201 2213
2202 $self->deactivate; 2214 $self->deactivate;
2227 2239
2228 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2229 2241
2230 return if $self->players; 2242 return if $self->players;
2231 2243
2232 warn "resetting map ", $self->path; 2244 warn "resetting map ", $self->path, "\n";
2233 2245
2234 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
2235 2247
2236 # need to save uniques path 2248 # need to save uniques path
2237 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
2320 2332
2321sub unique_maps() { 2333sub unique_maps() {
2322 [ 2334 [
2323 map { 2335 map {
2324 utf8::decode $_; 2336 utf8::decode $_;
2325 /\.map$/ 2337 s/\.map$//; # TODO future compatibility hack
2338 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2339 ? ()
2326 ? normalise $_ 2340 : normalise $_
2327 : ()
2328 } @{ aio_readdir $UNIQUEDIR or [] } 2341 } @{ aio_readdir $UNIQUEDIR or [] }
2329 ] 2342 ]
2330} 2343}
2331 2344
2332package cf;
2333
2334=back 2345=back
2335 2346
2336=head3 cf::object 2347=head3 cf::object
2337 2348
2338=cut 2349=cut
2341 2352
2342=over 4 2353=over 4
2343 2354
2344=item $ob->inv_recursive 2355=item $ob->inv_recursive
2345 2356
2346Returns the inventory of the object _and_ their inventories, recursively. 2357Returns the inventory of the object I<and> their inventories, recursively,
2358but I<not> the object itself.
2347 2359
2348=cut 2360=cut
2349 2361
2350sub inv_recursive_; 2362sub inv_recursive_;
2351sub inv_recursive_ { 2363sub inv_recursive_ {
2356 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2357} 2369}
2358 2370
2359=item $ref = $ob->ref 2371=item $ref = $ob->ref
2360 2372
2361creates and returns a persistent reference to an objetc that can be stored as a string. 2373Creates and returns a persistent reference to an object that can be stored as a string.
2362 2374
2363=item $ob = cf::object::deref ($refstring) 2375=item $ob = cf::object::deref ($refstring)
2364 2376
2365returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2377returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2366even if the object actually exists. May block. 2378even if the object actually exists. May block.
2398can be C<undef>. Does the right thing when the player is currently in a 2410can be C<undef>. Does the right thing when the player is currently in a
2399dialogue with the given NPC character. 2411dialogue with the given NPC character.
2400 2412
2401=cut 2413=cut
2402 2414
2415our $SAY_CHANNEL = {
2416 id => "say",
2417 title => "Map",
2418 reply => "say ",
2419 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2420};
2421
2422our $CHAT_CHANNEL = {
2423 id => "chat",
2424 title => "Chat",
2425 reply => "chat ",
2426 tooltip => "Player chat and shouts, global to the server.",
2427};
2428
2403# rough implementation of a future "reply" method that works 2429# rough implementation of a future "reply" method that works
2404# with dialog boxes. 2430# with dialog boxes.
2405#TODO: the first argument must go, split into a $npc->reply_to ( method 2431#TODO: the first argument must go, split into a $npc->reply_to ( method
2406sub cf::object::player::reply($$$;$) { 2432sub cf::object::player::reply($$$;$) {
2407 my ($self, $npc, $msg, $flags) = @_; 2433 my ($self, $npc, $msg, $flags) = @_;
2418 my $dialog = $pl->{npc_dialog}; 2444 my $dialog = $pl->{npc_dialog};
2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2445 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2420 2446
2421 } else { 2447 } else {
2422 $msg = $npc->name . " says: $msg" if $npc; 2448 $msg = $npc->name . " says: $msg" if $npc;
2423 $self->message ($msg, $flags); 2449 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2424 } 2450 }
2425 } 2451 }
2426} 2452}
2427 2453
2428=item $object->send_msg ($channel, $msg, $color, [extra...]) 2454=item $object->send_msg ($channel, $msg, $color, [extra...])
2453 2479
2454=item $player_object->enter_link 2480=item $player_object->enter_link
2455 2481
2456Freezes the player and moves him/her to a special map (C<{link}>). 2482Freezes the player and moves him/her to a special map (C<{link}>).
2457 2483
2458The player should be reasonably safe there for short amounts of time. You 2484The player should be reasonably safe there for short amounts of time (e.g.
2459I<MUST> call C<leave_link> as soon as possible, though. 2485for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link
2487map.
2460 2488
2461Will never block. 2489Will never block.
2462 2490
2463=item $player_object->leave_link ($map, $x, $y) 2491=item $player_object->leave_link ($map, $x, $y)
2464 2492
2522 2550
2523 $map->load; 2551 $map->load;
2524 $map->load_neighbours; 2552 $map->load_neighbours;
2525 2553
2526 return unless $self->contr->active; 2554 return unless $self->contr->active;
2527 $self->activate_recursive;
2528 2555
2529 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2530 $self->enter_map ($map, $x, $y); 2557 $self->enter_map ($map, $x, $y);
2558
2559 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive;
2531} 2561}
2532 2562
2533=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2534 2564
2535Moves the player to the given map-path and coordinates by first freezing 2565Moves the player to the given map-path and coordinates by first freezing
2536her, loading and preparing them map, calling the provided $check callback 2566her, loading and preparing them map, calling the provided $check callback
2537that has to return the map if sucecssful, and then unfreezes the player on 2567that 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 2568the new (success) or old (failed) map position. In either case, $done will
2539be called at the end of this process. 2569be called at the end of this process.
2570
2571Note that $check will be called with a potentially non-loaded map, so if
2572it needs a loaded map it has to call C<< ->load >>.
2540 2573
2541=cut 2574=cut
2542 2575
2543our $GOTOGEN; 2576our $GOTOGEN;
2544 2577
2623} 2656}
2624 2657
2625sub prepare_random_map { 2658sub prepare_random_map {
2626 my ($exit) = @_; 2659 my ($exit) = @_;
2627 2660
2628 my $guard = cf::lock_acquire "exit_prepare:$exit";
2629
2630 # all this does is basically replace the /! path by 2661 # all this does is basically replace the /! path by
2631 # a new random map path (?random/...) with a seed 2662 # a new random map path (?random/...) with a seed
2632 # that depends on the exit object 2663 # that depends on the exit object
2633 2664
2634 my $rmp = parse_random_map_params $exit->msg; 2665 my $rmp = parse_random_map_params $exit->msg;
2636 if ($exit->map) { 2667 if ($exit->map) {
2637 $rmp->{region} = $exit->region->name; 2668 $rmp->{region} = $exit->region->name;
2638 $rmp->{origin_map} = $exit->map->path; 2669 $rmp->{origin_map} = $exit->map->path;
2639 $rmp->{origin_x} = $exit->x; 2670 $rmp->{origin_x} = $exit->x;
2640 $rmp->{origin_y} = $exit->y; 2671 $rmp->{origin_y} = $exit->y;
2672
2673 $exit->map->touch;
2641 } 2674 }
2642 2675
2643 $rmp->{random_seed} ||= $exit->random_seed; 2676 $rmp->{random_seed} ||= $exit->random_seed;
2644 2677
2645 my $data = cf::encode_json $rmp; 2678 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2646 my $md5 = Digest::MD5::md5_hex $data; 2679 my $md5 = Digest::MD5::md5_hex $data;
2647 my $meta = "$RANDOMDIR/$md5.meta"; 2680 my $meta = "$RANDOMDIR/$md5.meta";
2648 2681
2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2682 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2650 aio_write $fh, 0, (length $data), $data, 0; 2683 aio_write $fh, 0, (length $data), $data, 0;
2651 undef $fh; 2684 undef $fh;
2652 aio_rename "$meta~", $meta; 2685 aio_rename "$meta~", $meta;
2653 2686
2687 my $slaying = "?random/$md5";
2688
2689 if ($exit->valid) {
2654 $exit->slaying ("?random/$md5"); 2690 $exit->slaying ("?random/$md5");
2655 $exit->msg (undef); 2691 $exit->msg (undef);
2692 }
2656 } 2693 }
2657} 2694}
2658 2695
2659sub cf::object::player::enter_exit { 2696sub cf::object::player::enter_exit {
2660 my ($self, $exit) = @_; 2697 my ($self, $exit) = @_;
2661 2698
2662 return unless $self->type == cf::PLAYER; 2699 return unless $self->type == cf::PLAYER;
2663 2700
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; 2701 $self->enter_link;
2676 2702
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 { 2703 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2704 $Coro::current->{desc} = "enter_exit";
2683 2705
2684 $self->deactivate_recursive; # just to be sure
2685 unless (eval { 2706 unless (eval {
2707 $self->deactivate_recursive; # just to be sure
2708
2709 # random map handling
2710 {
2711 my $guard = cf::lock_acquire "exit_prepare:$exit";
2712
2713 prepare_random_map $exit
2714 if $exit->slaying eq "/!";
2715 }
2716
2717 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2718 my $x = $exit->stats->hp;
2719 my $y = $exit->stats->sp;
2720
2686 $self->goto ($slaying, $hp, $sp); 2721 $self->goto ($map, $x, $y);
2687 2722
2723 # if exit is damned, update players death & WoR home-position
2724 $self->contr->savebed ($map, $x, $y)
2725 if $exit->flag (cf::FLAG_DAMNED);
2726
2688 1; 2727 1
2689 }) { 2728 }) {
2690 $self->message ("Something went wrong deep within the crossfire server. " 2729 $self->message ("Something went wrong deep within the deliantra server. "
2691 . "I'll try to bring you back to the map you were before. " 2730 . "I'll try to bring you back to the map you were before. "
2692 . "Please report this to the dungeon master!", 2731 . "Please report this to the dungeon master!",
2693 cf::NDI_UNIQUE | cf::NDI_RED); 2732 cf::NDI_UNIQUE | cf::NDI_RED);
2694 2733
2695 warn "ERROR in enter_exit: $@"; 2734 warn "ERROR in enter_exit: $@";
2761 id => "infobox", 2800 id => "infobox",
2762 title => "Body Parts", 2801 title => "Body Parts",
2763 reply => undef, 2802 reply => undef,
2764 tooltip => "Shows which body parts you posess and are available", 2803 tooltip => "Shows which body parts you posess and are available",
2765 }, 2804 },
2805 "c/statistics" => {
2806 id => "infobox",
2807 title => "Statistics",
2808 reply => undef,
2809 tooltip => "Shows your primary statistics",
2810 },
2811 "c/skills" => {
2812 id => "infobox",
2813 title => "Skills",
2814 reply => undef,
2815 tooltip => "Shows your experience per skill and item power",
2816 },
2817 "c/shopitems" => {
2818 id => "infobox",
2819 title => "Shop Items",
2820 reply => undef,
2821 tooltip => "Shows the items currently for sale in this shop",
2822 },
2823 "c/resistances" => {
2824 id => "infobox",
2825 title => "Resistances",
2826 reply => undef,
2827 tooltip => "Shows your resistances",
2828 },
2829 "c/pets" => {
2830 id => "infobox",
2831 title => "Pets",
2832 reply => undef,
2833 tooltip => "Shows information abotu your pets/a specific pet",
2834 },
2835 "c/perceiveself" => {
2836 id => "infobox",
2837 title => "Perceive Self",
2838 reply => undef,
2839 tooltip => "You gained detailed knowledge about yourself",
2840 },
2766 "c/uptime" => { 2841 "c/uptime" => {
2767 id => "infobox", 2842 id => "infobox",
2768 title => "Uptime", 2843 title => "Uptime",
2769 reply => undef, 2844 reply => undef,
2770 tooltip => "How long the server has been running since last restart", 2845 tooltip => "How long the server has been running since last restart",
2773 id => "infobox", 2848 id => "infobox",
2774 title => "Map Info", 2849 title => "Map Info",
2775 reply => undef, 2850 reply => undef,
2776 tooltip => "Information related to the maps", 2851 tooltip => "Information related to the maps",
2777 }, 2852 },
2853 "c/party" => {
2854 id => "party",
2855 title => "Party",
2856 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party",
2858 },
2859 "c/death" => {
2860 id => "death",
2861 title => "Death",
2862 reply => undef,
2863 tooltip => "Reason for and more info about your most recent death",
2864 },
2865 "c/say" => $SAY_CHANNEL,
2866 "c/chat" => $CHAT_CHANNEL,
2778); 2867);
2779 2868
2780sub cf::client::send_msg { 2869sub cf::client::send_msg {
2781 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2782 2871
2783 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg)
2873 unless $color & cf::NDI_VERBATIM;
2784 2874
2785 $color &= cf::NDI_CLIENT_MASK; # just in case... 2875 $color &= cf::NDI_CLIENT_MASK; # just in case...
2786 2876
2787 # check predefined channels, for the benefit of C 2877 # check predefined channels, for the benefit of C
2788 if ($CHANNEL{$channel}) { 2878 if ($CHANNEL{$channel}) {
2789 $channel = $CHANNEL{$channel}; 2879 $channel = $CHANNEL{$channel};
2790 2880
2791 $self->ext_msg (channel_info => $channel) 2881 $self->ext_msg (channel_info => $channel);
2792 if $self->can_msg;
2793
2794 $channel = $channel->{id}; 2882 $channel = $channel->{id};
2795 2883
2796 } elsif (ref $channel) { 2884 } elsif (ref $channel) {
2797 # send meta info to client, if not yet sent 2885 # send meta info to client, if not yet sent
2798 unless (exists $self->{channel}{$channel->{id}}) { 2886 unless (exists $self->{channel}{$channel->{id}}) {
2799 $self->{channel}{$channel->{id}} = $channel; 2887 $self->{channel}{$channel->{id}} = $channel;
2800 $self->ext_msg (channel_info => $channel) 2888 $self->ext_msg (channel_info => $channel);
2801 if $self->can_msg;
2802 } 2889 }
2803 2890
2804 $channel = $channel->{id}; 2891 $channel = $channel->{id};
2805 } 2892 }
2806 2893
2807 return unless @extra || length $msg; 2894 return unless @extra || length $msg;
2808 2895
2809 if ($self->can_msg) {
2810 # default colour, mask it out 2896 # default colour, mask it out
2811 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2897 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2812 if $color & cf::NDI_DEF; 2898 if $color & cf::NDI_DEF;
2813 2899
2814 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2900 my $pkt = "msg "
2901 . $self->{json_coder}->encode (
2815 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2816 } else { 2903 );
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 2904
2828 $color &= cf::NDI_COLOR_MASK; 2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2829 2908
2830 utf8::encode $msg; 2909 # split very large packets
2831 2910 if (8192 < length $pkt and $self->{can_lzf}) {
2832 if (0 && $msg =~ /\[/) { 2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 # COMMAND/INFO 2912 $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 } 2913 }
2914
2915 $self->send_packet ($pkt);
2841} 2916}
2842 2917
2843=item $client->ext_msg ($type, @msg) 2918=item $client->ext_msg ($type, @msg)
2844 2919
2845Sends an ext event to the client. 2920Sends an ext event to the client.
3019 3094
3020The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
3021 3096
3022 cf::object 3097 cf::object
3023 contr pay_amount pay_player map x y force_find force_add destroy 3098 contr pay_amount pay_player map x y force_find force_add destroy
3024 insert remove name archname title slaying race decrease_ob_nr 3099 insert remove name archname title slaying race decrease split
3100 value
3025 3101
3026 cf::object::player 3102 cf::object::player
3027 player 3103 player
3028 3104
3029 cf::player 3105 cf::player
3034 3110
3035=cut 3111=cut
3036 3112
3037for ( 3113for (
3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3114 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3039 insert remove inv name archname title slaying race 3115 insert remove inv nrof name archname title slaying race
3040 decrease_ob_nr destroy)], 3116 decrease split destroy change_exp value msg lore send_msg)],
3041 ["cf::object::player" => qw(player)], 3117 ["cf::object::player" => qw(player)],
3042 ["cf::player" => qw(peaceful)], 3118 ["cf::player" => qw(peaceful send_msg)],
3043 ["cf::map" => qw(trigger)], 3119 ["cf::map" => qw(trigger)],
3044) { 3120) {
3045 no strict 'refs'; 3121 no strict 'refs';
3046 my ($pkg, @funs) = @$_; 3122 my ($pkg, @funs) = @$_;
3047 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3064 my ($code, %vars) = @_; 3140 my ($code, %vars) = @_;
3065 3141
3066 my $qcode = $code; 3142 my $qcode = $code;
3067 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3068 $qcode =~ s/\n/\\n/g; 3144 $qcode =~ s/\n/\\n/g;
3145
3146 %vars = (_dummy => 0) unless %vars;
3069 3147
3070 local $_; 3148 local $_;
3071 local @safe::cf::_safe_eval_args = values %vars; 3149 local @safe::cf::_safe_eval_args = values %vars;
3072 3150
3073 my $eval = 3151 my $eval =
3253 while (my ($k, $v) = each %$want) { 3331 while (my ($k, $v) = each %$want) {
3254 $ns->fx_want ($k, $v); 3332 $ns->fx_want ($k, $v);
3255 } 3333 }
3256}; 3334};
3257 3335
3336sub load_resource_file($) {
3337 my $guard = lock_acquire "load_resource_file";
3338
3339 my $status = load_resource_file_ $_[0];
3340 get_slot 0.1, 100;
3341 cf::arch::commit_load;
3342
3343 $status
3344}
3345
3258sub reload_regions { 3346sub reload_regions {
3259 # HACK to clear player env face cache, we need some signal framework 3347 # HACK to clear player env face cache, we need some signal framework
3260 # for this (global event?) 3348 # for this (global event?)
3261 %ext::player_env::MUSIC_FACE_CACHE = (); 3349 %ext::player_env::MUSIC_FACE_CACHE = ();
3262 3350
3275} 3363}
3276 3364
3277sub reload_archetypes { 3365sub reload_archetypes {
3278 load_resource_file "$DATADIR/archetypes" 3366 load_resource_file "$DATADIR/archetypes"
3279 or die "unable to load archetypes\n"; 3367 or die "unable to load archetypes\n";
3280 #d# NEED to laod twice to resolve forward references
3281 # this really needs to be done in an extra post-pass
3282 # (which needs to be synchronous, so solve it differently)
3283 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n";
3285} 3368}
3286 3369
3287sub reload_treasures { 3370sub reload_treasures {
3288 load_resource_file "$DATADIR/treasures" 3371 load_resource_file "$DATADIR/treasures"
3289 or die "unable to load treasurelists\n"; 3372 or die "unable to load treasurelists\n";
3290} 3373}
3291 3374
3292sub reload_resources { 3375sub reload_resources {
3293 warn "reloading resource files...\n"; 3376 warn "reloading resource files...\n";
3294 3377
3378 reload_facedata;
3379 reload_archetypes;
3295 reload_regions; 3380 reload_regions;
3296 reload_facedata;
3297 #reload_archetypes;#d#
3298 reload_archetypes;
3299 reload_treasures; 3381 reload_treasures;
3300 3382
3301 warn "finished reloading resource files\n"; 3383 warn "finished reloading resource files\n";
3302}
3303
3304sub init {
3305 reload_resources;
3306} 3384}
3307 3385
3308sub reload_config { 3386sub reload_config {
3309 open my $fh, "<:utf8", "$CONFDIR/config" 3387 open my $fh, "<:utf8", "$CONFDIR/config"
3310 or return; 3388 or return;
3311 3389
3312 local $/; 3390 local $/;
3313 *CFG = YAML::Syck::Load <$fh>; 3391 *CFG = YAML::Load <$fh>;
3314 3392
3315 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3316 3394
3317 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3318 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3396 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3324 }; 3402 };
3325 warn $@ if $@; 3403 warn $@ if $@;
3326 } 3404 }
3327} 3405}
3328 3406
3407sub pidfile() {
3408 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409 or die "$PIDFILE: $!";
3410 flock $fh, &Fcntl::LOCK_EX
3411 or die "$PIDFILE: flock: $!";
3412 $fh
3413}
3414
3415# make sure only one server instance is running at any one time
3416sub atomic {
3417 my $fh = pidfile;
3418
3419 my $pid = <$fh>;
3420 kill 9, $pid if $pid > 0;
3421
3422 seek $fh, 0, 0;
3423 print $fh $$;
3424}
3425
3426sub main_loop {
3427 warn "EV::loop starting\n";
3428 if (1) {
3429 EV::loop;
3430 }
3431 warn "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP;
3433}
3434
3329sub main { 3435sub main {
3436 cf::init_globals; # initialise logging
3437
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449
3330 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3331 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
3332 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3333 (async { 3453 (async {
3334 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3335 EV::loop EV::LOOP_ONESHOT; 3455 EV::loop EV::LOOP_ONESHOT;
3336 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3337 }; 3457 };
3338 3458
3459 evthread_start IO::AIO::poll_fileno;
3460
3461 cf::sync_job {
3462 reload_resources;
3339 reload_config; 3463 reload_config;
3340 db_init; 3464 db_init;
3465
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid;
3469 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills;
3472
3473 cf::init_beforeplay;
3474
3475 atomic;
3476
3341 load_extensions; 3477 load_extensions;
3342 3478
3343 $TICK_WATCHER->start; 3479 utime time, time, $RUNTIMEFILE;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3480
3345 EV::loop; 3481 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484
3485 (pop @POST_INIT)->(0) while @POST_INIT;
3486 };
3487
3488 main_loop;
3346} 3489}
3347 3490
3348############################################################################# 3491#############################################################################
3349# initialisation and cleanup 3492# initialisation and cleanup
3350 3493
3356 cf::cleanup "SIG$signal"; 3499 cf::cleanup "SIG$signal";
3357 }; 3500 };
3358 } 3501 }
3359} 3502}
3360 3503
3361sub write_runtime { 3504sub write_runtime_sync {
3362 my $runtime = "$LOCALDIR/runtime";
3363
3364 # first touch the runtime file to show we are still running: 3505 # first touch the runtime file to show we are still running:
3365 # the fsync below can take a very very long time. 3506 # the fsync below can take a very very long time.
3366 3507
3367 IO::AIO::aio_utime $runtime, undef, undef; 3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3368 3509
3369 my $guard = cf::lock_acquire "write_runtime"; 3510 my $guard = cf::lock_acquire "write_runtime";
3370 3511
3371 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3372 or return; 3513 or return;
3373 3514
3374 my $value = $cf::RUNTIME + 90 + 10; 3515 my $value = $cf::RUNTIME + 90 + 10;
3375 # 10 is the runtime save interval, for a monotonic clock 3516 # 10 is the runtime save interval, for a monotonic clock
3376 # 60 allows for the watchdog to kill the server. 3517 # 60 allows for the watchdog to kill the server.
3386 aio_utime $fh, undef, undef; 3527 aio_utime $fh, undef, undef;
3387 3528
3388 close $fh 3529 close $fh
3389 or return; 3530 or return;
3390 3531
3391 aio_rename "$runtime~", $runtime 3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3392 and return; 3533 and return;
3393 3534
3394 warn "runtime file written.\n"; 3535 warn "runtime file written.\n";
3395 3536
3396 1 3537 1
3538}
3539
3540our $uuid_lock;
3541our $uuid_skip;
3542
3543sub write_uuid_sync($) {
3544 $uuid_skip ||= $_[0];
3545
3546 return if $uuid_lock;
3547 local $uuid_lock = 1;
3548
3549 my $uuid = "$LOCALDIR/uuid";
3550
3551 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3552 or return;
3553
3554 my $value = uuid_seq uuid_cur;
3555
3556 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n";
3558 return;
3559 }
3560
3561 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0;
3563
3564 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3565 and return;
3566
3567 # always fsync - this file is important
3568 aio_fsync $fh
3569 and return;
3570
3571 close $fh
3572 or return;
3573
3574 aio_rename "$uuid~", $uuid
3575 and return;
3576
3577 warn "uuid file written ($value).\n";
3578
3579 1
3580
3581}
3582
3583sub write_uuid($$) {
3584 my ($skip, $sync) = @_;
3585
3586 $sync ? write_uuid_sync $skip
3587 : async { write_uuid_sync $skip };
3397} 3588}
3398 3589
3399sub emergency_save() { 3590sub emergency_save() {
3400 my $freeze_guard = cf::freeze_mainloop; 3591 my $freeze_guard = cf::freeze_mainloop;
3401 3592
3402 warn "enter emergency perl save\n"; 3593 warn "emergency_perl_save: enter\n";
3403 3594
3404 cf::sync_job { 3595 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600
3405 # use a peculiar iteration method to avoid tripping on perl 3601 # use a peculiar iteration method to avoid tripping on perl
3406 # refcount bugs in for. also avoids problems with players 3602 # refcount bugs in for. also avoids problems with players
3407 # and maps saved/destroyed asynchronously. 3603 # and maps saved/destroyed asynchronously.
3408 warn "begin emergency player save\n"; 3604 warn "emergency_perl_save: begin player save\n";
3409 for my $login (keys %cf::PLAYER) { 3605 for my $login (keys %cf::PLAYER) {
3410 my $pl = $cf::PLAYER{$login} or next; 3606 my $pl = $cf::PLAYER{$login} or next;
3411 $pl->valid or next; 3607 $pl->valid or next;
3412 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3413 $pl->save; 3609 $pl->save;
3414 } 3610 }
3415 warn "end emergency player save\n"; 3611 warn "emergency_perl_save: end player save\n";
3416 3612
3417 warn "begin emergency map save\n"; 3613 warn "emergency_perl_save: begin map save\n";
3418 for my $path (keys %cf::MAP) { 3614 for my $path (keys %cf::MAP) {
3419 my $map = $cf::MAP{$path} or next; 3615 my $map = $cf::MAP{$path} or next;
3420 $map->valid or next; 3616 $map->valid or next;
3421 $map->save; 3617 $map->save;
3422 } 3618 }
3423 warn "end emergency map save\n"; 3619 warn "emergency_perl_save: end map save\n";
3424 3620
3425 warn "begin emergency database checkpoint\n"; 3621 warn "emergency_perl_save: begin database checkpoint\n";
3426 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
3427 warn "end emergency database checkpoint\n"; 3623 warn "emergency_perl_save: end database checkpoint\n";
3624
3625 warn "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1;
3627 warn "emergency_perl_save: end write uuid\n";
3428 }; 3628 };
3429 3629
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3430 warn "leave emergency perl save\n"; 3635 warn "emergency_perl_save: leave\n";
3431} 3636}
3432 3637
3433sub post_cleanup { 3638sub post_cleanup {
3434 my ($make_core) = @_; 3639 my ($make_core) = @_;
3435 3640
3436 warn Carp::longmess "post_cleanup backtrace" 3641 warn Carp::longmess "post_cleanup backtrace"
3437 if $make_core; 3642 if $make_core;
3643
3644 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$;
3646}
3647
3648# a safer delete_package, copied from Symbol
3649sub clear_package($) {
3650 my $pkg = shift;
3651
3652 # expand to full symbol table name if needed
3653 unless ($pkg =~ /^main::.*::$/) {
3654 $pkg = "main$pkg" if $pkg =~ /^::/;
3655 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3656 $pkg .= '::' unless $pkg =~ /::$/;
3657 }
3658
3659 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3660 my $stem_symtab = *{$stem}{HASH};
3661
3662 defined $stem_symtab and exists $stem_symtab->{$leaf}
3663 or return;
3664
3665 # clear all symbols
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 }
3671 warn "cleared package $pkg\n";#d#
3438} 3672}
3439 3673
3440sub do_reload_perl() { 3674sub do_reload_perl() {
3441 # can/must only be called in main 3675 # can/must only be called in main
3442 if ($Coro::current != $Coro::main) { 3676 if ($Coro::current != $Coro::main) {
3443 warn "can only reload from main coroutine"; 3677 warn "can only reload from main coroutine";
3444 return; 3678 return;
3445 } 3679 }
3446 3680
3681 return if $RELOAD++;
3682
3683 my $t1 = EV::time;
3684
3685 while ($RELOAD) {
3447 warn "reloading..."; 3686 warn "reloading...";
3448 3687
3449 warn "entering sync_job"; 3688 warn "entering sync_job";
3450 3689
3451 cf::sync_job { 3690 cf::sync_job {
3452 cf::write_runtime; # external watchdog should not bark 3691 cf::write_runtime_sync; # external watchdog should not bark
3453 cf::emergency_save; 3692 cf::emergency_save;
3454 cf::write_runtime; # external watchdog should not bark 3693 cf::write_runtime_sync; # external watchdog should not bark
3455 3694
3456 warn "syncing database to disk"; 3695 warn "syncing database to disk";
3457 BDB::db_env_txn_checkpoint $DB_ENV; 3696 BDB::db_env_txn_checkpoint $DB_ENV;
3458 3697
3459 # if anything goes wrong in here, we should simply crash as we already saved 3698 # if anything goes wrong in here, we should simply crash as we already saved
3460 3699
3461 warn "flushing outstanding aio requests"; 3700 warn "flushing outstanding aio requests";
3462 for (;;) {
3463 BDB::flush;
3464 IO::AIO::flush;
3465 Coro::cede_notself;
3466 last unless IO::AIO::nreqs || BDB::nreqs; 3701 while (IO::AIO::nreqs || BDB::nreqs) {
3467 warn "iterate..."; 3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3468 }
3469
3470 ++$RELOAD;
3471
3472 warn "cancelling all extension coros";
3473 $_->cancel for values %EXT_CORO;
3474 %EXT_CORO = ();
3475
3476 warn "removing commands";
3477 %COMMAND = ();
3478
3479 warn "removing ext/exti commands";
3480 %EXTCMD = ();
3481 %EXTICMD = ();
3482
3483 warn "unloading/nuking all extensions";
3484 for my $pkg (@EXTS) {
3485 warn "... unloading $pkg";
3486
3487 if (my $cb = $pkg->can ("unload")) {
3488 eval {
3489 $cb->($pkg);
3490 1
3491 } or warn "$pkg unloaded, but with errors: $@";
3492 } 3703 }
3493 3704
3494 warn "... nuking $pkg"; 3705 warn "cancelling all extension coros";
3495 Symbol::delete_package $pkg; 3706 $_->cancel for values %EXT_CORO;
3496 } 3707 %EXT_CORO = ();
3497 3708
3498 warn "unloading all perl modules loaded from $LIBDIR"; 3709 warn "removing commands";
3499 while (my ($k, $v) = each %INC) { 3710 %COMMAND = ();
3500 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3501 3711
3712 warn "removing ext/exti commands";
3713 %EXTCMD = ();
3714 %EXTICMD = ();
3715
3716 warn "unloading/nuking all extensions";
3717 for my $pkg (@EXTS) {
3502 warn "... unloading $k"; 3718 warn "... unloading $pkg";
3503 delete $INC{$k};
3504 3719
3505 $k =~ s/\.pm$//;
3506 $k =~ s/\//::/g;
3507
3508 if (my $cb = $k->can ("unload_module")) { 3720 if (my $cb = $pkg->can ("unload")) {
3721 eval {
3509 $cb->(); 3722 $cb->($pkg);
3723 1
3724 } or warn "$pkg unloaded, but with errors: $@";
3725 }
3726
3727 warn "... clearing $pkg";
3728 clear_package $pkg;
3510 } 3729 }
3511 3730
3512 Symbol::delete_package $k; 3731 warn "unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734
3735 warn "... unloading $k";
3736 delete $INC{$k};
3737
3738 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g;
3740
3741 if (my $cb = $k->can ("unload_module")) {
3742 $cb->();
3743 }
3744
3745 clear_package $k;
3513 } 3746 }
3514 3747
3515 warn "getting rid of safe::, as good as possible"; 3748 warn "getting rid of safe::, as good as possible";
3516 Symbol::delete_package "safe::$_" 3749 clear_package "safe::$_"
3517 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3518 3751
3519 warn "unloading cf.pm \"a bit\""; 3752 warn "unloading cf.pm \"a bit\"";
3520 delete $INC{"cf.pm"}; 3753 delete $INC{"cf.pm"};
3521 delete $INC{"cf/pod.pm"}; 3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3522 3755
3523 # don't, removes xs symbols, too, 3756 # don't, removes xs symbols, too,
3524 # and global variables created in xs 3757 # and global variables created in xs
3525 #Symbol::delete_package __PACKAGE__; 3758 #clear_package __PACKAGE__;
3526 3759
3527 warn "unload completed, starting to reload now"; 3760 warn "unload completed, starting to reload now";
3528 3761
3529 warn "reloading cf.pm"; 3762 warn "reloading cf.pm";
3530 require cf; 3763 require cf;
3531 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3532 3765
3533 warn "loading config and database again"; 3766 warn "loading config and database again";
3534 cf::reload_config; 3767 cf::reload_config;
3535 3768
3536 warn "loading extensions"; 3769 warn "loading extensions";
3537 cf::load_extensions; 3770 cf::load_extensions;
3538 3771
3772 if ($REATTACH_ON_RELOAD) {
3539 warn "reattaching attachments to objects/players"; 3773 warn "reattaching attachments to objects/players";
3540 _global_reattach; # objects, sockets 3774 _global_reattach; # objects, sockets
3541 warn "reattaching attachments to maps"; 3775 warn "reattaching attachments to maps";
3542 reattach $_ for values %MAP; 3776 reattach $_ for values %MAP;
3543 warn "reattaching attachments to players"; 3777 warn "reattaching attachments to players";
3544 reattach $_ for values %PLAYER; 3778 reattach $_ for values %PLAYER;
3779 }
3545 3780
3781 warn "running post_init jobs";
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783
3546 warn "leaving sync_job"; 3784 warn "leaving sync_job";
3547 3785
3548 1 3786 1
3549 } or do { 3787 } or do {
3550 warn $@; 3788 warn $@;
3551 warn "error while reloading, exiting."; 3789 cf::cleanup "error while reloading, exiting.";
3552 exit 1;
3553 }; 3790 };
3554 3791
3555 warn "reloaded"; 3792 warn "reloaded";
3793 --$RELOAD;
3794 }
3795
3796 $t1 = EV::time - $t1;
3797 warn "reload completed in ${t1}s\n";
3556}; 3798};
3557 3799
3558our $RELOAD_WATCHER; # used only during reload 3800our $RELOAD_WATCHER; # used only during reload
3559 3801
3560sub reload_perl() { 3802sub reload_perl() {
3561 # doing reload synchronously and two reloads happen back-to-back, 3803 # doing reload synchronously and two reloads happen back-to-back,
3562 # coro crashes during coro_state_free->destroy here. 3804 # coro crashes during coro_state_free->destroy here.
3563 3805
3806 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions;
3808
3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl;
3565 undef $RELOAD_WATCHER; 3811 undef $RELOAD_WATCHER;
3566 do_reload_perl; 3812 };
3567 }; 3813 };
3568} 3814}
3569 3815
3570register_command "reload" => sub { 3816register_command "reload" => sub {
3571 my ($who, $arg) = @_; 3817 my ($who, $arg) = @_;
3585 3831
3586our @WAIT_FOR_TICK; 3832our @WAIT_FOR_TICK;
3587our @WAIT_FOR_TICK_BEGIN; 3833our @WAIT_FOR_TICK_BEGIN;
3588 3834
3589sub wait_for_tick { 3835sub wait_for_tick {
3590 return unless $TICK_WATCHER->is_active;
3591 return if $Coro::current == $Coro::main; 3836 return if tick_inhibit || $Coro::current == $Coro::main;
3592 3837
3593 my $signal = new Coro::Signal; 3838 my $signal = new Coro::Signal;
3594 push @WAIT_FOR_TICK, $signal; 3839 push @WAIT_FOR_TICK, $signal;
3595 $signal->wait; 3840 $signal->wait;
3596} 3841}
3597 3842
3598sub wait_for_tick_begin { 3843sub wait_for_tick_begin {
3599 return unless $TICK_WATCHER->is_active;
3600 return if $Coro::current == $Coro::main; 3844 return if tick_inhibit || $Coro::current == $Coro::main;
3601 3845
3602 my $signal = new Coro::Signal; 3846 my $signal = new Coro::Signal;
3603 push @WAIT_FOR_TICK_BEGIN, $signal; 3847 push @WAIT_FOR_TICK_BEGIN, $signal;
3604 $signal->wait; 3848 $signal->wait;
3605} 3849}
3606 3850
3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3851sub tick {
3608 if ($Coro::current != $Coro::main) { 3852 if ($Coro::current != $Coro::main) {
3609 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3610 unless ++$bug_warning > 10; 3854 unless ++$bug_warning > 10;
3611 return; 3855 return;
3612 } 3856 }
3613 3857
3614 $NOW = $tick_start = EV::now;
3615
3616 cf::server_tick; # one server iteration 3858 cf::server_tick; # one server iteration
3617
3618 $RUNTIME += $TICK;
3619 $NEXT_TICK = $_[0]->at;
3620 3859
3621 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3860 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3623 Coro::async_pool { 3862 Coro::async_pool {
3624 $Coro::current->{desc} = "runtime saver"; 3863 $Coro::current->{desc} = "runtime saver";
3625 write_runtime 3864 write_runtime_sync
3626 or warn "ERROR: unable to write runtime file: $!"; 3865 or warn "ERROR: unable to write runtime file: $!";
3627 }; 3866 };
3628 } 3867 }
3629 3868
3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3632 } 3871 }
3633 while (my $sig = shift @WAIT_FOR_TICK) { 3872 while (my $sig = shift @WAIT_FOR_TICK) {
3634 $sig->send; 3873 $sig->send;
3635 } 3874 }
3636 3875
3637 $LOAD = ($NOW - $tick_start) / $TICK; 3876 $LOAD = ($NOW - $TICK_START) / $TICK;
3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3877 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3639 3878
3640 _post_tick; 3879 if (0) {
3641}; 3880 if ($NEXT_TICK) {
3642$TICK_WATCHER->priority (EV::MAXPRI); 3881 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d#
3884 }
3885 }
3886}
3643 3887
3644{ 3888{
3645 # configure BDB 3889 # configure BDB
3646 3890
3647 BDB::min_parallel 8; 3891 BDB::min_parallel 8;
3648 BDB::max_poll_reqs $TICK * 0.1; 3892 BDB::max_poll_reqs $TICK * 0.1;
3649 $Coro::BDB::WATCHER->priority (1); 3893 $AnyEvent::BDB::WATCHER->priority (1);
3650 3894
3651 unless ($DB_ENV) { 3895 unless ($DB_ENV) {
3652 $DB_ENV = BDB::db_env_create; 3896 $DB_ENV = BDB::db_env_create;
3653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3897 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3654 | BDB::LOG_AUTOREMOVE, 1); 3898 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3899 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3655 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3900 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3656 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3901 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3657 3902
3658 cf::sync_job { 3903 cf::sync_job {
3659 eval { 3904 eval {
3685{ 3930{
3686 # configure IO::AIO 3931 # configure IO::AIO
3687 3932
3688 IO::AIO::min_parallel 8; 3933 IO::AIO::min_parallel 8;
3689 IO::AIO::max_poll_time $TICK * 0.1; 3934 IO::AIO::max_poll_time $TICK * 0.1;
3690 $Coro::AIO::WATCHER->priority (1); 3935 undef $AnyEvent::AIO::WATCHER;
3691} 3936}
3692 3937
3693my $_log_backtrace; 3938my $_log_backtrace;
3694 3939
3695sub _log_backtrace { 3940sub _log_backtrace {
3698 $msg =~ s/\n//; 3943 $msg =~ s/\n//;
3699 3944
3700 # limit the # of concurrent backtraces 3945 # limit the # of concurrent backtraces
3701 if ($_log_backtrace < 2) { 3946 if ($_log_backtrace < 2) {
3702 ++$_log_backtrace; 3947 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg;
3703 async { 3949 async {
3704 $Coro::current->{desc} = "abt $msg"; 3950 $Coro::current->{desc} = "abt $msg";
3705 3951
3706 my @bt = fork_call { 3952 my @bt = fork_call {
3707 @addr = map { sprintf "%x", $_ } @addr; 3953 @addr = map { sprintf "%x", $_ } @addr;
3718 } 3964 }
3719 3965
3720 @funcs 3966 @funcs
3721 }; 3967 };
3722 3968
3723 LOG llevInfo, "[ABT] $msg\n"; 3969 LOG llevInfo, "[ABT] $perl_bt\n";
3970 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3724 LOG llevInfo, "[ABT] $_\n" for @bt; 3971 LOG llevInfo, "[ABT] $_\n" for @bt;
3725 --$_log_backtrace; 3972 --$_log_backtrace;
3726 }; 3973 };
3727 } else { 3974 } else {
3728 LOG llevInfo, "[ABT] $msg\n"; 3975 LOG llevInfo, "[ABT] $msg\n";
3729 LOG llevInfo, "[ABT] [suppressed]\n"; 3976 LOG llevInfo, "[ABT] [suppressed]\n";
3730 } 3977 }
3731} 3978}
3732 3979
3733# load additional modules 3980# load additional modules
3734use cf::pod; 3981require "cf/$_.pm" for @EXTRA_MODULES;
3735 3982
3736END { cf::emergency_save } 3983END { cf::emergency_save }
3737 3984
37381 39851
3739 3986

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines