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.474 by root, Thu Jul 16 21:42:56 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 76
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 79
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 81
69our %COMMAND = (); 82our %COMMAND = ();
70our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
73our %EXTCMD = (); 86our %EXTCMD = ();
74our %EXTICMD = (); 87our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
77 90
78our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 92our @EVENT;
80 93
81our $CONFDIR = confdir; 94our $CONFDIR = confdir;
82our $DATADIR = datadir; 95our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 96our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 97our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 98our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 99our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 100our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 102our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 103our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 104our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime";
107
92our %RESOURCE; 108our %RESOURCE;
93 109
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 112our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
99 114
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 118our $DB_ENV;
105 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
106our %CFG; 122our %CFG;
107 123
108our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 125our $RUNTIME;
110our $NOW; 126our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 137our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
123 139
140our @POST_INIT;
141
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
144
124binmode STDOUT; 145binmode STDOUT;
125binmode STDERR; 146binmode STDERR;
126 147
127# read virtual server time, if available 148# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 150 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
132} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
133 156
134mkdir $_ 157mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 159
137our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
242for my $pkg (qw( 265for my $pkg (qw(
243 cf::global cf::attachable 266 cf::global cf::attachable
244 cf::object cf::object::player 267 cf::object cf::object::player
245 cf::client cf::player 268 cf::client cf::player
246 cf::arch cf::living 269 cf::arch cf::living
270 cf::map cf::mapspace
247 cf::map cf::party cf::region 271 cf::party cf::region
248)) { 272)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 274}
252 275
253$EV::DIED = sub { 276$EV::DIED = sub {
254 warn "error in event callback: @_"; 277 warn "error in event callback: @_";
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 320
298sub encode_json($) { $json_coder->encode ($_[0]) } 321sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 322sub decode_json($) { $json_coder->decode ($_[0]) }
300 323
324=item cf::post_init { BLOCK }
325
326Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again.
328
329The cdoeblock will have a single boolean argument to indicate whether this
330is a reload or not.
331
332=cut
333
334sub post_init(&) {
335 push @POST_INIT, shift;
336}
337
301=item cf::lock_wait $string 338=item cf::lock_wait $string
302 339
303Wait until the given lock is available. See cf::lock_acquire. 340Wait until the given lock is available. See cf::lock_acquire.
304 341
305=item my $lock = cf::lock_acquire $string 342=item my $lock = cf::lock_acquire $string
306 343
307Wait until the given lock is available and then acquires it and returns 344Wait 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, 345a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 346for example when the coroutine gets canceled), the lock is automatically
310returned. 347returned.
311 348
312Locks are *not* recursive, locking from the same coro twice results in a 349Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 350deadlocked coro.
319 356
320Return true if the lock is currently active, i.e. somebody has locked it. 357Return true if the lock is currently active, i.e. somebody has locked it.
321 358
322=cut 359=cut
323 360
324our %LOCK; 361our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 362
327sub lock_wait($) { 363sub lock_wait($) {
328 my ($key) = @_; 364 $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} 365}
341 366
342sub lock_acquire($) { 367sub lock_acquire($) {
343 my ($key) = @_; 368 $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} 369}
357 370
358sub lock_active($) { 371sub lock_active($) {
359 my ($key) = @_; 372 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 373}
363 374
364sub freeze_mainloop { 375sub freeze_mainloop {
365 tick_inhibit_inc; 376 tick_inhibit_inc;
366 377
367 Coro::guard \&tick_inhibit_dec; 378 &Guard::guard (\&tick_inhibit_dec);
368} 379}
369 380
370=item cf::periodic $interval, $cb 381=item cf::periodic $interval, $cb
371 382
372Like EV::periodic, but randomly selects a starting point so that the actions 383Like EV::periodic, but randomly selects a starting point so that the actions
724 735
725############################################################################# 736#############################################################################
726 737
727=head2 ATTACHABLE OBJECTS 738=head2 ATTACHABLE OBJECTS
728 739
729Many objects in crossfire are so-called attachable objects. That means you can 740Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 741attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 742to it. All such attachable objects support the following methods.
732 743
733In the following description, CLASS can be any of C<global>, C<object> 744In 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 745C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 795=item cf::CLASS::attachment $name, ...
785 796
786Register an attachment by C<$name> through which attachable objects of the 797Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 798given CLASS can refer to this attachment.
788 799
789Some classes such as crossfire maps and objects can specify attachments 800Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 801that are attached at load/instantiate time, thus the need for a name.
791 802
792These calls expect any number of the following handler/hook descriptions: 803These calls expect any number of the following handler/hook descriptions:
793 804
794=over 4 805=over 4
1085 1096
1086sub reattach { 1097sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1098 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1099 my ($obj) = @_;
1089 1100
1101 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1102 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1103
1092 my $registry = $obj->registry; 1104 my $registry = $obj->registry;
1093 1105
1094 @$registry = (); 1106 @$registry = ();
1095 1107
1141 utf8::decode (my $decname = $filename); 1153 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1154 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
1144 1156
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1158 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1160 if ($cf::USE_FSYNC) {
1161 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;
1162 aio_fsync $fh;
1163 }
1149 close $fh; 1164 aio_close $fh;
1150 1165
1151 if (@$objs) { 1166 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1167 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1168 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1171 if ($cf::USE_FSYNC) {
1172 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;
1173 aio_fsync $fh;
1174 }
1157 close $fh; 1175 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1177 }
1160 } else { 1178 } else {
1161 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1162 } 1180 }
1163 1181
1164 aio_rename "$filename~", $filename; 1182 aio_rename "$filename~", $filename;
1183
1184 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1186 } else {
1166 warn "FATAL: $filename~: $!\n"; 1187 warn "unable to save objects: $filename~: $!\n";
1167 } 1188 }
1168 } else { 1189 } else {
1169 aio_unlink $filename; 1190 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1171 } 1192 }
1262 my ($name, $cb) = @_; 1283 my ($name, $cb) = @_;
1263 1284
1264 $EXTICMD{$name} = $cb; 1285 $EXTICMD{$name} = $cb;
1265} 1286}
1266 1287
1288use File::Glob ();
1289
1267cf::player->attach ( 1290cf::player->attach (
1268 on_command => sub { 1291 on_command => sub {
1269 my ($pl, $name, $params) = @_; 1292 my ($pl, $name, $params) = @_;
1270 1293
1271 my $cb = $COMMAND{$name} 1294 my $cb = $COMMAND{$name}
1303 1326
1304 cf::override; 1327 cf::override;
1305 }, 1328 },
1306); 1329);
1307 1330
1331# "readahead" all extensions
1332sub cache_extensions {
1333 my $grp = IO::AIO::aio_group;
1334
1335 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1336 for (grep /\.ext$/, @{$_[0]}) {
1337 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1338 }
1339 };
1340
1341 $grp
1342}
1343
1308sub load_extensions { 1344sub load_extensions {
1309 cf::sync_job { 1345 cf::sync_job {
1310 my %todo; 1346 my %todo;
1311 1347
1312 for my $path (<$LIBDIR/*.ext>) { 1348 for my $path (<$LIBDIR/*.ext>) {
1331 1367
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1370
1335 $ext{source} = 1371 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1373 . "#line 1 \"$path\"\n{\n"
1338 . $source 1374 . $source
1339 . "\n};\n1"; 1375 . "\n};\n1";
1340 1376
1341 $todo{$base} = \%ext; 1377 $todo{$base} = \%ext;
1381 1417
1382=back 1418=back
1383 1419
1384=head2 CORE EXTENSIONS 1420=head2 CORE EXTENSIONS
1385 1421
1386Functions and methods that extend core crossfire objects. 1422Functions and methods that extend core deliantra objects.
1387 1423
1388=cut 1424=cut
1389 1425
1390package cf::player; 1426package cf::player;
1391 1427
1434 1470
1435sub exists($) { 1471sub exists($) {
1436 my ($login) = @_; 1472 my ($login) = @_;
1437 1473
1438 $cf::PLAYER{$login} 1474 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1475 or !aio_stat path $login
1440} 1476}
1441 1477
1442sub find($) { 1478sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1479 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1480 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1492 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1493 or return;
1458 1494
1459 my $pl = cf::player::load_pl $f 1495 my $pl = cf::player::load_pl $f
1460 or return; 1496 or return;
1497
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1498 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1499 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1500 $cf::PLAYER{$login} = $pl
1464 } 1501 }
1465 } 1502 }
1518 my ($pl) = @_; 1555 my ($pl) = @_;
1519 1556
1520 my $name = $pl->ob->name; 1557 my $name = $pl->ob->name;
1521 1558
1522 $pl->{deny_save} = 1; 1559 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1561
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1563 $pl->deactivate;
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1566 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1567 $pl->ns->destroy if $pl->ns;
1529 1568
1530 my $path = playerdir $pl; 1569 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1570 my $temp = "$path~$cf::RUNTIME~deleting~";
1570 1609
1571 for my $login (@$dirs) { 1610 for my $login (@$dirs) {
1572 my $path = path $login; 1611 my $path = path $login;
1573 1612
1574 # a .pst is a dead give-away for a valid player 1613 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1614 # if no pst file found, open and chekc for blocked users
1615 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1616 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1617 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1618 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1619 }
1580 1620
1611 } 1651 }
1612 1652
1613 \@paths 1653 \@paths
1614} 1654}
1615 1655
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1656=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1657
1618Expand crossfire pod fragments into protocol xml. 1658Expand 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 1659
1709=item $player->ext_reply ($msgid, @msg) 1660=item $player->ext_reply ($msgid, @msg)
1710 1661
1711Sends an ext reply to the player. 1662Sends an ext reply to the player.
1712 1663
1925 1876
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1928} 1879}
1929 1880
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 { 1881sub decay_objects {
1940 my ($self) = @_; 1882 my ($self) = @_;
1941 1883
1942 return if $self->{deny_reset}; 1884 return if $self->{deny_reset};
1943 1885
2025sub find { 1967sub find {
2026 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
2027 1969
2028 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
2029 1971
2030 cf::lock_wait "map_data:$path";#d#remove 1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
2032 1974
2033 $cf::MAP{$path} || do { 1975 $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 1976 my $map = new_from_path cf::map $path
2038 or return; 1977 or return;
2039 1978
2040 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
2041 1980
2043 or return; 1982 or return;
2044 1983
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1984 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 1985 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 1986 #$cf::WAIT_FOR_TICK->wait;
1987 undef $guard2;
2048 undef $guard1; 1988 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 1989 $map->reset;
2051 return find $path; 1990 return find $path;
2052 } 1991 }
2053 1992
2054 $cf::MAP{$path} = $map 1993 $cf::MAP{$path} = $map
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2020 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2021 $f->skip_block;
2083 $self->_load_objects ($f) 2022 $self->_load_objects ($f)
2084 or return; 2023 or return;
2085 2024
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2025 $self->post_load_original
2087 if delete $self->{load_original}; 2026 if delete $self->{load_original};
2088 2027
2089 if (my $uniq = $self->uniq_path) { 2028 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2029 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2030 unless (aio_stat $uniq) {
2108 2047
2109 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2049 $self->decay_objects;
2111 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
2112 $self->update_buttons; 2051 $self->update_buttons;
2113 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick; 2052 cf::cede_to_tick;
2116 $self->activate; 2053 $self->activate;
2117 } 2054 }
2118 2055
2119 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
2457can be C<undef>. Does the right thing when the player is currently in a 2394can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2395dialogue with the given NPC character.
2459 2396
2460=cut 2397=cut
2461 2398
2399our $SAY_CHANNEL = {
2400 id => "say",
2401 title => "Map",
2402 reply => "say ",
2403 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2404};
2405
2406our $CHAT_CHANNEL = {
2407 id => "chat",
2408 title => "Chat",
2409 reply => "chat ",
2410 tooltip => "Player chat and shouts, global to the server.",
2411};
2412
2462# rough implementation of a future "reply" method that works 2413# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2414# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2415#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2416sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2417 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2428 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2429 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2430
2480 } else { 2431 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2432 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2433 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2434 }
2484 } 2435 }
2485} 2436}
2486 2437
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2438=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2463
2513=item $player_object->enter_link 2464=item $player_object->enter_link
2514 2465
2515Freezes the player and moves him/her to a special map (C<{link}>). 2466Freezes the player and moves him/her to a special map (C<{link}>).
2516 2467
2517The player should be reasonably safe there for short amounts of time. You 2468The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2469for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link
2471map.
2519 2472
2520Will never block. 2473Will never block.
2521 2474
2522=item $player_object->leave_link ($map, $x, $y) 2475=item $player_object->leave_link ($map, $x, $y)
2523 2476
2581 2534
2582 $map->load; 2535 $map->load;
2583 $map->load_neighbours; 2536 $map->load_neighbours;
2584 2537
2585 return unless $self->contr->active; 2538 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2586 $self->activate_recursive; 2540 $self->activate_recursive;
2587 2541
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2543 $self->enter_map ($map, $x, $y);
2590} 2544}
2594Moves the player to the given map-path and coordinates by first freezing 2548Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2549her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2550that 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 2551the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2552be called at the end of this process.
2553
2554Note that $check will be called with a potentially non-loaded map, so if
2555it needs a loaded map it has to call C<< ->load >>.
2599 2556
2600=cut 2557=cut
2601 2558
2602our $GOTOGEN; 2559our $GOTOGEN;
2603 2560
2682} 2639}
2683 2640
2684sub prepare_random_map { 2641sub prepare_random_map {
2685 my ($exit) = @_; 2642 my ($exit) = @_;
2686 2643
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2644 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2645 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2646 # that depends on the exit object
2692 2647
2693 my $rmp = parse_random_map_params $exit->msg; 2648 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2650 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2651 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2652 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2653 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2654 $rmp->{origin_y} = $exit->y;
2655
2656 $exit->map->touch;
2700 } 2657 }
2701 2658
2702 $rmp->{random_seed} ||= $exit->random_seed; 2659 $rmp->{random_seed} ||= $exit->random_seed;
2703 2660
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2661 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2665 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2666 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2667 undef $fh;
2711 aio_rename "$meta~", $meta; 2668 aio_rename "$meta~", $meta;
2712 2669
2670 my $slaying = "?random/$md5";
2671
2672 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2673 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2674 $exit->msg (undef);
2675 }
2715 } 2676 }
2716} 2677}
2717 2678
2718sub cf::object::player::enter_exit { 2679sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2680 my ($self, $exit) = @_;
2720 2681
2721 return unless $self->type == cf::PLAYER; 2682 return unless $self->type == cf::PLAYER;
2722 2683
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; 2684 $self->enter_link;
2735 2685
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 { 2686 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2687 $Coro::current->{desc} = "enter_exit";
2742 2688
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2689 unless (eval {
2690 $self->deactivate_recursive; # just to be sure
2691
2692 # random map handling
2693 {
2694 my $guard = cf::lock_acquire "exit_prepare:$exit";
2695
2696 prepare_random_map $exit
2697 if $exit->slaying eq "/!";
2698 }
2699
2700 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2701 my $x = $exit->stats->hp;
2702 my $y = $exit->stats->sp;
2703
2745 $self->goto ($slaying, $hp, $sp); 2704 $self->goto ($map, $x, $y);
2746 2705
2706 # if exit is damned, update players death & WoR home-position
2707 $self->contr->savebed ($map, $x, $y)
2708 if $exit->flag (cf::FLAG_DAMNED);
2709
2747 1; 2710 1
2748 }) { 2711 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2712 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2713 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2714 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2715 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2716
2754 warn "ERROR in enter_exit: $@"; 2717 warn "ERROR in enter_exit: $@";
2820 id => "infobox", 2783 id => "infobox",
2821 title => "Body Parts", 2784 title => "Body Parts",
2822 reply => undef, 2785 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2786 tooltip => "Shows which body parts you posess and are available",
2824 }, 2787 },
2788 "c/statistics" => {
2789 id => "infobox",
2790 title => "Statistics",
2791 reply => undef,
2792 tooltip => "Shows your primary statistics",
2793 },
2794 "c/skills" => {
2795 id => "infobox",
2796 title => "Skills",
2797 reply => undef,
2798 tooltip => "Shows your experience per skill and item power",
2799 },
2800 "c/shopitems" => {
2801 id => "infobox",
2802 title => "Shop Items",
2803 reply => undef,
2804 tooltip => "Shows the items currently for sale in this shop",
2805 },
2806 "c/resistances" => {
2807 id => "infobox",
2808 title => "Resistances",
2809 reply => undef,
2810 tooltip => "Shows your resistances",
2811 },
2812 "c/pets" => {
2813 id => "infobox",
2814 title => "Pets",
2815 reply => undef,
2816 tooltip => "Shows information abotu your pets/a specific pet",
2817 },
2818 "c/perceiveself" => {
2819 id => "infobox",
2820 title => "Perceive Self",
2821 reply => undef,
2822 tooltip => "You gained detailed knowledge about yourself",
2823 },
2825 "c/uptime" => { 2824 "c/uptime" => {
2826 id => "infobox", 2825 id => "infobox",
2827 title => "Uptime", 2826 title => "Uptime",
2828 reply => undef, 2827 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 2828 tooltip => "How long the server has been running since last restart",
2838 id => "party", 2837 id => "party",
2839 title => "Party", 2838 title => "Party",
2840 reply => "gsay ", 2839 reply => "gsay ",
2841 tooltip => "Messages and chat related to your party", 2840 tooltip => "Messages and chat related to your party",
2842 }, 2841 },
2842 "c/death" => {
2843 id => "death",
2844 title => "Death",
2845 reply => undef,
2846 tooltip => "Reason for and more info about your most recent death",
2847 },
2848 "c/say" => $SAY_CHANNEL,
2849 "c/chat" => $CHAT_CHANNEL,
2843); 2850);
2844 2851
2845sub cf::client::send_msg { 2852sub cf::client::send_msg {
2846 my ($self, $channel, $msg, $color, @extra) = @_; 2853 my ($self, $channel, $msg, $color, @extra) = @_;
2847 2854
2848 $msg = $self->pl->expand_cfpod ($msg); 2855 $msg = $self->pl->expand_cfpod ($msg)
2856 unless $color & cf::NDI_VERBATIM;
2849 2857
2850 $color &= cf::NDI_CLIENT_MASK; # just in case... 2858 $color &= cf::NDI_CLIENT_MASK; # just in case...
2851 2859
2852 # check predefined channels, for the benefit of C 2860 # check predefined channels, for the benefit of C
2853 if ($CHANNEL{$channel}) { 2861 if ($CHANNEL{$channel}) {
2854 $channel = $CHANNEL{$channel}; 2862 $channel = $CHANNEL{$channel};
2855 2863
2856 $self->ext_msg (channel_info => $channel) 2864 $self->ext_msg (channel_info => $channel);
2857 if $self->can_msg;
2858
2859 $channel = $channel->{id}; 2865 $channel = $channel->{id};
2860 2866
2861 } elsif (ref $channel) { 2867 } elsif (ref $channel) {
2862 # send meta info to client, if not yet sent 2868 # send meta info to client, if not yet sent
2863 unless (exists $self->{channel}{$channel->{id}}) { 2869 unless (exists $self->{channel}{$channel->{id}}) {
2864 $self->{channel}{$channel->{id}} = $channel; 2870 $self->{channel}{$channel->{id}} = $channel;
2865 $self->ext_msg (channel_info => $channel) 2871 $self->ext_msg (channel_info => $channel);
2866 if $self->can_msg;
2867 } 2872 }
2868 2873
2869 $channel = $channel->{id}; 2874 $channel = $channel->{id};
2870 } 2875 }
2871 2876
2872 return unless @extra || length $msg; 2877 return unless @extra || length $msg;
2873 2878
2874 if ($self->can_msg) {
2875 # default colour, mask it out 2879 # default colour, mask it out
2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2877 if $color & cf::NDI_DEF; 2881 if $color & cf::NDI_DEF;
2878 2882
2879 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2883 my $pkt = "msg "
2884 . $self->{json_coder}->encode (
2880 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2881 } else { 2886 );
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 2887
2893 $color &= cf::NDI_COLOR_MASK; 2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2894 2891
2895 utf8::encode $msg; 2892 # split very large packets
2896 2893 if (8192 < length $pkt and $self->{can_lzf}) {
2897 if (0 && $msg =~ /\[/) { 2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2898 # COMMAND/INFO 2895 $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 } 2896 }
2897
2898 $self->send_packet ($pkt);
2906} 2899}
2907 2900
2908=item $client->ext_msg ($type, @msg) 2901=item $client->ext_msg ($type, @msg)
2909 2902
2910Sends an ext event to the client. 2903Sends an ext event to the client.
3085The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
3086 3079
3087 cf::object 3080 cf::object
3088 contr pay_amount pay_player map x y force_find force_add destroy 3081 contr pay_amount pay_player map x y force_find force_add destroy
3089 insert remove name archname title slaying race decrease split 3082 insert remove name archname title slaying race decrease split
3083 value
3090 3084
3091 cf::object::player 3085 cf::object::player
3092 player 3086 player
3093 3087
3094 cf::player 3088 cf::player
3099 3093
3100=cut 3094=cut
3101 3095
3102for ( 3096for (
3103 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3104 insert remove inv name archname title slaying race 3098 insert remove inv nrof name archname title slaying race
3105 decrease split destroy)], 3099 decrease split destroy change_exp value msg lore send_msg)],
3106 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
3107 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
3108 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
3109) { 3103) {
3110 no strict 'refs'; 3104 no strict 'refs';
3111 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
3112 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3129 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
3130 3124
3131 my $qcode = $code; 3125 my $qcode = $code;
3132 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3133 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
3134 3130
3135 local $_; 3131 local $_;
3136 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
3137 3133
3138 my $eval = 3134 my $eval =
3368 reload_treasures; 3364 reload_treasures;
3369 3365
3370 warn "finished reloading resource files\n"; 3366 warn "finished reloading resource files\n";
3371} 3367}
3372 3368
3373sub init {
3374 my $guard = freeze_mainloop;
3375
3376 reload_resources;
3377}
3378
3379sub reload_config { 3369sub reload_config {
3380 open my $fh, "<:utf8", "$CONFDIR/config" 3370 open my $fh, "<:utf8", "$CONFDIR/config"
3381 or return; 3371 or return;
3382 3372
3383 local $/; 3373 local $/;
3395 }; 3385 };
3396 warn $@ if $@; 3386 warn $@ if $@;
3397 } 3387 }
3398} 3388}
3399 3389
3390sub pidfile() {
3391 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3392 or die "$PIDFILE: $!";
3393 flock $fh, &Fcntl::LOCK_EX
3394 or die "$PIDFILE: flock: $!";
3395 $fh
3396}
3397
3398# make sure only one server instance is running at any one time
3399sub atomic {
3400 my $fh = pidfile;
3401
3402 my $pid = <$fh>;
3403 kill 9, $pid if $pid > 0;
3404
3405 seek $fh, 0, 0;
3406 print $fh $$;
3407}
3408
3409sub main_loop {
3410 warn "EV::loop starting\n";
3411 if (1) {
3412 EV::loop;
3413 }
3414 warn "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP;
3416}
3417
3400sub main { 3418sub main {
3419 cf::init_globals; # initialise logging
3420
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430
3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432
3401 # we must not ever block the main coroutine 3433 # we must not ever block the main coroutine
3402 local $Coro::idle = sub { 3434 local $Coro::idle = sub {
3403 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3435 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3404 (async { 3436 (async {
3405 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3437 $Coro::current->{desc} = "IDLE BUG HANDLER";
3406 EV::loop EV::LOOP_ONESHOT; 3438 EV::loop EV::LOOP_ONESHOT;
3407 })->prio (Coro::PRIO_MAX); 3439 })->prio (Coro::PRIO_MAX);
3408 }; 3440 };
3409 3441
3410 { 3442 evthread_start IO::AIO::poll_fileno;
3411 my $guard = freeze_mainloop; 3443
3444 cf::sync_job {
3445 reload_resources;
3412 reload_config; 3446 reload_config;
3413 db_init; 3447 db_init;
3448
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid;
3452 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills;
3455
3456 cf::init_beforeplay;
3457
3458 atomic;
3459
3414 load_extensions; 3460 load_extensions;
3415 3461
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3462 utime time, time, $RUNTIMEFILE;
3417 evthread_start IO::AIO::poll_fileno; 3463
3464 # no (long-running) fork's whatsoever before this point(!)
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466
3467 (pop @POST_INIT)->(0) while @POST_INIT;
3418 } 3468 };
3419 3469
3420 EV::loop; 3470 main_loop;
3421} 3471}
3422 3472
3423############################################################################# 3473#############################################################################
3424# initialisation and cleanup 3474# initialisation and cleanup
3425 3475
3432 }; 3482 };
3433 } 3483 }
3434} 3484}
3435 3485
3436sub write_runtime_sync { 3486sub write_runtime_sync {
3437 my $runtime = "$LOCALDIR/runtime";
3438
3439 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
3440 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
3441 3489
3442 IO::AIO::aio_utime $runtime, undef, undef; 3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3443 3491
3444 my $guard = cf::lock_acquire "write_runtime"; 3492 my $guard = cf::lock_acquire "write_runtime";
3445 3493
3446 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3447 or return; 3495 or return;
3448 3496
3449 my $value = $cf::RUNTIME + 90 + 10; 3497 my $value = $cf::RUNTIME + 90 + 10;
3450 # 10 is the runtime save interval, for a monotonic clock 3498 # 10 is the runtime save interval, for a monotonic clock
3451 # 60 allows for the watchdog to kill the server. 3499 # 60 allows for the watchdog to kill the server.
3461 aio_utime $fh, undef, undef; 3509 aio_utime $fh, undef, undef;
3462 3510
3463 close $fh 3511 close $fh
3464 or return; 3512 or return;
3465 3513
3466 aio_rename "$runtime~", $runtime 3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3467 and return; 3515 and return;
3468 3516
3469 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
3470 3518
3471 1 3519 1
3483 my $uuid = "$LOCALDIR/uuid"; 3531 my $uuid = "$LOCALDIR/uuid";
3484 3532
3485 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3486 or return; 3534 or return;
3487 3535
3488 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3536 my $value = uuid_seq uuid_cur;
3537
3538 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n";
3540 return;
3541 }
3542
3543 my $value = uuid_str $value + $uuid_skip;
3489 $uuid_skip = 0; 3544 $uuid_skip = 0;
3490 3545
3491 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3546 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3492 and return; 3547 and return;
3493 3548
3515} 3570}
3516 3571
3517sub emergency_save() { 3572sub emergency_save() {
3518 my $freeze_guard = cf::freeze_mainloop; 3573 my $freeze_guard = cf::freeze_mainloop;
3519 3574
3520 warn "enter emergency perl save\n"; 3575 warn "emergency_perl_save: enter\n";
3521 3576
3522 cf::sync_job { 3577 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582
3523 # use a peculiar iteration method to avoid tripping on perl 3583 # use a peculiar iteration method to avoid tripping on perl
3524 # refcount bugs in for. also avoids problems with players 3584 # refcount bugs in for. also avoids problems with players
3525 # and maps saved/destroyed asynchronously. 3585 # and maps saved/destroyed asynchronously.
3526 warn "begin emergency player save\n"; 3586 warn "emergency_perl_save: begin player save\n";
3527 for my $login (keys %cf::PLAYER) { 3587 for my $login (keys %cf::PLAYER) {
3528 my $pl = $cf::PLAYER{$login} or next; 3588 my $pl = $cf::PLAYER{$login} or next;
3529 $pl->valid or next; 3589 $pl->valid or next;
3530 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3531 $pl->save; 3591 $pl->save;
3532 } 3592 }
3533 warn "end emergency player save\n"; 3593 warn "emergency_perl_save: end player save\n";
3534 3594
3535 warn "begin emergency map save\n"; 3595 warn "emergency_perl_save: begin map save\n";
3536 for my $path (keys %cf::MAP) { 3596 for my $path (keys %cf::MAP) {
3537 my $map = $cf::MAP{$path} or next; 3597 my $map = $cf::MAP{$path} or next;
3538 $map->valid or next; 3598 $map->valid or next;
3539 $map->save; 3599 $map->save;
3540 } 3600 }
3541 warn "end emergency map save\n"; 3601 warn "emergency_perl_save: end map save\n";
3542 3602
3543 warn "begin emergency database checkpoint\n"; 3603 warn "emergency_perl_save: begin database checkpoint\n";
3544 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3545 warn "end emergency database checkpoint\n"; 3605 warn "emergency_perl_save: end database checkpoint\n";
3546 3606
3547 warn "begin write uuid\n"; 3607 warn "emergency_perl_save: begin write uuid\n";
3548 write_uuid_sync 1; 3608 write_uuid_sync 1;
3549 warn "end write uuid\n"; 3609 warn "emergency_perl_save: end write uuid\n";
3550 }; 3610 };
3551 3611
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
3552 warn "leave emergency perl save\n"; 3617 warn "emergency_perl_save: leave\n";
3553} 3618}
3554 3619
3555sub post_cleanup { 3620sub post_cleanup {
3556 my ($make_core) = @_; 3621 my ($make_core) = @_;
3557 3622
3558 warn Carp::longmess "post_cleanup backtrace" 3623 warn Carp::longmess "post_cleanup backtrace"
3559 if $make_core; 3624 if $make_core;
3625
3626 my $fh = pidfile;
3627 unlink $PIDFILE if <$fh> == $$;
3628}
3629
3630# a safer delete_package, copied from Symbol
3631sub clear_package($) {
3632 my $pkg = shift;
3633
3634 # expand to full symbol table name if needed
3635 unless ($pkg =~ /^main::.*::$/) {
3636 $pkg = "main$pkg" if $pkg =~ /^::/;
3637 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3638 $pkg .= '::' unless $pkg =~ /::$/;
3639 }
3640
3641 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3642 my $stem_symtab = *{$stem}{HASH};
3643
3644 defined $stem_symtab and exists $stem_symtab->{$leaf}
3645 or return;
3646
3647 # clear all symbols
3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649 for my $name (keys %$leaf_symtab) {
3650 _gv_clear *{"$pkg$name"};
3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652 }
3653 warn "cleared package $pkg\n";#d#
3560} 3654}
3561 3655
3562sub do_reload_perl() { 3656sub do_reload_perl() {
3563 # can/must only be called in main 3657 # can/must only be called in main
3564 if ($Coro::current != $Coro::main) { 3658 if ($Coro::current != $Coro::main) {
3565 warn "can only reload from main coroutine"; 3659 warn "can only reload from main coroutine";
3566 return; 3660 return;
3567 } 3661 }
3568 3662
3663 return if $RELOAD++;
3664
3665 my $t1 = EV::time;
3666
3667 while ($RELOAD) {
3569 warn "reloading..."; 3668 warn "reloading...";
3570 3669
3571 warn "entering sync_job"; 3670 warn "entering sync_job";
3572 3671
3573 cf::sync_job { 3672 cf::sync_job {
3574 cf::write_runtime_sync; # external watchdog should not bark 3673 cf::write_runtime_sync; # external watchdog should not bark
3575 cf::emergency_save; 3674 cf::emergency_save;
3576 cf::write_runtime_sync; # external watchdog should not bark 3675 cf::write_runtime_sync; # external watchdog should not bark
3577 3676
3578 warn "syncing database to disk"; 3677 warn "syncing database to disk";
3579 BDB::db_env_txn_checkpoint $DB_ENV; 3678 BDB::db_env_txn_checkpoint $DB_ENV;
3580 3679
3581 # if anything goes wrong in here, we should simply crash as we already saved 3680 # if anything goes wrong in here, we should simply crash as we already saved
3582 3681
3583 warn "flushing outstanding aio requests"; 3682 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; 3683 while (IO::AIO::nreqs || BDB::nreqs) {
3589 warn "iterate..."; 3684 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 } 3685 }
3615 3686
3616 warn "... nuking $pkg"; 3687 warn "cancelling all extension coros";
3617 Symbol::delete_package $pkg; 3688 $_->cancel for values %EXT_CORO;
3618 } 3689 %EXT_CORO = ();
3619 3690
3620 warn "unloading all perl modules loaded from $LIBDIR"; 3691 warn "removing commands";
3621 while (my ($k, $v) = each %INC) { 3692 %COMMAND = ();
3622 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3623 3693
3694 warn "removing ext/exti commands";
3695 %EXTCMD = ();
3696 %EXTICMD = ();
3697
3698 warn "unloading/nuking all extensions";
3699 for my $pkg (@EXTS) {
3624 warn "... unloading $k"; 3700 warn "... unloading $pkg";
3625 delete $INC{$k};
3626 3701
3627 $k =~ s/\.pm$//;
3628 $k =~ s/\//::/g;
3629
3630 if (my $cb = $k->can ("unload_module")) { 3702 if (my $cb = $pkg->can ("unload")) {
3703 eval {
3631 $cb->(); 3704 $cb->($pkg);
3705 1
3706 } or warn "$pkg unloaded, but with errors: $@";
3707 }
3708
3709 warn "... clearing $pkg";
3710 clear_package $pkg;
3632 } 3711 }
3633 3712
3634 Symbol::delete_package $k; 3713 warn "unloading all perl modules loaded from $LIBDIR";
3714 while (my ($k, $v) = each %INC) {
3715 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716
3717 warn "... unloading $k";
3718 delete $INC{$k};
3719
3720 $k =~ s/\.pm$//;
3721 $k =~ s/\//::/g;
3722
3723 if (my $cb = $k->can ("unload_module")) {
3724 $cb->();
3725 }
3726
3727 clear_package $k;
3635 } 3728 }
3636 3729
3637 warn "getting rid of safe::, as good as possible"; 3730 warn "getting rid of safe::, as good as possible";
3638 Symbol::delete_package "safe::$_" 3731 clear_package "safe::$_"
3639 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3732 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3640 3733
3641 warn "unloading cf.pm \"a bit\""; 3734 warn "unloading cf.pm \"a bit\"";
3642 delete $INC{"cf.pm"}; 3735 delete $INC{"cf.pm"};
3643 delete $INC{"cf/pod.pm"}; 3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3644 3737
3645 # don't, removes xs symbols, too, 3738 # don't, removes xs symbols, too,
3646 # and global variables created in xs 3739 # and global variables created in xs
3647 #Symbol::delete_package __PACKAGE__; 3740 #clear_package __PACKAGE__;
3648 3741
3649 warn "unload completed, starting to reload now"; 3742 warn "unload completed, starting to reload now";
3650 3743
3651 warn "reloading cf.pm"; 3744 warn "reloading cf.pm";
3652 require cf; 3745 require cf;
3653 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3654 3747
3655 warn "loading config and database again"; 3748 warn "loading config and database again";
3656 cf::reload_config; 3749 cf::reload_config;
3657 3750
3658 warn "loading extensions"; 3751 warn "loading extensions";
3659 cf::load_extensions; 3752 cf::load_extensions;
3660 3753
3754 if ($REATTACH_ON_RELOAD) {
3661 warn "reattaching attachments to objects/players"; 3755 warn "reattaching attachments to objects/players";
3662 _global_reattach; # objects, sockets 3756 _global_reattach; # objects, sockets
3663 warn "reattaching attachments to maps"; 3757 warn "reattaching attachments to maps";
3664 reattach $_ for values %MAP; 3758 reattach $_ for values %MAP;
3665 warn "reattaching attachments to players"; 3759 warn "reattaching attachments to players";
3666 reattach $_ for values %PLAYER; 3760 reattach $_ for values %PLAYER;
3761 }
3667 3762
3763 warn "running post_init jobs";
3764 (pop @POST_INIT)->(1) while @POST_INIT;
3765
3668 warn "leaving sync_job"; 3766 warn "leaving sync_job";
3669 3767
3670 1 3768 1
3671 } or do { 3769 } or do {
3672 warn $@; 3770 warn $@;
3673 cf::cleanup "error while reloading, exiting."; 3771 cf::cleanup "error while reloading, exiting.";
3674 }; 3772 };
3675 3773
3676 warn "reloaded"; 3774 warn "reloaded";
3775 --$RELOAD;
3776 }
3777
3778 $t1 = EV::time - $t1;
3779 warn "reload completed in ${t1}s\n";
3677}; 3780};
3678 3781
3679our $RELOAD_WATCHER; # used only during reload 3782our $RELOAD_WATCHER; # used only during reload
3680 3783
3681sub reload_perl() { 3784sub reload_perl() {
3682 # doing reload synchronously and two reloads happen back-to-back, 3785 # doing reload synchronously and two reloads happen back-to-back,
3683 # coro crashes during coro_state_free->destroy here. 3786 # coro crashes during coro_state_free->destroy here.
3684 3787
3788 $RELOAD_WATCHER ||= cf::async {
3789 Coro::AIO::aio_wait cache_extensions;
3790
3685 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3686 do_reload_perl; 3792 do_reload_perl;
3687 undef $RELOAD_WATCHER; 3793 undef $RELOAD_WATCHER;
3794 };
3688 }; 3795 };
3689} 3796}
3690 3797
3691register_command "reload" => sub { 3798register_command "reload" => sub {
3692 my ($who, $arg) = @_; 3799 my ($who, $arg) = @_;
3763{ 3870{
3764 # configure BDB 3871 # configure BDB
3765 3872
3766 BDB::min_parallel 8; 3873 BDB::min_parallel 8;
3767 BDB::max_poll_reqs $TICK * 0.1; 3874 BDB::max_poll_reqs $TICK * 0.1;
3768 $Coro::BDB::WATCHER->priority (1); 3875 $AnyEvent::BDB::WATCHER->priority (1);
3769 3876
3770 unless ($DB_ENV) { 3877 unless ($DB_ENV) {
3771 $DB_ENV = BDB::db_env_create; 3878 $DB_ENV = BDB::db_env_create;
3772 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3879 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3773 | BDB::LOG_AUTOREMOVE, 1); 3880 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3881 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3774 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3882 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3775 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3883 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3776 3884
3777 cf::sync_job { 3885 cf::sync_job {
3778 eval { 3886 eval {
3804{ 3912{
3805 # configure IO::AIO 3913 # configure IO::AIO
3806 3914
3807 IO::AIO::min_parallel 8; 3915 IO::AIO::min_parallel 8;
3808 IO::AIO::max_poll_time $TICK * 0.1; 3916 IO::AIO::max_poll_time $TICK * 0.1;
3809 $Coro::AIO::WATCHER->priority (1); 3917 undef $AnyEvent::AIO::WATCHER;
3810} 3918}
3811 3919
3812my $_log_backtrace; 3920my $_log_backtrace;
3813 3921
3814sub _log_backtrace { 3922sub _log_backtrace {
3817 $msg =~ s/\n//; 3925 $msg =~ s/\n//;
3818 3926
3819 # limit the # of concurrent backtraces 3927 # limit the # of concurrent backtraces
3820 if ($_log_backtrace < 2) { 3928 if ($_log_backtrace < 2) {
3821 ++$_log_backtrace; 3929 ++$_log_backtrace;
3930 my $perl_bt = Carp::longmess $msg;
3822 async { 3931 async {
3823 $Coro::current->{desc} = "abt $msg"; 3932 $Coro::current->{desc} = "abt $msg";
3824 3933
3825 my @bt = fork_call { 3934 my @bt = fork_call {
3826 @addr = map { sprintf "%x", $_ } @addr; 3935 @addr = map { sprintf "%x", $_ } @addr;
3837 } 3946 }
3838 3947
3839 @funcs 3948 @funcs
3840 }; 3949 };
3841 3950
3842 LOG llevInfo, "[ABT] $msg\n"; 3951 LOG llevInfo, "[ABT] $perl_bt\n";
3952 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3843 LOG llevInfo, "[ABT] $_\n" for @bt; 3953 LOG llevInfo, "[ABT] $_\n" for @bt;
3844 --$_log_backtrace; 3954 --$_log_backtrace;
3845 }; 3955 };
3846 } else { 3956 } else {
3847 LOG llevInfo, "[ABT] $msg\n"; 3957 LOG llevInfo, "[ABT] $msg\n";
3848 LOG llevInfo, "[ABT] [suppressed]\n"; 3958 LOG llevInfo, "[ABT] [suppressed]\n";
3849 } 3959 }
3850} 3960}
3851 3961
3852# load additional modules 3962# load additional modules
3853use cf::pod; 3963require "cf/$_.pm" for @EXTRA_MODULES;
3854 3964
3855END { cf::emergency_save } 3965END { cf::emergency_save }
3856 3966
38571 39671
3858 3968

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines