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.423 by root, Sun Apr 20 00:44:13 2008 UTC vs.
Revision 1.469 by root, Mon Mar 2 22:25:19 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 aio_fsync $fh if $cf::USE_FSYNC;
1149 close $fh; 1157 aio_close $fh;
1150 1158
1151 if (@$objs) { 1159 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1161 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1163 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1164 aio_fsync $fh if $cf::USE_FSYNC;
1157 close $fh; 1165 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1166 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1167 }
1160 } else { 1168 } else {
1161 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
1162 } 1170 }
1163 1171
1164 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1176 } else {
1166 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1167 } 1178 }
1168 } else { 1179 } else {
1169 aio_unlink $filename; 1180 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1171 } 1182 }
1262 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1263 1274
1264 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1265} 1276}
1266 1277
1278use File::Glob ();
1279
1267cf::player->attach ( 1280cf::player->attach (
1268 on_command => sub { 1281 on_command => sub {
1269 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1270 1283
1271 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
1303 1316
1304 cf::override; 1317 cf::override;
1305 }, 1318 },
1306); 1319);
1307 1320
1321# "readahead" all extensions
1322sub cache_extensions {
1323 my $grp = IO::AIO::aio_group;
1324
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1326 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 }
1329 };
1330
1331 $grp
1332}
1333
1308sub load_extensions { 1334sub load_extensions {
1309 cf::sync_job { 1335 cf::sync_job {
1310 my %todo; 1336 my %todo;
1311 1337
1312 for my $path (<$LIBDIR/*.ext>) { 1338 for my $path (<$LIBDIR/*.ext>) {
1331 1357
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1360
1335 $ext{source} = 1361 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1363 . "#line 1 \"$path\"\n{\n"
1338 . $source 1364 . $source
1339 . "\n};\n1"; 1365 . "\n};\n1";
1340 1366
1341 $todo{$base} = \%ext; 1367 $todo{$base} = \%ext;
1381 1407
1382=back 1408=back
1383 1409
1384=head2 CORE EXTENSIONS 1410=head2 CORE EXTENSIONS
1385 1411
1386Functions and methods that extend core crossfire objects. 1412Functions and methods that extend core deliantra objects.
1387 1413
1388=cut 1414=cut
1389 1415
1390package cf::player; 1416package cf::player;
1391 1417
1434 1460
1435sub exists($) { 1461sub exists($) {
1436 my ($login) = @_; 1462 my ($login) = @_;
1437 1463
1438 $cf::PLAYER{$login} 1464 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1465 or !aio_stat path $login
1440} 1466}
1441 1467
1442sub find($) { 1468sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1469 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1470 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1482 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1483 or return;
1458 1484
1459 my $pl = cf::player::load_pl $f 1485 my $pl = cf::player::load_pl $f
1460 or return; 1486 or return;
1487
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1488 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1489 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1490 $cf::PLAYER{$login} = $pl
1464 } 1491 }
1465 } 1492 }
1518 my ($pl) = @_; 1545 my ($pl) = @_;
1519 1546
1520 my $name = $pl->ob->name; 1547 my $name = $pl->ob->name;
1521 1548
1522 $pl->{deny_save} = 1; 1549 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1551
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1553 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1556 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1557 $pl->ns->destroy if $pl->ns;
1529 1558
1530 my $path = playerdir $pl; 1559 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1560 my $temp = "$path~$cf::RUNTIME~deleting~";
1570 1599
1571 for my $login (@$dirs) { 1600 for my $login (@$dirs) {
1572 my $path = path $login; 1601 my $path = path $login;
1573 1602
1574 # a .pst is a dead give-away for a valid player 1603 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1604 # if no pst file found, open and chekc for blocked users
1605 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1606 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1607 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1608 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1609 }
1580 1610
1611 } 1641 }
1612 1642
1613 \@paths 1643 \@paths
1614} 1644}
1615 1645
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1646=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1647
1618Expand crossfire pod fragments into protocol xml. 1648Expand 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 1649
1709=item $player->ext_reply ($msgid, @msg) 1650=item $player->ext_reply ($msgid, @msg)
1710 1651
1711Sends an ext reply to the player. 1652Sends an ext reply to the player.
1712 1653
1925 1866
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1928} 1869}
1929 1870
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 { 1871sub decay_objects {
1940 my ($self) = @_; 1872 my ($self) = @_;
1941 1873
1942 return if $self->{deny_reset}; 1874 return if $self->{deny_reset};
1943 1875
2025sub find { 1957sub find {
2026 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
2027 1959
2028 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
2029 1961
2030 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
2032 1964
2033 $cf::MAP{$path} || do { 1965 $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 1966 my $map = new_from_path cf::map $path
2038 or return; 1967 or return;
2039 1968
2040 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
2041 1970
2043 or return; 1972 or return;
2044 1973
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1974 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 1975 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 1976 #$cf::WAIT_FOR_TICK->wait;
1977 undef $guard2;
2048 undef $guard1; 1978 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 1979 $map->reset;
2051 return find $path; 1980 return find $path;
2052 } 1981 }
2053 1982
2054 $cf::MAP{$path} = $map 1983 $cf::MAP{$path} = $map
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2010 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2011 $f->skip_block;
2083 $self->_load_objects ($f) 2012 $self->_load_objects ($f)
2084 or return; 2013 or return;
2085 2014
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2015 $self->post_load_original
2087 if delete $self->{load_original}; 2016 if delete $self->{load_original};
2088 2017
2089 if (my $uniq = $self->uniq_path) { 2018 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2019 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2020 unless (aio_stat $uniq) {
2108 2037
2109 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2039 $self->decay_objects;
2111 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2112 $self->update_buttons; 2041 $self->update_buttons;
2113 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick; 2042 cf::cede_to_tick;
2116 $self->activate; 2043 $self->activate;
2117 } 2044 }
2118 2045
2119 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
2457can be C<undef>. Does the right thing when the player is currently in a 2384can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2385dialogue with the given NPC character.
2459 2386
2460=cut 2387=cut
2461 2388
2389our $SAY_CHANNEL = {
2390 id => "say",
2391 title => "Map",
2392 reply => "say ",
2393 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2394};
2395
2396our $CHAT_CHANNEL = {
2397 id => "chat",
2398 title => "Chat",
2399 reply => "chat ",
2400 tooltip => "Player chat and shouts, global to the server.",
2401};
2402
2462# rough implementation of a future "reply" method that works 2403# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2404# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2405#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2406sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2407 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2420
2480 } else { 2421 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2423 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2424 }
2484 } 2425 }
2485} 2426}
2486 2427
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2453
2513=item $player_object->enter_link 2454=item $player_object->enter_link
2514 2455
2515Freezes the player and moves him/her to a special map (C<{link}>). 2456Freezes the player and moves him/her to a special map (C<{link}>).
2516 2457
2517The player should be reasonably safe there for short amounts of time. You 2458The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2459for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link
2461map.
2519 2462
2520Will never block. 2463Will never block.
2521 2464
2522=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2523 2466
2581 2524
2582 $map->load; 2525 $map->load;
2583 $map->load_neighbours; 2526 $map->load_neighbours;
2584 2527
2585 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2586 $self->activate_recursive; 2530 $self->activate_recursive;
2587 2531
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2590} 2534}
2594Moves the player to the given map-path and coordinates by first freezing 2538Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2539her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2540that 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 2541the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2542be called at the end of this process.
2543
2544Note that $check will be called with a potentially non-loaded map, so if
2545it needs a loaded map it has to call C<< ->load >>.
2599 2546
2600=cut 2547=cut
2601 2548
2602our $GOTOGEN; 2549our $GOTOGEN;
2603 2550
2682} 2629}
2683 2630
2684sub prepare_random_map { 2631sub prepare_random_map {
2685 my ($exit) = @_; 2632 my ($exit) = @_;
2686 2633
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2634 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2635 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2636 # that depends on the exit object
2692 2637
2693 my $rmp = parse_random_map_params $exit->msg; 2638 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2640 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2641 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2642 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2643 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2644 $rmp->{origin_y} = $exit->y;
2645
2646 $exit->map->touch;
2700 } 2647 }
2701 2648
2702 $rmp->{random_seed} ||= $exit->random_seed; 2649 $rmp->{random_seed} ||= $exit->random_seed;
2703 2650
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2651 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2655 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2656 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2657 undef $fh;
2711 aio_rename "$meta~", $meta; 2658 aio_rename "$meta~", $meta;
2712 2659
2660 my $slaying = "?random/$md5";
2661
2662 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2663 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2664 $exit->msg (undef);
2665 }
2715 } 2666 }
2716} 2667}
2717 2668
2718sub cf::object::player::enter_exit { 2669sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2670 my ($self, $exit) = @_;
2720 2671
2721 return unless $self->type == cf::PLAYER; 2672 return unless $self->type == cf::PLAYER;
2722 2673
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; 2674 $self->enter_link;
2735 2675
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 { 2676 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2677 $Coro::current->{desc} = "enter_exit";
2742 2678
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2679 unless (eval {
2680 $self->deactivate_recursive; # just to be sure
2681
2682 # random map handling
2683 {
2684 my $guard = cf::lock_acquire "exit_prepare:$exit";
2685
2686 prepare_random_map $exit
2687 if $exit->slaying eq "/!";
2688 }
2689
2690 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2691 my $x = $exit->stats->hp;
2692 my $y = $exit->stats->sp;
2693
2745 $self->goto ($slaying, $hp, $sp); 2694 $self->goto ($map, $x, $y);
2746 2695
2696 # if exit is damned, update players death & WoR home-position
2697 $self->contr->savebed ($map, $x, $y)
2698 if $exit->flag (cf::FLAG_DAMNED);
2699
2747 1; 2700 1
2748 }) { 2701 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2703 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2706
2754 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
2820 id => "infobox", 2773 id => "infobox",
2821 title => "Body Parts", 2774 title => "Body Parts",
2822 reply => undef, 2775 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2824 }, 2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2784 "c/skills" => {
2785 id => "infobox",
2786 title => "Skills",
2787 reply => undef,
2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/resistances" => {
2791 id => "infobox",
2792 title => "Resistances",
2793 reply => undef,
2794 tooltip => "Shows your resistances",
2795 },
2796 "c/pets" => {
2797 id => "infobox",
2798 title => "Pets",
2799 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet",
2801 },
2825 "c/uptime" => { 2802 "c/uptime" => {
2826 id => "infobox", 2803 id => "infobox",
2827 title => "Uptime", 2804 title => "Uptime",
2828 reply => undef, 2805 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 2806 tooltip => "How long the server has been running since last restart",
2832 id => "infobox", 2809 id => "infobox",
2833 title => "Map Info", 2810 title => "Map Info",
2834 reply => undef, 2811 reply => undef,
2835 tooltip => "Information related to the maps", 2812 tooltip => "Information related to the maps",
2836 }, 2813 },
2814 "c/party" => {
2815 id => "party",
2816 title => "Party",
2817 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party",
2819 },
2820 "c/death" => {
2821 id => "death",
2822 title => "Death",
2823 reply => undef,
2824 tooltip => "Reason for and more info about your most recent death",
2825 },
2826 "c/say" => $SAY_CHANNEL,
2827 "c/chat" => $CHAT_CHANNEL,
2837); 2828);
2838 2829
2839sub cf::client::send_msg { 2830sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2831 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2832
2842 $msg = $self->pl->expand_cfpod ($msg); 2833 $msg = $self->pl->expand_cfpod ($msg)
2834 unless $color & cf::NDI_VERBATIM;
2843 2835
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 2836 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 2837
2846 # check predefined channels, for the benefit of C 2838 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 2839 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 2840 $channel = $CHANNEL{$channel};
2849 2841
2850 $self->ext_msg (channel_info => $channel) 2842 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 2843 $channel = $channel->{id};
2854 2844
2855 } elsif (ref $channel) { 2845 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 2846 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 2847 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 2848 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 2849 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 2850 }
2862 2851
2863 $channel = $channel->{id}; 2852 $channel = $channel->{id};
2864 } 2853 }
2865 2854
2866 return unless @extra || length $msg; 2855 return unless @extra || length $msg;
2867 2856
2868 if ($self->can_msg) {
2869 # default colour, mask it out 2857 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2858 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2859 if $color & cf::NDI_DEF;
2872 2860
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2861 my $pkt = "msg "
2862 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 2864 );
2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886 2865
2887 $color &= cf::NDI_COLOR_MASK; 2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2888 2869
2889 utf8::encode $msg; 2870 # split very large packets
2890 2871 if (8192 < length $pkt and $self->{can_lzf}) {
2891 if (0 && $msg =~ /\[/) { 2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2892 # COMMAND/INFO 2873 $pkt = "frag";
2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896 $self->send_packet ("drawinfo $color $msg")
2897 }
2898 }
2899 } 2874 }
2875
2876 $self->send_packet ($pkt);
2900} 2877}
2901 2878
2902=item $client->ext_msg ($type, @msg) 2879=item $client->ext_msg ($type, @msg)
2903 2880
2904Sends an ext event to the client. 2881Sends an ext event to the client.
3078 3055
3079The following functions and methods are available within a safe environment: 3056The following functions and methods are available within a safe environment:
3080 3057
3081 cf::object 3058 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3059 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3060 insert remove name archname title slaying race decrease split
3061 value
3084 3062
3085 cf::object::player 3063 cf::object::player
3086 player 3064 player
3087 3065
3088 cf::player 3066 cf::player
3093 3071
3094=cut 3072=cut
3095 3073
3096for ( 3074for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3076 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3077 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
3103) { 3081) {
3104 no strict 'refs'; 3082 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3083 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3123 my ($code, %vars) = @_; 3101 my ($code, %vars) = @_;
3124 3102
3125 my $qcode = $code; 3103 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3105 $qcode =~ s/\n/\\n/g;
3106
3107 %vars = (_dummy => 0) unless %vars;
3128 3108
3129 local $_; 3109 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars; 3110 local @safe::cf::_safe_eval_args = values %vars;
3131 3111
3132 my $eval = 3112 my $eval =
3313 $ns->fx_want ($k, $v); 3293 $ns->fx_want ($k, $v);
3314 } 3294 }
3315}; 3295};
3316 3296
3317sub load_resource_file($) { 3297sub load_resource_file($) {
3298 my $guard = lock_acquire "load_resource_file";
3299
3318 my $status = load_resource_file_ $_[0]; 3300 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100; 3301 get_slot 0.1, 100;
3320 cf::arch::commit_load; 3302 cf::arch::commit_load;
3303
3321 $status 3304 $status
3322} 3305}
3323 3306
3324sub reload_regions { 3307sub reload_regions {
3325 # HACK to clear player env face cache, we need some signal framework 3308 # HACK to clear player env face cache, we need some signal framework
3357 reload_archetypes; 3340 reload_archetypes;
3358 reload_regions; 3341 reload_regions;
3359 reload_treasures; 3342 reload_treasures;
3360 3343
3361 warn "finished reloading resource files\n"; 3344 warn "finished reloading resource files\n";
3362}
3363
3364sub init {
3365 my $guard = freeze_mainloop;
3366
3367 reload_resources;
3368} 3345}
3369 3346
3370sub reload_config { 3347sub reload_config {
3371 open my $fh, "<:utf8", "$CONFDIR/config" 3348 open my $fh, "<:utf8", "$CONFDIR/config"
3372 or return; 3349 or return;
3386 }; 3363 };
3387 warn $@ if $@; 3364 warn $@ if $@;
3388 } 3365 }
3389} 3366}
3390 3367
3368sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!";
3371 flock $fh, &Fcntl::LOCK_EX
3372 or die "$PIDFILE: flock: $!";
3373 $fh
3374}
3375
3376# make sure only one server instance is running at any one time
3377sub atomic {
3378 my $fh = pidfile;
3379
3380 my $pid = <$fh>;
3381 kill 9, $pid if $pid > 0;
3382
3383 seek $fh, 0, 0;
3384 print $fh $$;
3385}
3386
3391sub main { 3387sub main {
3388 cf::init_globals; # initialise logging
3389
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3401
3392 # we must not ever block the main coroutine 3402 # we must not ever block the main coroutine
3393 local $Coro::idle = sub { 3403 local $Coro::idle = sub {
3394 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3404 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3395 (async { 3405 (async {
3396 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3406 $Coro::current->{desc} = "IDLE BUG HANDLER";
3397 EV::loop EV::LOOP_ONESHOT; 3407 EV::loop EV::LOOP_ONESHOT;
3398 })->prio (Coro::PRIO_MAX); 3408 })->prio (Coro::PRIO_MAX);
3399 }; 3409 };
3400 3410
3401 { 3411 evthread_start IO::AIO::poll_fileno;
3402 my $guard = freeze_mainloop; 3412
3413 cf::sync_job {
3414 reload_resources;
3403 reload_config; 3415 reload_config;
3404 db_init; 3416 db_init;
3417
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid;
3421 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills;
3424
3425 cf::init_beforeplay;
3426
3427 atomic;
3428
3405 load_extensions; 3429 load_extensions;
3406 3430
3407 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3431 utime time, time, $RUNTIMEFILE;
3408 evthread_start IO::AIO::poll_fileno; 3432
3433 # no (long-running) fork's whatsoever before this point(!)
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435
3436 (pop @POST_INIT)->(0) while @POST_INIT;
3409 } 3437 };
3410 3438
3411 EV::loop; 3439 EV::loop;
3412} 3440}
3413 3441
3414############################################################################# 3442#############################################################################
3423 }; 3451 };
3424 } 3452 }
3425} 3453}
3426 3454
3427sub write_runtime_sync { 3455sub write_runtime_sync {
3428 my $runtime = "$LOCALDIR/runtime";
3429
3430 # first touch the runtime file to show we are still running: 3456 # first touch the runtime file to show we are still running:
3431 # the fsync below can take a very very long time. 3457 # the fsync below can take a very very long time.
3432 3458
3433 IO::AIO::aio_utime $runtime, undef, undef; 3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3434 3460
3435 my $guard = cf::lock_acquire "write_runtime"; 3461 my $guard = cf::lock_acquire "write_runtime";
3436 3462
3437 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3438 or return; 3464 or return;
3439 3465
3440 my $value = $cf::RUNTIME + 90 + 10; 3466 my $value = $cf::RUNTIME + 90 + 10;
3441 # 10 is the runtime save interval, for a monotonic clock 3467 # 10 is the runtime save interval, for a monotonic clock
3442 # 60 allows for the watchdog to kill the server. 3468 # 60 allows for the watchdog to kill the server.
3452 aio_utime $fh, undef, undef; 3478 aio_utime $fh, undef, undef;
3453 3479
3454 close $fh 3480 close $fh
3455 or return; 3481 or return;
3456 3482
3457 aio_rename "$runtime~", $runtime 3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3458 and return; 3484 and return;
3459 3485
3460 warn "runtime file written.\n"; 3486 warn "runtime file written.\n";
3461 3487
3462 1 3488 1
3474 my $uuid = "$LOCALDIR/uuid"; 3500 my $uuid = "$LOCALDIR/uuid";
3475 3501
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3502 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return; 3503 or return;
3478 3504
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3505 my $value = uuid_seq uuid_cur;
3506
3507 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n";
3509 return;
3510 }
3511
3512 my $value = uuid_str $value + $uuid_skip;
3480 $uuid_skip = 0; 3513 $uuid_skip = 0;
3481 3514
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return; 3516 and return;
3484 3517
3506} 3539}
3507 3540
3508sub emergency_save() { 3541sub emergency_save() {
3509 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
3510 3543
3511 warn "enter emergency perl save\n"; 3544 warn "emergency_perl_save: enter\n";
3512 3545
3513 cf::sync_job { 3546 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so
3548 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0;
3551
3514 # use a peculiar iteration method to avoid tripping on perl 3552 # use a peculiar iteration method to avoid tripping on perl
3515 # refcount bugs in for. also avoids problems with players 3553 # refcount bugs in for. also avoids problems with players
3516 # and maps saved/destroyed asynchronously. 3554 # and maps saved/destroyed asynchronously.
3517 warn "begin emergency player save\n"; 3555 warn "emergency_perl_save: begin player save\n";
3518 for my $login (keys %cf::PLAYER) { 3556 for my $login (keys %cf::PLAYER) {
3519 my $pl = $cf::PLAYER{$login} or next; 3557 my $pl = $cf::PLAYER{$login} or next;
3520 $pl->valid or next; 3558 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3522 $pl->save; 3560 $pl->save;
3523 } 3561 }
3524 warn "end emergency player save\n"; 3562 warn "emergency_perl_save: end player save\n";
3525 3563
3526 warn "begin emergency map save\n"; 3564 warn "emergency_perl_save: begin map save\n";
3527 for my $path (keys %cf::MAP) { 3565 for my $path (keys %cf::MAP) {
3528 my $map = $cf::MAP{$path} or next; 3566 my $map = $cf::MAP{$path} or next;
3529 $map->valid or next; 3567 $map->valid or next;
3530 $map->save; 3568 $map->save;
3531 } 3569 }
3532 warn "end emergency map save\n"; 3570 warn "emergency_perl_save: end map save\n";
3533 3571
3534 warn "begin emergency database checkpoint\n"; 3572 warn "emergency_perl_save: begin database checkpoint\n";
3535 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3536 warn "end emergency database checkpoint\n"; 3574 warn "emergency_perl_save: end database checkpoint\n";
3537 3575
3538 warn "begin write uuid\n"; 3576 warn "emergency_perl_save: begin write uuid\n";
3539 write_uuid_sync 1; 3577 write_uuid_sync 1;
3540 warn "end write uuid\n"; 3578 warn "emergency_perl_save: end write uuid\n";
3541 }; 3579 };
3542 3580
3581 warn "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n";
3584 };
3585
3543 warn "leave emergency perl save\n"; 3586 warn "emergency_perl_save: leave\n";
3544} 3587}
3545 3588
3546sub post_cleanup { 3589sub post_cleanup {
3547 my ($make_core) = @_; 3590 my ($make_core) = @_;
3548 3591
3549 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
3550 if $make_core; 3593 if $make_core;
3594
3595 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$;
3597}
3598
3599# a safer delete_package, copied from Symbol
3600sub clear_package($) {
3601 my $pkg = shift;
3602
3603 # expand to full symbol table name if needed
3604 unless ($pkg =~ /^main::.*::$/) {
3605 $pkg = "main$pkg" if $pkg =~ /^::/;
3606 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3607 $pkg .= '::' unless $pkg =~ /::$/;
3608 }
3609
3610 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3611 my $stem_symtab = *{$stem}{HASH};
3612
3613 defined $stem_symtab and exists $stem_symtab->{$leaf}
3614 or return;
3615
3616 # clear all symbols
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 }
3622 warn "cleared package $pkg\n";#d#
3551} 3623}
3552 3624
3553sub do_reload_perl() { 3625sub do_reload_perl() {
3554 # can/must only be called in main 3626 # can/must only be called in main
3555 if ($Coro::current != $Coro::main) { 3627 if ($Coro::current != $Coro::main) {
3556 warn "can only reload from main coroutine"; 3628 warn "can only reload from main coroutine";
3557 return; 3629 return;
3558 } 3630 }
3559 3631
3632 return if $RELOAD++;
3633
3634 my $t1 = EV::time;
3635
3636 while ($RELOAD) {
3560 warn "reloading..."; 3637 warn "reloading...";
3561 3638
3562 warn "entering sync_job"; 3639 warn "entering sync_job";
3563 3640
3564 cf::sync_job { 3641 cf::sync_job {
3565 cf::write_runtime_sync; # external watchdog should not bark 3642 cf::write_runtime_sync; # external watchdog should not bark
3566 cf::emergency_save; 3643 cf::emergency_save;
3567 cf::write_runtime_sync; # external watchdog should not bark 3644 cf::write_runtime_sync; # external watchdog should not bark
3568 3645
3569 warn "syncing database to disk"; 3646 warn "syncing database to disk";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3647 BDB::db_env_txn_checkpoint $DB_ENV;
3571 3648
3572 # if anything goes wrong in here, we should simply crash as we already saved 3649 # if anything goes wrong in here, we should simply crash as we already saved
3573 3650
3574 warn "flushing outstanding aio requests"; 3651 warn "flushing outstanding aio requests";
3575 for (;;) {
3576 BDB::flush;
3577 IO::AIO::flush;
3578 Coro::cede_notself;
3579 last unless IO::AIO::nreqs || BDB::nreqs; 3652 while (IO::AIO::nreqs || BDB::nreqs) {
3580 warn "iterate..."; 3653 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3581 }
3582
3583 ++$RELOAD;
3584
3585 warn "cancelling all extension coros";
3586 $_->cancel for values %EXT_CORO;
3587 %EXT_CORO = ();
3588
3589 warn "removing commands";
3590 %COMMAND = ();
3591
3592 warn "removing ext/exti commands";
3593 %EXTCMD = ();
3594 %EXTICMD = ();
3595
3596 warn "unloading/nuking all extensions";
3597 for my $pkg (@EXTS) {
3598 warn "... unloading $pkg";
3599
3600 if (my $cb = $pkg->can ("unload")) {
3601 eval {
3602 $cb->($pkg);
3603 1
3604 } or warn "$pkg unloaded, but with errors: $@";
3605 } 3654 }
3606 3655
3607 warn "... nuking $pkg"; 3656 warn "cancelling all extension coros";
3608 Symbol::delete_package $pkg; 3657 $_->cancel for values %EXT_CORO;
3609 } 3658 %EXT_CORO = ();
3610 3659
3611 warn "unloading all perl modules loaded from $LIBDIR"; 3660 warn "removing commands";
3612 while (my ($k, $v) = each %INC) { 3661 %COMMAND = ();
3613 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3614 3662
3663 warn "removing ext/exti commands";
3664 %EXTCMD = ();
3665 %EXTICMD = ();
3666
3667 warn "unloading/nuking all extensions";
3668 for my $pkg (@EXTS) {
3615 warn "... unloading $k"; 3669 warn "... unloading $pkg";
3616 delete $INC{$k};
3617 3670
3618 $k =~ s/\.pm$//;
3619 $k =~ s/\//::/g;
3620
3621 if (my $cb = $k->can ("unload_module")) { 3671 if (my $cb = $pkg->can ("unload")) {
3672 eval {
3622 $cb->(); 3673 $cb->($pkg);
3674 1
3675 } or warn "$pkg unloaded, but with errors: $@";
3676 }
3677
3678 warn "... clearing $pkg";
3679 clear_package $pkg;
3623 } 3680 }
3624 3681
3625 Symbol::delete_package $k; 3682 warn "unloading all perl modules loaded from $LIBDIR";
3683 while (my ($k, $v) = each %INC) {
3684 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3685
3686 warn "... unloading $k";
3687 delete $INC{$k};
3688
3689 $k =~ s/\.pm$//;
3690 $k =~ s/\//::/g;
3691
3692 if (my $cb = $k->can ("unload_module")) {
3693 $cb->();
3694 }
3695
3696 clear_package $k;
3626 } 3697 }
3627 3698
3628 warn "getting rid of safe::, as good as possible"; 3699 warn "getting rid of safe::, as good as possible";
3629 Symbol::delete_package "safe::$_" 3700 clear_package "safe::$_"
3630 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3631 3702
3632 warn "unloading cf.pm \"a bit\""; 3703 warn "unloading cf.pm \"a bit\"";
3633 delete $INC{"cf.pm"}; 3704 delete $INC{"cf.pm"};
3634 delete $INC{"cf/pod.pm"}; 3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3635 3706
3636 # don't, removes xs symbols, too, 3707 # don't, removes xs symbols, too,
3637 # and global variables created in xs 3708 # and global variables created in xs
3638 #Symbol::delete_package __PACKAGE__; 3709 #clear_package __PACKAGE__;
3639 3710
3640 warn "unload completed, starting to reload now"; 3711 warn "unload completed, starting to reload now";
3641 3712
3642 warn "reloading cf.pm"; 3713 warn "reloading cf.pm";
3643 require cf; 3714 require cf;
3644 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3645 3716
3646 warn "loading config and database again"; 3717 warn "loading config and database again";
3647 cf::reload_config; 3718 cf::reload_config;
3648 3719
3649 warn "loading extensions"; 3720 warn "loading extensions";
3650 cf::load_extensions; 3721 cf::load_extensions;
3651 3722
3723 if ($REATTACH_ON_RELOAD) {
3652 warn "reattaching attachments to objects/players"; 3724 warn "reattaching attachments to objects/players";
3653 _global_reattach; # objects, sockets 3725 _global_reattach; # objects, sockets
3654 warn "reattaching attachments to maps"; 3726 warn "reattaching attachments to maps";
3655 reattach $_ for values %MAP; 3727 reattach $_ for values %MAP;
3656 warn "reattaching attachments to players"; 3728 warn "reattaching attachments to players";
3657 reattach $_ for values %PLAYER; 3729 reattach $_ for values %PLAYER;
3730 }
3658 3731
3732 warn "running post_init jobs";
3733 (pop @POST_INIT)->(1) while @POST_INIT;
3734
3659 warn "leaving sync_job"; 3735 warn "leaving sync_job";
3660 3736
3661 1 3737 1
3662 } or do { 3738 } or do {
3663 warn $@; 3739 warn $@;
3664 cf::cleanup "error while reloading, exiting."; 3740 cf::cleanup "error while reloading, exiting.";
3665 }; 3741 };
3666 3742
3667 warn "reloaded"; 3743 warn "reloaded";
3744 --$RELOAD;
3745 }
3746
3747 $t1 = EV::time - $t1;
3748 warn "reload completed in ${t1}s\n";
3668}; 3749};
3669 3750
3670our $RELOAD_WATCHER; # used only during reload 3751our $RELOAD_WATCHER; # used only during reload
3671 3752
3672sub reload_perl() { 3753sub reload_perl() {
3673 # doing reload synchronously and two reloads happen back-to-back, 3754 # doing reload synchronously and two reloads happen back-to-back,
3674 # coro crashes during coro_state_free->destroy here. 3755 # coro crashes during coro_state_free->destroy here.
3675 3756
3757 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions;
3759
3676 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3677 do_reload_perl; 3761 do_reload_perl;
3678 undef $RELOAD_WATCHER; 3762 undef $RELOAD_WATCHER;
3763 };
3679 }; 3764 };
3680} 3765}
3681 3766
3682register_command "reload" => sub { 3767register_command "reload" => sub {
3683 my ($who, $arg) = @_; 3768 my ($who, $arg) = @_;
3754{ 3839{
3755 # configure BDB 3840 # configure BDB
3756 3841
3757 BDB::min_parallel 8; 3842 BDB::min_parallel 8;
3758 BDB::max_poll_reqs $TICK * 0.1; 3843 BDB::max_poll_reqs $TICK * 0.1;
3759 $Coro::BDB::WATCHER->priority (1); 3844 $AnyEvent::BDB::WATCHER->priority (1);
3760 3845
3761 unless ($DB_ENV) { 3846 unless ($DB_ENV) {
3762 $DB_ENV = BDB::db_env_create; 3847 $DB_ENV = BDB::db_env_create;
3763 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3848 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3764 | BDB::LOG_AUTOREMOVE, 1); 3849 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3850 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3765 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3851 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3766 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3852 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3767 3853
3768 cf::sync_job { 3854 cf::sync_job {
3769 eval { 3855 eval {
3795{ 3881{
3796 # configure IO::AIO 3882 # configure IO::AIO
3797 3883
3798 IO::AIO::min_parallel 8; 3884 IO::AIO::min_parallel 8;
3799 IO::AIO::max_poll_time $TICK * 0.1; 3885 IO::AIO::max_poll_time $TICK * 0.1;
3800 $Coro::AIO::WATCHER->priority (1); 3886 undef $AnyEvent::AIO::WATCHER;
3801} 3887}
3802 3888
3803my $_log_backtrace; 3889my $_log_backtrace;
3804 3890
3805sub _log_backtrace { 3891sub _log_backtrace {
3808 $msg =~ s/\n//; 3894 $msg =~ s/\n//;
3809 3895
3810 # limit the # of concurrent backtraces 3896 # limit the # of concurrent backtraces
3811 if ($_log_backtrace < 2) { 3897 if ($_log_backtrace < 2) {
3812 ++$_log_backtrace; 3898 ++$_log_backtrace;
3899 my $perl_bt = Carp::longmess $msg;
3813 async { 3900 async {
3814 $Coro::current->{desc} = "abt $msg"; 3901 $Coro::current->{desc} = "abt $msg";
3815 3902
3816 my @bt = fork_call { 3903 my @bt = fork_call {
3817 @addr = map { sprintf "%x", $_ } @addr; 3904 @addr = map { sprintf "%x", $_ } @addr;
3828 } 3915 }
3829 3916
3830 @funcs 3917 @funcs
3831 }; 3918 };
3832 3919
3833 LOG llevInfo, "[ABT] $msg\n"; 3920 LOG llevInfo, "[ABT] $perl_bt\n";
3921 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3834 LOG llevInfo, "[ABT] $_\n" for @bt; 3922 LOG llevInfo, "[ABT] $_\n" for @bt;
3835 --$_log_backtrace; 3923 --$_log_backtrace;
3836 }; 3924 };
3837 } else { 3925 } else {
3838 LOG llevInfo, "[ABT] $msg\n"; 3926 LOG llevInfo, "[ABT] $msg\n";
3839 LOG llevInfo, "[ABT] [suppressed]\n"; 3927 LOG llevInfo, "[ABT] [suppressed]\n";
3840 } 3928 }
3841} 3929}
3842 3930
3843# load additional modules 3931# load additional modules
3844use cf::pod; 3932require "cf/$_.pm" for @EXTRA_MODULES;
3845 3933
3846END { cf::emergency_save } 3934END { cf::emergency_save }
3847 3935
38481 39361
3849 3937

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines