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.426 by root, Thu Apr 24 04:40:31 2008 UTC vs.
Revision 1.473 by root, Fri Jun 26 16:32:10 2009 UTC

19# The authors can be reached via e-mail to <support@deliantra.net> 19# The authors can be reached via e-mail to <support@deliantra.net>
20# 20#
21 21
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict qw(vars subs);
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV 3.2; 31use EV;
31use Opcode; 32use Opcode;
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35 36
37use Guard ();
36use Coro 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5; 56use Digest::MD5;
52use Fcntl; 57use Fcntl;
53use YAML (); 58use YAML ();
54use IO::AIO 2.51 (); 59use IO::AIO ();
55use Time::HiRes; 60use Time::HiRes;
56use Compress::LZF; 61use Compress::LZF;
57use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
58 65
59# configure various modules to our taste 66# configure various modules to our taste
60# 67#
61$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
66 76
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 78
69our %COMMAND = (); 79our %COMMAND = ();
70our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
73our %EXTCMD = (); 83our %EXTCMD = ();
74our %EXTICMD = (); 84our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
77 87
78our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 89our @EVENT;
80 90
81our $CONFDIR = confdir; 91our $CONFDIR = confdir;
82our $DATADIR = datadir; 92our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
92our %RESOURCE; 105our %RESOURCE;
93 106
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 109our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default on
99 111
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 115our $DB_ENV;
105 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
106our %CFG; 119our %CFG;
107 120
108our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 122our $RUNTIME;
110our $NOW; 123our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 134our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
123 136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
140
124binmode STDOUT; 141binmode STDOUT;
125binmode STDERR; 142binmode STDERR;
126 143
127# read virtual server time, if available 144# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
132} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
133 152
134mkdir $_ 153mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 155
137our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
242for my $pkg (qw( 261for my $pkg (qw(
243 cf::global cf::attachable 262 cf::global cf::attachable
244 cf::object cf::object::player 263 cf::object cf::object::player
245 cf::client cf::player 264 cf::client cf::player
246 cf::arch cf::living 265 cf::arch cf::living
266 cf::map cf::mapspace
247 cf::map cf::party cf::region 267 cf::party cf::region
248)) { 268)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 270}
252 271
253$EV::DIED = sub { 272$EV::DIED = sub {
254 warn "error in event callback: @_"; 273 warn "error in event callback: @_";
296our $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
297 316
298sub encode_json($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 318sub decode_json($) { $json_coder->decode ($_[0]) }
300 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
301=item cf::lock_wait $string 334=item cf::lock_wait $string
302 335
303Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
304 337
305=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
306 339
307Wait 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
308a 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,
309for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
310returned. 343returned.
311 344
312Locks 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
313deadlocked coro. 346deadlocked coro.
319 352
320Return 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.
321 354
322=cut 355=cut
323 356
324our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 358
327sub lock_wait($) { 359sub lock_wait($) {
328 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 361}
341 362
342sub lock_acquire($) { 363sub lock_acquire($) {
343 my ($key) = @_; 364 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 365}
357 366
358sub lock_active($) { 367sub lock_active($) {
359 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 369}
363 370
364sub freeze_mainloop { 371sub freeze_mainloop {
365 tick_inhibit_inc; 372 tick_inhibit_inc;
366 373
367 Coro::guard \&tick_inhibit_dec; 374 &Guard::guard (\&tick_inhibit_dec);
368} 375}
369 376
370=item cf::periodic $interval, $cb 377=item cf::periodic $interval, $cb
371 378
372Like 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
724 731
725############################################################################# 732#############################################################################
726 733
727=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
728 735
729Many 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
730attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
732 739
733In 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>
734C<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
784=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
785 792
786Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
788 795
789Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
790that 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.
791 798
792These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
793 800
794=over 4 801=over 4
1085 1092
1086sub reattach { 1093sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1095 my ($obj) = @_;
1089 1096
1097 # no longer needed after getting rid of delete_package?
1090 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
1091 1099
1092 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
1093 1101
1094 @$registry = (); 1102 @$registry = ();
1095 1103
1141 utf8::decode (my $decname = $filename); 1149 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
1144 1152
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 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 }
1149 close $fh; 1160 aio_close $fh;
1150 1161
1151 if (@$objs) { 1162 if (@$objs) {
1152 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) {
1153 chmod SAVE_MODE, $fh; 1164 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
1156 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 }
1157 close $fh; 1171 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1172 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1173 }
1160 } else { 1174 } else {
1161 aio_unlink "$filename.pst"; 1175 aio_unlink "$filename.pst";
1162 } 1176 }
1163 1177
1164 aio_rename "$filename~", $filename; 1178 aio_rename "$filename~", $filename;
1179
1180 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1182 } else {
1166 warn "FATAL: $filename~: $!\n"; 1183 warn "unable to save objects: $filename~: $!\n";
1167 } 1184 }
1168 } else { 1185 } else {
1169 aio_unlink $filename; 1186 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1187 aio_unlink "$filename.pst";
1171 } 1188 }
1262 my ($name, $cb) = @_; 1279 my ($name, $cb) = @_;
1263 1280
1264 $EXTICMD{$name} = $cb; 1281 $EXTICMD{$name} = $cb;
1265} 1282}
1266 1283
1284use File::Glob ();
1285
1267cf::player->attach ( 1286cf::player->attach (
1268 on_command => sub { 1287 on_command => sub {
1269 my ($pl, $name, $params) = @_; 1288 my ($pl, $name, $params) = @_;
1270 1289
1271 my $cb = $COMMAND{$name} 1290 my $cb = $COMMAND{$name}
1303 1322
1304 cf::override; 1323 cf::override;
1305 }, 1324 },
1306); 1325);
1307 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
1308sub load_extensions { 1340sub load_extensions {
1309 cf::sync_job { 1341 cf::sync_job {
1310 my %todo; 1342 my %todo;
1311 1343
1312 for my $path (<$LIBDIR/*.ext>) { 1344 for my $path (<$LIBDIR/*.ext>) {
1331 1363
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1364 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1365 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1366
1335 $ext{source} = 1367 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1368 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1369 . "#line 1 \"$path\"\n{\n"
1338 . $source 1370 . $source
1339 . "\n};\n1"; 1371 . "\n};\n1";
1340 1372
1341 $todo{$base} = \%ext; 1373 $todo{$base} = \%ext;
1381 1413
1382=back 1414=back
1383 1415
1384=head2 CORE EXTENSIONS 1416=head2 CORE EXTENSIONS
1385 1417
1386Functions and methods that extend core crossfire objects. 1418Functions and methods that extend core deliantra objects.
1387 1419
1388=cut 1420=cut
1389 1421
1390package cf::player; 1422package cf::player;
1391 1423
1434 1466
1435sub exists($) { 1467sub exists($) {
1436 my ($login) = @_; 1468 my ($login) = @_;
1437 1469
1438 $cf::PLAYER{$login} 1470 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1471 or !aio_stat path $login
1440} 1472}
1441 1473
1442sub find($) { 1474sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1475 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1476 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1488 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1489 or return;
1458 1490
1459 my $pl = cf::player::load_pl $f 1491 my $pl = cf::player::load_pl $f
1460 or return; 1492 or return;
1493
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1494 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1495 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1496 $cf::PLAYER{$login} = $pl
1464 } 1497 }
1465 } 1498 }
1518 my ($pl) = @_; 1551 my ($pl) = @_;
1519 1552
1520 my $name = $pl->ob->name; 1553 my $name = $pl->ob->name;
1521 1554
1522 $pl->{deny_save} = 1; 1555 $pl->{deny_save} = 1;
1523 $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
1524 1557
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1559 $pl->deactivate;
1560 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1561 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1562 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1563 $pl->ns->destroy if $pl->ns;
1529 1564
1530 my $path = playerdir $pl; 1565 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1566 my $temp = "$path~$cf::RUNTIME~deleting~";
1570 1605
1571 for my $login (@$dirs) { 1606 for my $login (@$dirs) {
1572 my $path = path $login; 1607 my $path = path $login;
1573 1608
1574 # a .pst is a dead give-away for a valid player 1609 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1610 # if no pst file found, open and chekc for blocked users
1611 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1612 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1613 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1614 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1615 }
1580 1616
1611 } 1647 }
1612 1648
1613 \@paths 1649 \@paths
1614} 1650}
1615 1651
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1652=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1653
1618Expand crossfire pod fragments into protocol xml. 1654Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1655
1709=item $player->ext_reply ($msgid, @msg) 1656=item $player->ext_reply ($msgid, @msg)
1710 1657
1711Sends an ext reply to the player. 1658Sends an ext reply to the player.
1712 1659
1925 1872
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1874 "$UNIQUEDIR/$path"
1928} 1875}
1929 1876
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937}
1938
1939sub decay_objects { 1877sub decay_objects {
1940 my ($self) = @_; 1878 my ($self) = @_;
1941 1879
1942 return if $self->{deny_reset}; 1880 return if $self->{deny_reset};
1943 1881
2025sub find { 1963sub find {
2026 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
2027 1965
2028 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
2029 1967
2030 cf::lock_wait "map_data:$path";#d#remove 1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 1969 my $guard2 = cf::lock_acquire "map_find:$path";
2032 1970
2033 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 1972 my $map = new_from_path cf::map $path
2038 or return; 1973 or return;
2039 1974
2040 $map->{last_save} = $cf::RUNTIME; 1975 $map->{last_save} = $cf::RUNTIME;
2041 1976
2043 or return; 1978 or return;
2044 1979
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1980 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 1981 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 1982 #$cf::WAIT_FOR_TICK->wait;
1983 undef $guard2;
2048 undef $guard1; 1984 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 1985 $map->reset;
2051 return find $path; 1986 return find $path;
2052 } 1987 }
2053 1988
2054 $cf::MAP{$path} = $map 1989 $cf::MAP{$path} = $map
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2016 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2017 $f->skip_block;
2083 $self->_load_objects ($f) 2018 $self->_load_objects ($f)
2084 or return; 2019 or return;
2085 2020
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2021 $self->post_load_original
2087 if delete $self->{load_original}; 2022 if delete $self->{load_original};
2088 2023
2089 if (my $uniq = $self->uniq_path) { 2024 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2025 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2026 unless (aio_stat $uniq) {
2108 2043
2109 unless ($self->{deny_activate}) { 2044 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2045 $self->decay_objects;
2111 $self->fix_auto_apply; 2046 $self->fix_auto_apply;
2112 $self->update_buttons; 2047 $self->update_buttons;
2113 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick; 2048 cf::cede_to_tick;
2116 $self->activate; 2049 $self->activate;
2117 } 2050 }
2118 2051
2119 $self->{last_save} = $cf::RUNTIME; 2052 $self->{last_save} = $cf::RUNTIME;
2457can 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
2458dialogue with the given NPC character. 2391dialogue with the given NPC character.
2459 2392
2460=cut 2393=cut
2461 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
2462# rough implementation of a future "reply" method that works 2409# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2410# with dialog boxes.
2464#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
2465sub cf::object::player::reply($$$;$) { 2412sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2413 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2424 my $dialog = $pl->{npc_dialog};
2478 $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));
2479 2426
2480 } else { 2427 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2428 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2429 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2430 }
2484 } 2431 }
2485} 2432}
2486 2433
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2434=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2459
2513=item $player_object->enter_link 2460=item $player_object->enter_link
2514 2461
2515Freezes 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}>).
2516 2463
2517The 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.
2518I<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.
2519 2468
2520Will never block. 2469Will never block.
2521 2470
2522=item $player_object->leave_link ($map, $x, $y) 2471=item $player_object->leave_link ($map, $x, $y)
2523 2472
2581 2530
2582 $map->load; 2531 $map->load;
2583 $map->load_neighbours; 2532 $map->load_neighbours;
2584 2533
2585 return unless $self->contr->active; 2534 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2586 $self->activate_recursive; 2536 $self->activate_recursive;
2587 2537
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2539 $self->enter_map ($map, $x, $y);
2590} 2540}
2594Moves 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
2595her, loading and preparing them map, calling the provided $check callback 2545her, loading and preparing them map, calling the provided $check callback
2596that 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
2597the 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
2598be 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 >>.
2599 2552
2600=cut 2553=cut
2601 2554
2602our $GOTOGEN; 2555our $GOTOGEN;
2603 2556
2682} 2635}
2683 2636
2684sub prepare_random_map { 2637sub prepare_random_map {
2685 my ($exit) = @_; 2638 my ($exit) = @_;
2686 2639
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2640 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2641 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2642 # that depends on the exit object
2692 2643
2693 my $rmp = parse_random_map_params $exit->msg; 2644 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2646 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2647 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2648 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2649 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2650 $rmp->{origin_y} = $exit->y;
2651
2652 $exit->map->touch;
2700 } 2653 }
2701 2654
2702 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2703 2656
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2657 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2663 undef $fh;
2711 aio_rename "$meta~", $meta; 2664 aio_rename "$meta~", $meta;
2712 2665
2666 my $slaying = "?random/$md5";
2667
2668 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2669 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2670 $exit->msg (undef);
2671 }
2715 } 2672 }
2716} 2673}
2717 2674
2718sub cf::object::player::enter_exit { 2675sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2676 my ($self, $exit) = @_;
2720 2677
2721 return unless $self->type == cf::PLAYER; 2678 return unless $self->type == cf::PLAYER;
2722 2679
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2680 $self->enter_link;
2735 2681
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2682 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2683 $Coro::current->{desc} = "enter_exit";
2742 2684
2743 $self->deactivate_recursive; # just to be sure
2744 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
2745 $self->goto ($slaying, $hp, $sp); 2700 $self->goto ($map, $x, $y);
2746 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
2747 1; 2706 1
2748 }) { 2707 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2708 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "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. "
2751 . "Please report this to the dungeon master!", 2710 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2711 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2712
2754 warn "ERROR in enter_exit: $@"; 2713 warn "ERROR in enter_exit: $@";
2820 id => "infobox", 2779 id => "infobox",
2821 title => "Body Parts", 2780 title => "Body Parts",
2822 reply => undef, 2781 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2782 tooltip => "Shows which body parts you posess and are available",
2824 }, 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 },
2825 "c/uptime" => { 2820 "c/uptime" => {
2826 id => "infobox", 2821 id => "infobox",
2827 title => "Uptime", 2822 title => "Uptime",
2828 reply => undef, 2823 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 2824 tooltip => "How long the server has been running since last restart",
2838 id => "party", 2833 id => "party",
2839 title => "Party", 2834 title => "Party",
2840 reply => "gsay ", 2835 reply => "gsay ",
2841 tooltip => "Messages and chat related to your party", 2836 tooltip => "Messages and chat related to your party",
2842 }, 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,
2843); 2846);
2844 2847
2845sub cf::client::send_msg { 2848sub cf::client::send_msg {
2846 my ($self, $channel, $msg, $color, @extra) = @_; 2849 my ($self, $channel, $msg, $color, @extra) = @_;
2847 2850
2848 $msg = $self->pl->expand_cfpod ($msg); 2851 $msg = $self->pl->expand_cfpod ($msg)
2852 unless $color & cf::NDI_VERBATIM;
2849 2853
2850 $color &= cf::NDI_CLIENT_MASK; # just in case... 2854 $color &= cf::NDI_CLIENT_MASK; # just in case...
2851 2855
2852 # check predefined channels, for the benefit of C 2856 # check predefined channels, for the benefit of C
2853 if ($CHANNEL{$channel}) { 2857 if ($CHANNEL{$channel}) {
2854 $channel = $CHANNEL{$channel}; 2858 $channel = $CHANNEL{$channel};
2855 2859
2856 $self->ext_msg (channel_info => $channel) 2860 $self->ext_msg (channel_info => $channel);
2857 if $self->can_msg;
2858
2859 $channel = $channel->{id}; 2861 $channel = $channel->{id};
2860 2862
2861 } elsif (ref $channel) { 2863 } elsif (ref $channel) {
2862 # send meta info to client, if not yet sent 2864 # send meta info to client, if not yet sent
2863 unless (exists $self->{channel}{$channel->{id}}) { 2865 unless (exists $self->{channel}{$channel->{id}}) {
2864 $self->{channel}{$channel->{id}} = $channel; 2866 $self->{channel}{$channel->{id}} = $channel;
2865 $self->ext_msg (channel_info => $channel) 2867 $self->ext_msg (channel_info => $channel);
2866 if $self->can_msg;
2867 } 2868 }
2868 2869
2869 $channel = $channel->{id}; 2870 $channel = $channel->{id};
2870 } 2871 }
2871 2872
2872 return unless @extra || length $msg; 2873 return unless @extra || length $msg;
2873 2874
2874 if ($self->can_msg) {
2875 # default colour, mask it out 2875 # default colour, mask it out
2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2877 if $color & cf::NDI_DEF; 2877 if $color & cf::NDI_DEF;
2878 2878
2879 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2879 my $pkt = "msg "
2880 . $self->{json_coder}->encode (
2880 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2881 } else { 2882 );
2882 if ($color >= 0) {
2883 # replace some tags by gcfclient-compatible ones
2884 for ($msg) {
2885 1 while
2886 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2887 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2888 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2889 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2890 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2891 }
2892 2883
2893 $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};
2894 2887
2895 utf8::encode $msg; 2888 # split very large packets
2896 2889 if (8192 < length $pkt and $self->{can_lzf}) {
2897 if (0 && $msg =~ /\[/) { 2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2898 # COMMAND/INFO 2891 $pkt = "frag";
2899 $self->send_packet ("drawextinfo $color 10 8 $msg")
2900 } else {
2901 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2902 $self->send_packet ("drawinfo $color $msg")
2903 }
2904 }
2905 } 2892 }
2893
2894 $self->send_packet ($pkt);
2906} 2895}
2907 2896
2908=item $client->ext_msg ($type, @msg) 2897=item $client->ext_msg ($type, @msg)
2909 2898
2910Sends an ext event to the client. 2899Sends an ext event to the client.
3085The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
3086 3075
3087 cf::object 3076 cf::object
3088 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
3089 insert remove name archname title slaying race decrease split 3078 insert remove name archname title slaying race decrease split
3079 value
3090 3080
3091 cf::object::player 3081 cf::object::player
3092 player 3082 player
3093 3083
3094 cf::player 3084 cf::player
3099 3089
3100=cut 3090=cut
3101 3091
3102for ( 3092for (
3103 ["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
3104 insert remove inv name archname title slaying race 3094 insert remove inv nrof name archname title slaying race
3105 decrease split destroy)], 3095 decrease split destroy change_exp value msg lore send_msg)],
3106 ["cf::object::player" => qw(player)], 3096 ["cf::object::player" => qw(player)],
3107 ["cf::player" => qw(peaceful)], 3097 ["cf::player" => qw(peaceful send_msg)],
3108 ["cf::map" => qw(trigger)], 3098 ["cf::map" => qw(trigger)],
3109) { 3099) {
3110 no strict 'refs'; 3100 no strict 'refs';
3111 my ($pkg, @funs) = @$_; 3101 my ($pkg, @funs) = @$_;
3112 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3129 my ($code, %vars) = @_; 3119 my ($code, %vars) = @_;
3130 3120
3131 my $qcode = $code; 3121 my $qcode = $code;
3132 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3133 $qcode =~ s/\n/\\n/g; 3123 $qcode =~ s/\n/\\n/g;
3124
3125 %vars = (_dummy => 0) unless %vars;
3134 3126
3135 local $_; 3127 local $_;
3136 local @safe::cf::_safe_eval_args = values %vars; 3128 local @safe::cf::_safe_eval_args = values %vars;
3137 3129
3138 my $eval = 3130 my $eval =
3368 reload_treasures; 3360 reload_treasures;
3369 3361
3370 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
3371} 3363}
3372 3364
3373sub init {
3374 my $guard = freeze_mainloop;
3375
3376 reload_resources;
3377}
3378
3379sub reload_config { 3365sub reload_config {
3380 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
3381 or return; 3367 or return;
3382 3368
3383 local $/; 3369 local $/;
3395 }; 3381 };
3396 warn $@ if $@; 3382 warn $@ if $@;
3397 } 3383 }
3398} 3384}
3399 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
3400sub 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
3401 # we must not ever block the main coroutine 3420 # we must not ever block the main coroutine
3402 local $Coro::idle = sub { 3421 local $Coro::idle = sub {
3403 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#
3404 (async { 3423 (async {
3405 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3424 $Coro::current->{desc} = "IDLE BUG HANDLER";
3406 EV::loop EV::LOOP_ONESHOT; 3425 EV::loop EV::LOOP_ONESHOT;
3407 })->prio (Coro::PRIO_MAX); 3426 })->prio (Coro::PRIO_MAX);
3408 }; 3427 };
3409 3428
3410 { 3429 evthread_start IO::AIO::poll_fileno;
3411 my $guard = freeze_mainloop; 3430
3431 cf::sync_job {
3432 reload_resources;
3412 reload_config; 3433 reload_config;
3413 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
3414 load_extensions; 3447 load_extensions;
3415 3448
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3449 utime time, time, $RUNTIMEFILE;
3417 evthread_start IO::AIO::poll_fileno; 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;
3418 } 3455 };
3419 3456
3420 EV::loop; 3457 EV::loop;
3421} 3458}
3422 3459
3423############################################################################# 3460#############################################################################
3432 }; 3469 };
3433 } 3470 }
3434} 3471}
3435 3472
3436sub write_runtime_sync { 3473sub write_runtime_sync {
3437 my $runtime = "$LOCALDIR/runtime";
3438
3439 # first touch the runtime file to show we are still running: 3474 # first touch the runtime file to show we are still running:
3440 # the fsync below can take a very very long time. 3475 # the fsync below can take a very very long time.
3441 3476
3442 IO::AIO::aio_utime $runtime, undef, undef; 3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3443 3478
3444 my $guard = cf::lock_acquire "write_runtime"; 3479 my $guard = cf::lock_acquire "write_runtime";
3445 3480
3446 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3447 or return; 3482 or return;
3448 3483
3449 my $value = $cf::RUNTIME + 90 + 10; 3484 my $value = $cf::RUNTIME + 90 + 10;
3450 # 10 is the runtime save interval, for a monotonic clock 3485 # 10 is the runtime save interval, for a monotonic clock
3451 # 60 allows for the watchdog to kill the server. 3486 # 60 allows for the watchdog to kill the server.
3461 aio_utime $fh, undef, undef; 3496 aio_utime $fh, undef, undef;
3462 3497
3463 close $fh 3498 close $fh
3464 or return; 3499 or return;
3465 3500
3466 aio_rename "$runtime~", $runtime 3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3467 and return; 3502 and return;
3468 3503
3469 warn "runtime file written.\n"; 3504 warn "runtime file written.\n";
3470 3505
3471 1 3506 1
3483 my $uuid = "$LOCALDIR/uuid"; 3518 my $uuid = "$LOCALDIR/uuid";
3484 3519
3485 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3520 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3486 or return; 3521 or return;
3487 3522
3488 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 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;
3489 $uuid_skip = 0; 3531 $uuid_skip = 0;
3490 3532
3491 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3533 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3492 and return; 3534 and return;
3493 3535
3515} 3557}
3516 3558
3517sub emergency_save() { 3559sub emergency_save() {
3518 my $freeze_guard = cf::freeze_mainloop; 3560 my $freeze_guard = cf::freeze_mainloop;
3519 3561
3520 warn "enter emergency perl save\n"; 3562 warn "emergency_perl_save: enter\n";
3521 3563
3522 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
3523 # use a peculiar iteration method to avoid tripping on perl 3570 # use a peculiar iteration method to avoid tripping on perl
3524 # refcount bugs in for. also avoids problems with players 3571 # refcount bugs in for. also avoids problems with players
3525 # and maps saved/destroyed asynchronously. 3572 # and maps saved/destroyed asynchronously.
3526 warn "begin emergency player save\n"; 3573 warn "emergency_perl_save: begin player save\n";
3527 for my $login (keys %cf::PLAYER) { 3574 for my $login (keys %cf::PLAYER) {
3528 my $pl = $cf::PLAYER{$login} or next; 3575 my $pl = $cf::PLAYER{$login} or next;
3529 $pl->valid or next; 3576 $pl->valid or next;
3530 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3531 $pl->save; 3578 $pl->save;
3532 } 3579 }
3533 warn "end emergency player save\n"; 3580 warn "emergency_perl_save: end player save\n";
3534 3581
3535 warn "begin emergency map save\n"; 3582 warn "emergency_perl_save: begin map save\n";
3536 for my $path (keys %cf::MAP) { 3583 for my $path (keys %cf::MAP) {
3537 my $map = $cf::MAP{$path} or next; 3584 my $map = $cf::MAP{$path} or next;
3538 $map->valid or next; 3585 $map->valid or next;
3539 $map->save; 3586 $map->save;
3540 } 3587 }
3541 warn "end emergency map save\n"; 3588 warn "emergency_perl_save: end map save\n";
3542 3589
3543 warn "begin emergency database checkpoint\n"; 3590 warn "emergency_perl_save: begin database checkpoint\n";
3544 BDB::db_env_txn_checkpoint $DB_ENV; 3591 BDB::db_env_txn_checkpoint $DB_ENV;
3545 warn "end emergency database checkpoint\n"; 3592 warn "emergency_perl_save: end database checkpoint\n";
3546 3593
3547 warn "begin write uuid\n"; 3594 warn "emergency_perl_save: begin write uuid\n";
3548 write_uuid_sync 1; 3595 write_uuid_sync 1;
3549 warn "end write uuid\n"; 3596 warn "emergency_perl_save: end write uuid\n";
3550 }; 3597 };
3551 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
3552 warn "leave emergency perl save\n"; 3604 warn "emergency_perl_save: leave\n";
3553} 3605}
3554 3606
3555sub post_cleanup { 3607sub post_cleanup {
3556 my ($make_core) = @_; 3608 my ($make_core) = @_;
3557 3609
3558 warn Carp::longmess "post_cleanup backtrace" 3610 warn Carp::longmess "post_cleanup backtrace"
3559 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#
3560} 3641}
3561 3642
3562sub do_reload_perl() { 3643sub do_reload_perl() {
3563 # can/must only be called in main 3644 # can/must only be called in main
3564 if ($Coro::current != $Coro::main) { 3645 if ($Coro::current != $Coro::main) {
3565 warn "can only reload from main coroutine"; 3646 warn "can only reload from main coroutine";
3566 return; 3647 return;
3567 } 3648 }
3568 3649
3650 return if $RELOAD++;
3651
3652 my $t1 = EV::time;
3653
3654 while ($RELOAD) {
3569 warn "reloading..."; 3655 warn "reloading...";
3570 3656
3571 warn "entering sync_job"; 3657 warn "entering sync_job";
3572 3658
3573 cf::sync_job { 3659 cf::sync_job {
3574 cf::write_runtime_sync; # external watchdog should not bark 3660 cf::write_runtime_sync; # external watchdog should not bark
3575 cf::emergency_save; 3661 cf::emergency_save;
3576 cf::write_runtime_sync; # external watchdog should not bark 3662 cf::write_runtime_sync; # external watchdog should not bark
3577 3663
3578 warn "syncing database to disk"; 3664 warn "syncing database to disk";
3579 BDB::db_env_txn_checkpoint $DB_ENV; 3665 BDB::db_env_txn_checkpoint $DB_ENV;
3580 3666
3581 # 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
3582 3668
3583 warn "flushing outstanding aio requests"; 3669 warn "flushing outstanding aio requests";
3584 for (;;) {
3585 BDB::flush;
3586 IO::AIO::flush;
3587 Coro::cede_notself;
3588 last unless IO::AIO::nreqs || BDB::nreqs; 3670 while (IO::AIO::nreqs || BDB::nreqs) {
3589 warn "iterate..."; 3671 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3590 }
3591
3592 ++$RELOAD;
3593
3594 warn "cancelling all extension coros";
3595 $_->cancel for values %EXT_CORO;
3596 %EXT_CORO = ();
3597
3598 warn "removing commands";
3599 %COMMAND = ();
3600
3601 warn "removing ext/exti commands";
3602 %EXTCMD = ();
3603 %EXTICMD = ();
3604
3605 warn "unloading/nuking all extensions";
3606 for my $pkg (@EXTS) {
3607 warn "... unloading $pkg";
3608
3609 if (my $cb = $pkg->can ("unload")) {
3610 eval {
3611 $cb->($pkg);
3612 1
3613 } or warn "$pkg unloaded, but with errors: $@";
3614 } 3672 }
3615 3673
3616 warn "... nuking $pkg"; 3674 warn "cancelling all extension coros";
3617 Symbol::delete_package $pkg; 3675 $_->cancel for values %EXT_CORO;
3618 } 3676 %EXT_CORO = ();
3619 3677
3620 warn "unloading all perl modules loaded from $LIBDIR"; 3678 warn "removing commands";
3621 while (my ($k, $v) = each %INC) { 3679 %COMMAND = ();
3622 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3623 3680
3681 warn "removing ext/exti commands";
3682 %EXTCMD = ();
3683 %EXTICMD = ();
3684
3685 warn "unloading/nuking all extensions";
3686 for my $pkg (@EXTS) {
3624 warn "... unloading $k"; 3687 warn "... unloading $pkg";
3625 delete $INC{$k};
3626 3688
3627 $k =~ s/\.pm$//;
3628 $k =~ s/\//::/g;
3629
3630 if (my $cb = $k->can ("unload_module")) { 3689 if (my $cb = $pkg->can ("unload")) {
3690 eval {
3631 $cb->(); 3691 $cb->($pkg);
3692 1
3693 } or warn "$pkg unloaded, but with errors: $@";
3694 }
3695
3696 warn "... clearing $pkg";
3697 clear_package $pkg;
3632 } 3698 }
3633 3699
3634 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;
3635 } 3715 }
3636 3716
3637 warn "getting rid of safe::, as good as possible"; 3717 warn "getting rid of safe::, as good as possible";
3638 Symbol::delete_package "safe::$_" 3718 clear_package "safe::$_"
3639 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);
3640 3720
3641 warn "unloading cf.pm \"a bit\""; 3721 warn "unloading cf.pm \"a bit\"";
3642 delete $INC{"cf.pm"}; 3722 delete $INC{"cf.pm"};
3643 delete $INC{"cf/pod.pm"}; 3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3644 3724
3645 # don't, removes xs symbols, too, 3725 # don't, removes xs symbols, too,
3646 # and global variables created in xs 3726 # and global variables created in xs
3647 #Symbol::delete_package __PACKAGE__; 3727 #clear_package __PACKAGE__;
3648 3728
3649 warn "unload completed, starting to reload now"; 3729 warn "unload completed, starting to reload now";
3650 3730
3651 warn "reloading cf.pm"; 3731 warn "reloading cf.pm";
3652 require cf; 3732 require cf;
3653 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3654 3734
3655 warn "loading config and database again"; 3735 warn "loading config and database again";
3656 cf::reload_config; 3736 cf::reload_config;
3657 3737
3658 warn "loading extensions"; 3738 warn "loading extensions";
3659 cf::load_extensions; 3739 cf::load_extensions;
3660 3740
3741 if ($REATTACH_ON_RELOAD) {
3661 warn "reattaching attachments to objects/players"; 3742 warn "reattaching attachments to objects/players";
3662 _global_reattach; # objects, sockets 3743 _global_reattach; # objects, sockets
3663 warn "reattaching attachments to maps"; 3744 warn "reattaching attachments to maps";
3664 reattach $_ for values %MAP; 3745 reattach $_ for values %MAP;
3665 warn "reattaching attachments to players"; 3746 warn "reattaching attachments to players";
3666 reattach $_ for values %PLAYER; 3747 reattach $_ for values %PLAYER;
3748 }
3667 3749
3750 warn "running post_init jobs";
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3752
3668 warn "leaving sync_job"; 3753 warn "leaving sync_job";
3669 3754
3670 1 3755 1
3671 } or do { 3756 } or do {
3672 warn $@; 3757 warn $@;
3673 cf::cleanup "error while reloading, exiting."; 3758 cf::cleanup "error while reloading, exiting.";
3674 }; 3759 };
3675 3760
3676 warn "reloaded"; 3761 warn "reloaded";
3762 --$RELOAD;
3763 }
3764
3765 $t1 = EV::time - $t1;
3766 warn "reload completed in ${t1}s\n";
3677}; 3767};
3678 3768
3679our $RELOAD_WATCHER; # used only during reload 3769our $RELOAD_WATCHER; # used only during reload
3680 3770
3681sub reload_perl() { 3771sub reload_perl() {
3682 # doing reload synchronously and two reloads happen back-to-back, 3772 # doing reload synchronously and two reloads happen back-to-back,
3683 # coro crashes during coro_state_free->destroy here. 3773 # coro crashes during coro_state_free->destroy here.
3684 3774
3775 $RELOAD_WATCHER ||= cf::async {
3776 Coro::AIO::aio_wait cache_extensions;
3777
3685 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3686 do_reload_perl; 3779 do_reload_perl;
3687 undef $RELOAD_WATCHER; 3780 undef $RELOAD_WATCHER;
3781 };
3688 }; 3782 };
3689} 3783}
3690 3784
3691register_command "reload" => sub { 3785register_command "reload" => sub {
3692 my ($who, $arg) = @_; 3786 my ($who, $arg) = @_;
3763{ 3857{
3764 # configure BDB 3858 # configure BDB
3765 3859
3766 BDB::min_parallel 8; 3860 BDB::min_parallel 8;
3767 BDB::max_poll_reqs $TICK * 0.1; 3861 BDB::max_poll_reqs $TICK * 0.1;
3768 $Coro::BDB::WATCHER->priority (1); 3862 $AnyEvent::BDB::WATCHER->priority (1);
3769 3863
3770 unless ($DB_ENV) { 3864 unless ($DB_ENV) {
3771 $DB_ENV = BDB::db_env_create; 3865 $DB_ENV = BDB::db_env_create;
3772 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3866 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3773 | 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;
3774 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3869 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3775 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3870 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3776 3871
3777 cf::sync_job { 3872 cf::sync_job {
3778 eval { 3873 eval {
3804{ 3899{
3805 # configure IO::AIO 3900 # configure IO::AIO
3806 3901
3807 IO::AIO::min_parallel 8; 3902 IO::AIO::min_parallel 8;
3808 IO::AIO::max_poll_time $TICK * 0.1; 3903 IO::AIO::max_poll_time $TICK * 0.1;
3809 $Coro::AIO::WATCHER->priority (1); 3904 undef $AnyEvent::AIO::WATCHER;
3810} 3905}
3811 3906
3812my $_log_backtrace; 3907my $_log_backtrace;
3813 3908
3814sub _log_backtrace { 3909sub _log_backtrace {
3817 $msg =~ s/\n//; 3912 $msg =~ s/\n//;
3818 3913
3819 # limit the # of concurrent backtraces 3914 # limit the # of concurrent backtraces
3820 if ($_log_backtrace < 2) { 3915 if ($_log_backtrace < 2) {
3821 ++$_log_backtrace; 3916 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg;
3822 async { 3918 async {
3823 $Coro::current->{desc} = "abt $msg"; 3919 $Coro::current->{desc} = "abt $msg";
3824 3920
3825 my @bt = fork_call { 3921 my @bt = fork_call {
3826 @addr = map { sprintf "%x", $_ } @addr; 3922 @addr = map { sprintf "%x", $_ } @addr;
3837 } 3933 }
3838 3934
3839 @funcs 3935 @funcs
3840 }; 3936 };
3841 3937
3842 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $perl_bt\n";
3939 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3843 LOG llevInfo, "[ABT] $_\n" for @bt; 3940 LOG llevInfo, "[ABT] $_\n" for @bt;
3844 --$_log_backtrace; 3941 --$_log_backtrace;
3845 }; 3942 };
3846 } else { 3943 } else {
3847 LOG llevInfo, "[ABT] $msg\n"; 3944 LOG llevInfo, "[ABT] $msg\n";
3848 LOG llevInfo, "[ABT] [suppressed]\n"; 3945 LOG llevInfo, "[ABT] [suppressed]\n";
3849 } 3946 }
3850} 3947}
3851 3948
3852# load additional modules 3949# load additional modules
3853use cf::pod; 3950require "cf/$_.pm" for @EXTRA_MODULES;
3854 3951
3855END { cf::emergency_save } 3952END { cf::emergency_save }
3856 3953
38571 39541
3858 3955

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines