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.418 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.458 by root, Sat Dec 13 20:34:37 2008 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 "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::AnyEvent;
43use Coro::AIO; 47use Coro::AIO;
44use Coro::BDB; 48use Coro::BDB 1.6;
45use Coro::Storable; 49use Coro::Storable;
46use Coro::Util (); 50use Coro::Util ();
47 51
48use JSON::XS 2.01 (); 52use JSON::XS 2.01 ();
49use BDB (); 53use BDB ();
50use Data::Dumper; 54use Data::Dumper;
51use Digest::MD5; 55use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::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 75
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 76sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 77
69our %COMMAND = (); 78our %COMMAND = ();
70our %COMMAND_TIME = (); 79our %COMMAND_TIME = ();
73our %EXTCMD = (); 82our %EXTCMD = ();
74our %EXTICMD = (); 83our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 84our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 85our %EXT_MAP = (); # pluggable maps
77 86
78our $RELOAD; # number of reloads so far 87our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 88our @EVENT;
80 89
81our $CONFDIR = confdir; 90our $CONFDIR = confdir;
82our $DATADIR = datadir; 91our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 92our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 93our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 94our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 95our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 96our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 97our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 98our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 99our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 100our $BDBDIR = "$LOCALDIR/db";
101our $PIDFILE = "$LOCALDIR/pid";
102our $RUNTIMEFILE = "$LOCALDIR/runtime";
103
92our %RESOURCE; 104our %RESOURCE;
93 105
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 106our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 107our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 108our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 109our $USE_FSYNC = 1; # use fsync to write maps - default off
99 110
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 111our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 112our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 113our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 114our $DB_ENV;
105 115
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 129our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 130our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 131our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 132our $TICK_START; # for load detecting purposes
123 133
134our @POST_INIT;
135
136our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
137
124binmode STDOUT; 138binmode STDOUT;
125binmode STDERR; 139binmode STDERR;
126 140
127# read virtual server time, if available 141# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 142unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 143 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 144 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 145 $RUNTIME = <$fh> + 0.;
132} 146}
133 147
134mkdir $_ 148mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 149 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
242for my $pkg (qw( 256for my $pkg (qw(
243 cf::global cf::attachable 257 cf::global cf::attachable
244 cf::object cf::object::player 258 cf::object cf::object::player
245 cf::client cf::player 259 cf::client cf::player
246 cf::arch cf::living 260 cf::arch cf::living
261 cf::map cf::mapspace
247 cf::map cf::party cf::region 262 cf::party cf::region
248)) { 263)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 264 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 265}
252 266
253$EV::DIED = sub { 267$EV::DIED = sub {
254 warn "error in event callback: @_"; 268 warn "error in event callback: @_";
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 310our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 311
298sub encode_json($) { $json_coder->encode ($_[0]) } 312sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 313sub decode_json($) { $json_coder->decode ($_[0]) }
300 314
315=item cf::post_init { BLOCK }
316
317Execute the given codeblock, I<after> all extensions have been (re-)loaded,
318but I<before> the server starts ticking again.
319
320The cdoeblock will have a single boolean argument to indicate whether this
321is a reload or not.
322
323=cut
324
325sub post_init(&) {
326 push @POST_INIT, shift;
327}
328
301=item cf::lock_wait $string 329=item cf::lock_wait $string
302 330
303Wait until the given lock is available. See cf::lock_acquire. 331Wait until the given lock is available. See cf::lock_acquire.
304 332
305=item my $lock = cf::lock_acquire $string 333=item my $lock = cf::lock_acquire $string
306 334
307Wait until the given lock is available and then acquires it and returns 335Wait 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, 336a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 337for example when the coroutine gets canceled), the lock is automatically
310returned. 338returned.
311 339
312Locks are *not* recursive, locking from the same coro twice results in a 340Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 341deadlocked coro.
332 return;#d# 360 return;#d#
333 }#d# 361 }#d#
334 362
335 # wait for lock, if any 363 # wait for lock, if any
336 while ($LOCK{$key}) { 364 while ($LOCK{$key}) {
365 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
337 push @{ $LOCK{$key} }, $Coro::current; 366 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule; 367 Coro::schedule;
339 } 368 }
340} 369}
341 370
346 lock_wait $key; 375 lock_wait $key;
347 376
348 $LOCK{$key} = []; 377 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d# 378 $LOCKER{$key} = $Coro::current;#d#
350 379
351 Coro::guard { 380 Guard::guard {
352 delete $LOCKER{$key};#d# 381 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side 382 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} }; 383 $_->ready for @{ delete $LOCK{$key} };
355 } 384 }
356} 385}
362} 391}
363 392
364sub freeze_mainloop { 393sub freeze_mainloop {
365 tick_inhibit_inc; 394 tick_inhibit_inc;
366 395
367 Coro::guard \&tick_inhibit_dec; 396 &Guard::guard (\&tick_inhibit_dec);
368} 397}
369 398
370=item cf::periodic $interval, $cb 399=item cf::periodic $interval, $cb
371 400
372Like EV::periodic, but randomly selects a starting point so that the actions 401Like EV::periodic, but randomly selects a starting point so that the actions
427 } 456 }
428 } 457 }
429}; 458};
430 459
431sub get_slot($;$$) { 460sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main;
462
432 my ($time, $pri, $name) = @_; 463 my ($time, $pri, $name) = @_;
433 464
434 $time = $TICK * .6 if $time > $TICK * .6; 465 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 466 my $sig = new Coro::Signal;
436 467
722 753
723############################################################################# 754#############################################################################
724 755
725=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
726 757
727Many objects in crossfire are so-called attachable objects. That means you can 758Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
730 761
731In the following description, CLASS can be any of C<global>, C<object> 762In the following description, CLASS can be any of C<global>, C<object>
732C<player>, C<client> or C<map> (i.e. the attachable objects in 763C<player>, C<client> or C<map> (i.e. the attachable objects in
782=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
783 814
784Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
786 817
787Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 819that are attached at load/instantiate time, thus the need for a name.
789 820
790These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
791 822
792=over 4 823=over 4
1083 1114
1084sub reattach { 1115sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1117 my ($obj) = @_;
1087 1118
1119 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1120 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1121
1090 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
1091 1123
1092 @$registry = (); 1124 @$registry = ();
1093 1125
1139 utf8::decode (my $decname = $filename); 1171 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1172 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1142 1174
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1178 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1179 aio_close $fh;
1148 1180
1149 if (@$objs) { 1181 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1182 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1183 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1184 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1185 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1186 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1187 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1188 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1189 }
1158 } else { 1190 } else {
1159 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1160 } 1192 }
1161 1193
1162 aio_rename "$filename~", $filename; 1194 aio_rename "$filename~", $filename;
1195
1196 $filename =~ s%/[^/]+$%%;
1197 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1198 } else {
1164 warn "FATAL: $filename~: $!\n"; 1199 warn "FATAL: $filename~: $!\n";
1165 } 1200 }
1166 } else { 1201 } else {
1167 aio_unlink $filename; 1202 aio_unlink $filename;
1260 my ($name, $cb) = @_; 1295 my ($name, $cb) = @_;
1261 1296
1262 $EXTICMD{$name} = $cb; 1297 $EXTICMD{$name} = $cb;
1263} 1298}
1264 1299
1300use File::Glob ();
1301
1265cf::player->attach ( 1302cf::player->attach (
1266 on_command => sub { 1303 on_command => sub {
1267 my ($pl, $name, $params) = @_; 1304 my ($pl, $name, $params) = @_;
1268 1305
1269 my $cb = $COMMAND{$name} 1306 my $cb = $COMMAND{$name}
1301 1338
1302 cf::override; 1339 cf::override;
1303 }, 1340 },
1304); 1341);
1305 1342
1343# "readahead" all extensions
1344sub cache_extensions {
1345 my $grp = IO::AIO::aio_group;
1346
1347 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1348 for (grep /\.ext$/, @{$_[0]}) {
1349 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1350 }
1351 };
1352
1353 $grp
1354}
1355
1306sub load_extensions { 1356sub load_extensions {
1307 cf::sync_job { 1357 cf::sync_job {
1308 my %todo; 1358 my %todo;
1309 1359
1310 for my $path (<$LIBDIR/*.ext>) { 1360 for my $path (<$LIBDIR/*.ext>) {
1329 1379
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1380 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1381 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1382
1333 $ext{source} = 1383 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1384 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1385 . "#line 1 \"$path\"\n{\n"
1336 . $source 1386 . $source
1337 . "\n};\n1"; 1387 . "\n};\n1";
1338 1388
1339 $todo{$base} = \%ext; 1389 $todo{$base} = \%ext;
1379 1429
1380=back 1430=back
1381 1431
1382=head2 CORE EXTENSIONS 1432=head2 CORE EXTENSIONS
1383 1433
1384Functions and methods that extend core crossfire objects. 1434Functions and methods that extend core deliantra objects.
1385 1435
1386=cut 1436=cut
1387 1437
1388package cf::player; 1438package cf::player;
1389 1439
1432 1482
1433sub exists($) { 1483sub exists($) {
1434 my ($login) = @_; 1484 my ($login) = @_;
1435 1485
1436 $cf::PLAYER{$login} 1486 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1487 or !aio_stat path $login
1438} 1488}
1439 1489
1440sub find($) { 1490sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1491 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1492 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1504 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1505 or return;
1456 1506
1457 my $pl = cf::player::load_pl $f 1507 my $pl = cf::player::load_pl $f
1458 or return; 1508 or return;
1509
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1510 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1511 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1512 $cf::PLAYER{$login} = $pl
1462 } 1513 }
1463 } 1514 }
1473 1524
1474 return if $pl->{deny_save}; 1525 return if $pl->{deny_save};
1475 1526
1476 aio_mkdir playerdir $pl, 0770; 1527 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1528 $pl->{last_save} = $cf::RUNTIME;
1529
1530 cf::get_slot 0.01;
1478 1531
1479 $pl->save_pl ($path); 1532 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1533 cf::cede_to_tick;
1481} 1534}
1482 1535
1514 my ($pl) = @_; 1567 my ($pl) = @_;
1515 1568
1516 my $name = $pl->ob->name; 1569 my $name = $pl->ob->name;
1517 1570
1518 $pl->{deny_save} = 1; 1571 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1572 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1573
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1574 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1575 $pl->deactivate;
1576 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1577 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1578 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1579 $pl->ns->destroy if $pl->ns;
1525 1580
1526 my $path = playerdir $pl; 1581 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1582 my $temp = "$path~$cf::RUNTIME~deleting~";
1566 1621
1567 for my $login (@$dirs) { 1622 for my $login (@$dirs) {
1568 my $path = path $login; 1623 my $path = path $login;
1569 1624
1570 # a .pst is a dead give-away for a valid player 1625 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1626 # if no pst file found, open and chekc for blocked users
1627 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1628 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1629 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1630 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1631 }
1576 1632
1607 } 1663 }
1608 1664
1609 \@paths 1665 \@paths
1610} 1666}
1611 1667
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1668=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1669
1614Expand crossfire pod fragments into protocol xml. 1670Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1671
1705=item $player->ext_reply ($msgid, @msg) 1672=item $player->ext_reply ($msgid, @msg)
1706 1673
1707Sends an ext reply to the player. 1674Sends an ext reply to the player.
1708 1675
1909 1876
1910# the temporary/swap location 1877# the temporary/swap location
1911sub save_path { 1878sub save_path {
1912 my ($self) = @_; 1879 my ($self) = @_;
1913 1880
1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1915 "$TMPDIR/$path.map" 1882 "$TMPDIR/$path.map"
1916} 1883}
1917 1884
1918# the unique path, undef == no special unique path 1885# the unique path, undef == no special unique path
1919sub uniq_path { 1886sub uniq_path {
1920 my ($self) = @_; 1887 my ($self) = @_;
1921 1888
1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1889 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923 "$UNIQUEDIR/$path" 1890 "$UNIQUEDIR/$path"
1924} 1891}
1925 1892
1926# and all this just because we cannot iterate over 1893# and all this just because we cannot iterate over
1927# all maps in C++... 1894# all maps in C++...
2025 1992
2026 cf::lock_wait "map_data:$path";#d#remove 1993 cf::lock_wait "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 1994 cf::lock_wait "map_find:$path";
2028 1995
2029 $cf::MAP{$path} || do { 1996 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1997 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1998 my $guard2 = cf::lock_acquire "map_find:$path";
2032 1999
2033 my $map = new_from_path cf::map $path 2000 my $map = new_from_path cf::map $path
2034 or return; 2001 or return;
2035 2002
2036 $map->{last_save} = $cf::RUNTIME; 2003 $map->{last_save} = $cf::RUNTIME;
2039 or return; 2006 or return;
2040 2007
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2008 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2009 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2010 #$cf::WAIT_FOR_TICK->wait;
2011 undef $guard2;
2044 undef $guard1; 2012 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2013 $map->reset;
2047 return find $path; 2014 return find $path;
2048 } 2015 }
2049 2016
2050 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2044 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2045 $f->skip_block;
2079 $self->_load_objects ($f) 2046 $self->_load_objects ($f)
2080 or return; 2047 or return;
2081 2048
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2049 $self->post_load_original
2083 if delete $self->{load_original}; 2050 if delete $self->{load_original};
2084 2051
2085 if (my $uniq = $self->uniq_path) { 2052 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2053 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2054 unless (aio_stat $uniq) {
2113 } 2080 }
2114 2081
2115 $self->{last_save} = $cf::RUNTIME; 2082 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2083 $self->last_access ($cf::RUNTIME);
2117 2084
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2085 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2086 }
2120 2087
2121 $self->post_load; 2088 $self->post_load;
2122} 2089}
2123 2090
2181 my ($path, $origin, $load) = @_; 2148 my ($path, $origin, $load) = @_;
2182 2149
2183 $path = normalise $path, $origin && $origin->{path}; 2150 $path = normalise $path, $origin && $origin->{path};
2184 2151
2185 if (my $map = $cf::MAP{$path}) { 2152 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2153 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2154 }
2188 2155
2189 $MAP_PREFETCH{$path} |= $load; 2156 $MAP_PREFETCH{$path} |= $load;
2190 2157
2191 $MAP_PREFETCHER ||= cf::async { 2158 $MAP_PREFETCHER ||= cf::async {
2228 cf::async { 2195 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2196 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2197 $_->contr->save for $self->players;
2231 }; 2198 };
2232 2199
2200 cf::get_slot 0.02;
2201
2233 if ($uniq) { 2202 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2203 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2204 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2205 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2206 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2245 $self->save; 2214 $self->save;
2246 2215
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2216 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2217
2249 return if $self->players; 2218 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2219 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2220 return if $self->{deny_save};
2252 2221
2253 $self->in_memory (cf::MAP_SWAPPED); 2222 $self->in_memory (cf::MAP_SWAPPED);
2254 2223
2255 $self->deactivate; 2224 $self->deactivate;
2373 2342
2374sub unique_maps() { 2343sub unique_maps() {
2375 [ 2344 [
2376 map { 2345 map {
2377 utf8::decode $_; 2346 utf8::decode $_;
2378 /\.map$/ 2347 s/\.map$//; # TODO future compatibility hack
2348 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2349 ? ()
2379 ? normalise $_ 2350 : normalise $_
2380 : ()
2381 } @{ aio_readdir $UNIQUEDIR or [] } 2351 } @{ aio_readdir $UNIQUEDIR or [] }
2382 ] 2352 ]
2383} 2353}
2384 2354
2385=back 2355=back
2392 2362
2393=over 4 2363=over 4
2394 2364
2395=item $ob->inv_recursive 2365=item $ob->inv_recursive
2396 2366
2397Returns the inventory of the object _and_ their inventories, recursively. 2367Returns the inventory of the object I<and> their inventories, recursively,
2368but I<not> the object itself.
2398 2369
2399=cut 2370=cut
2400 2371
2401sub inv_recursive_; 2372sub inv_recursive_;
2402sub inv_recursive_ { 2373sub inv_recursive_ {
2407 inv_recursive_ inv $_[0] 2378 inv_recursive_ inv $_[0]
2408} 2379}
2409 2380
2410=item $ref = $ob->ref 2381=item $ref = $ob->ref
2411 2382
2412creates and returns a persistent reference to an objetc that can be stored as a string. 2383Creates and returns a persistent reference to an object that can be stored as a string.
2413 2384
2414=item $ob = cf::object::deref ($refstring) 2385=item $ob = cf::object::deref ($refstring)
2415 2386
2416returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2387returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2417even if the object actually exists. May block. 2388even if the object actually exists. May block.
2449can be C<undef>. Does the right thing when the player is currently in a 2420can be C<undef>. Does the right thing when the player is currently in a
2450dialogue with the given NPC character. 2421dialogue with the given NPC character.
2451 2422
2452=cut 2423=cut
2453 2424
2425our $SAY_CHANNEL = {
2426 id => "say",
2427 title => "Map",
2428 reply => "say ",
2429 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2430};
2431
2432our $CHAT_CHANNEL = {
2433 id => "chat",
2434 title => "Chat",
2435 reply => "chat ",
2436 tooltip => "Player chat and shouts, global to the server.",
2437};
2438
2454# rough implementation of a future "reply" method that works 2439# rough implementation of a future "reply" method that works
2455# with dialog boxes. 2440# with dialog boxes.
2456#TODO: the first argument must go, split into a $npc->reply_to ( method 2441#TODO: the first argument must go, split into a $npc->reply_to ( method
2457sub cf::object::player::reply($$$;$) { 2442sub cf::object::player::reply($$$;$) {
2458 my ($self, $npc, $msg, $flags) = @_; 2443 my ($self, $npc, $msg, $flags) = @_;
2469 my $dialog = $pl->{npc_dialog}; 2454 my $dialog = $pl->{npc_dialog};
2470 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2455 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2471 2456
2472 } else { 2457 } else {
2473 $msg = $npc->name . " says: $msg" if $npc; 2458 $msg = $npc->name . " says: $msg" if $npc;
2474 $self->message ($msg, $flags); 2459 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2475 } 2460 }
2476 } 2461 }
2477} 2462}
2478 2463
2479=item $object->send_msg ($channel, $msg, $color, [extra...]) 2464=item $object->send_msg ($channel, $msg, $color, [extra...])
2504 2489
2505=item $player_object->enter_link 2490=item $player_object->enter_link
2506 2491
2507Freezes the player and moves him/her to a special map (C<{link}>). 2492Freezes the player and moves him/her to a special map (C<{link}>).
2508 2493
2509The player should be reasonably safe there for short amounts of time. You 2494The player should be reasonably safe there for short amounts of time (e.g.
2510I<MUST> call C<leave_link> as soon as possible, though. 2495for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2496though, as the palyer cannot control the character while it is on the link
2497map.
2511 2498
2512Will never block. 2499Will never block.
2513 2500
2514=item $player_object->leave_link ($map, $x, $y) 2501=item $player_object->leave_link ($map, $x, $y)
2515 2502
2573 2560
2574 $map->load; 2561 $map->load;
2575 $map->load_neighbours; 2562 $map->load_neighbours;
2576 2563
2577 return unless $self->contr->active; 2564 return unless $self->contr->active;
2565 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2578 $self->activate_recursive; 2566 $self->activate_recursive;
2579 2567
2580 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2568 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2581 $self->enter_map ($map, $x, $y); 2569 $self->enter_map ($map, $x, $y);
2582} 2570}
2586Moves the player to the given map-path and coordinates by first freezing 2574Moves the player to the given map-path and coordinates by first freezing
2587her, loading and preparing them map, calling the provided $check callback 2575her, loading and preparing them map, calling the provided $check callback
2588that has to return the map if sucecssful, and then unfreezes the player on 2576that has to return the map if sucecssful, and then unfreezes the player on
2589the new (success) or old (failed) map position. In either case, $done will 2577the new (success) or old (failed) map position. In either case, $done will
2590be called at the end of this process. 2578be called at the end of this process.
2579
2580Note that $check will be called with a potentially non-loaded map, so if
2581it needs a loaded map it has to call C<< ->load >>.
2591 2582
2592=cut 2583=cut
2593 2584
2594our $GOTOGEN; 2585our $GOTOGEN;
2595 2586
2674} 2665}
2675 2666
2676sub prepare_random_map { 2667sub prepare_random_map {
2677 my ($exit) = @_; 2668 my ($exit) = @_;
2678 2669
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 # all this does is basically replace the /! path by 2670 # all this does is basically replace the /! path by
2682 # a new random map path (?random/...) with a seed 2671 # a new random map path (?random/...) with a seed
2683 # that depends on the exit object 2672 # that depends on the exit object
2684 2673
2685 my $rmp = parse_random_map_params $exit->msg; 2674 my $rmp = parse_random_map_params $exit->msg;
2687 if ($exit->map) { 2676 if ($exit->map) {
2688 $rmp->{region} = $exit->region->name; 2677 $rmp->{region} = $exit->region->name;
2689 $rmp->{origin_map} = $exit->map->path; 2678 $rmp->{origin_map} = $exit->map->path;
2690 $rmp->{origin_x} = $exit->x; 2679 $rmp->{origin_x} = $exit->x;
2691 $rmp->{origin_y} = $exit->y; 2680 $rmp->{origin_y} = $exit->y;
2681
2682 $exit->map->touch;
2692 } 2683 }
2693 2684
2694 $rmp->{random_seed} ||= $exit->random_seed; 2685 $rmp->{random_seed} ||= $exit->random_seed;
2695 2686
2696 my $data = cf::encode_json $rmp; 2687 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2697 my $md5 = Digest::MD5::md5_hex $data; 2688 my $md5 = Digest::MD5::md5_hex $data;
2698 my $meta = "$RANDOMDIR/$md5.meta"; 2689 my $meta = "$RANDOMDIR/$md5.meta";
2699 2690
2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2691 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2701 aio_write $fh, 0, (length $data), $data, 0; 2692 aio_write $fh, 0, (length $data), $data, 0;
2702 undef $fh; 2693 undef $fh;
2703 aio_rename "$meta~", $meta; 2694 aio_rename "$meta~", $meta;
2704 2695
2696 my $slaying = "?random/$md5";
2697
2698 if ($exit->valid) {
2705 $exit->slaying ("?random/$md5"); 2699 $exit->slaying ("?random/$md5");
2706 $exit->msg (undef); 2700 $exit->msg (undef);
2701 }
2707 } 2702 }
2708} 2703}
2709 2704
2710sub cf::object::player::enter_exit { 2705sub cf::object::player::enter_exit {
2711 my ($self, $exit) = @_; 2706 my ($self, $exit) = @_;
2712 2707
2713 return unless $self->type == cf::PLAYER; 2708 return unless $self->type == cf::PLAYER;
2714 2709
2715 if ($exit->slaying eq "/!") {
2716 #TODO: this should de-fi-ni-te-ly not be a sync-job
2717 # the problem is that $exit might not survive long enough
2718 # so it needs to be done right now, right here
2719 cf::sync_job { prepare_random_map $exit };
2720 }
2721
2722 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2723 my $hp = $exit->stats->hp;
2724 my $sp = $exit->stats->sp;
2725
2726 $self->enter_link; 2710 $self->enter_link;
2727 2711
2728 # if exit is damned, update players death & WoR home-position
2729 $self->contr->savebed ($slaying, $hp, $sp)
2730 if $exit->flag (FLAG_DAMNED);
2731
2732 (async { 2712 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2713 $Coro::current->{desc} = "enter_exit";
2734 2714
2735 $self->deactivate_recursive; # just to be sure
2736 unless (eval { 2715 unless (eval {
2716 $self->deactivate_recursive; # just to be sure
2717
2718 # random map handling
2719 {
2720 my $guard = cf::lock_acquire "exit_prepare:$exit";
2721
2722 prepare_random_map $exit
2723 if $exit->slaying eq "/!";
2724 }
2725
2726 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2727 my $x = $exit->stats->hp;
2728 my $y = $exit->stats->sp;
2729
2737 $self->goto ($slaying, $hp, $sp); 2730 $self->goto ($map, $x, $y);
2738 2731
2732 # if exit is damned, update players death & WoR home-position
2733 $self->contr->savebed ($map, $x, $y)
2734 if $exit->flag (cf::FLAG_DAMNED);
2735
2739 1; 2736 1
2740 }) { 2737 }) {
2741 $self->message ("Something went wrong deep within the crossfire server. " 2738 $self->message ("Something went wrong deep within the deliantra server. "
2742 . "I'll try to bring you back to the map you were before. " 2739 . "I'll try to bring you back to the map you were before. "
2743 . "Please report this to the dungeon master!", 2740 . "Please report this to the dungeon master!",
2744 cf::NDI_UNIQUE | cf::NDI_RED); 2741 cf::NDI_UNIQUE | cf::NDI_RED);
2745 2742
2746 warn "ERROR in enter_exit: $@"; 2743 warn "ERROR in enter_exit: $@";
2812 id => "infobox", 2809 id => "infobox",
2813 title => "Body Parts", 2810 title => "Body Parts",
2814 reply => undef, 2811 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available", 2812 tooltip => "Shows which body parts you posess and are available",
2816 }, 2813 },
2814 "c/skills" => {
2815 id => "infobox",
2816 title => "Skills",
2817 reply => undef,
2818 tooltip => "Shows your experience per skill and item power",
2819 },
2817 "c/uptime" => { 2820 "c/uptime" => {
2818 id => "infobox", 2821 id => "infobox",
2819 title => "Uptime", 2822 title => "Uptime",
2820 reply => undef, 2823 reply => undef,
2821 tooltip => "How long the server has been running since last restart", 2824 tooltip => "How long the server has been running since last restart",
2824 id => "infobox", 2827 id => "infobox",
2825 title => "Map Info", 2828 title => "Map Info",
2826 reply => undef, 2829 reply => undef,
2827 tooltip => "Information related to the maps", 2830 tooltip => "Information related to the maps",
2828 }, 2831 },
2832 "c/party" => {
2833 id => "party",
2834 title => "Party",
2835 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party",
2837 },
2829); 2838);
2830 2839
2831sub cf::client::send_msg { 2840sub cf::client::send_msg {
2832 my ($self, $channel, $msg, $color, @extra) = @_; 2841 my ($self, $channel, $msg, $color, @extra) = @_;
2833 2842
2834 $msg = $self->pl->expand_cfpod ($msg); 2843 $msg = $self->pl->expand_cfpod ($msg)
2844 unless $color & cf::NDI_VERBATIM;
2835 2845
2836 $color &= cf::NDI_CLIENT_MASK; # just in case... 2846 $color &= cf::NDI_CLIENT_MASK; # just in case...
2837 2847
2838 # check predefined channels, for the benefit of C 2848 # check predefined channels, for the benefit of C
2839 if ($CHANNEL{$channel}) { 2849 if ($CHANNEL{$channel}) {
2860 if ($self->can_msg) { 2870 if ($self->can_msg) {
2861 # default colour, mask it out 2871 # default colour, mask it out
2862 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2872 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2863 if $color & cf::NDI_DEF; 2873 if $color & cf::NDI_DEF;
2864 2874
2865 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2875 my $pkt = "msg "
2876 . $self->{json_coder}->encode (
2866 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2877 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2878 );
2879
2880 # try lzf for large packets
2881 $pkt = "lzf " . Compress::LZF::compress $pkt
2882 if 1024 <= length $pkt and $self->{can_lzf};
2883
2884 # split very large packets
2885 if (8192 < length $pkt and $self->{can_lzf}) {
2886 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2887 $pkt = "frag";
2888 }
2889
2890 $self->send_packet ($pkt);
2867 } else { 2891 } else {
2868 if ($color >= 0) { 2892 if ($color >= 0) {
2869 # replace some tags by gcfclient-compatible ones 2893 # replace some tags by gcfclient-compatible ones
2870 for ($msg) { 2894 for ($msg) {
2871 1 while 2895 1 while
3070 3094
3071The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
3072 3096
3073 cf::object 3097 cf::object
3074 contr pay_amount pay_player map x y force_find force_add destroy 3098 contr pay_amount pay_player map x y force_find force_add destroy
3075 insert remove name archname title slaying race decrease_ob_nr 3099 insert remove name archname title slaying race decrease split
3076 3100
3077 cf::object::player 3101 cf::object::player
3078 player 3102 player
3079 3103
3080 cf::player 3104 cf::player
3085 3109
3086=cut 3110=cut
3087 3111
3088for ( 3112for (
3089 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3113 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3090 insert remove inv name archname title slaying race 3114 insert remove inv nrof name archname title slaying race
3091 decrease_ob_nr destroy)], 3115 decrease split destroy change_exp)],
3092 ["cf::object::player" => qw(player)], 3116 ["cf::object::player" => qw(player)],
3093 ["cf::player" => qw(peaceful)], 3117 ["cf::player" => qw(peaceful)],
3094 ["cf::map" => qw(trigger)], 3118 ["cf::map" => qw(trigger)],
3095) { 3119) {
3096 no strict 'refs'; 3120 no strict 'refs';
3304 while (my ($k, $v) = each %$want) { 3328 while (my ($k, $v) = each %$want) {
3305 $ns->fx_want ($k, $v); 3329 $ns->fx_want ($k, $v);
3306 } 3330 }
3307}; 3331};
3308 3332
3333sub load_resource_file($) {
3334 my $guard = lock_acquire "load_resource_file";
3335
3336 my $status = load_resource_file_ $_[0];
3337 get_slot 0.1, 100;
3338 cf::arch::commit_load;
3339
3340 $status
3341}
3342
3309sub reload_regions { 3343sub reload_regions {
3310 # HACK to clear player env face cache, we need some signal framework 3344 # HACK to clear player env face cache, we need some signal framework
3311 # for this (global event?) 3345 # for this (global event?)
3312 %ext::player_env::MUSIC_FACE_CACHE = (); 3346 %ext::player_env::MUSIC_FACE_CACHE = ();
3313 3347
3326} 3360}
3327 3361
3328sub reload_archetypes { 3362sub reload_archetypes {
3329 load_resource_file "$DATADIR/archetypes" 3363 load_resource_file "$DATADIR/archetypes"
3330 or die "unable to load archetypes\n"; 3364 or die "unable to load archetypes\n";
3331 #d# NEED to laod twice to resolve forward references
3332 # this really needs to be done in an extra post-pass
3333 # (which needs to be synchronous, so solve it differently)
3334 load_resource_file "$DATADIR/archetypes"
3335 or die "unable to load archetypes\n";
3336} 3365}
3337 3366
3338sub reload_treasures { 3367sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3368 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3369 or die "unable to load treasurelists\n";
3341} 3370}
3342 3371
3343sub reload_resources { 3372sub reload_resources {
3344 warn "reloading resource files...\n"; 3373 warn "reloading resource files...\n";
3345 3374
3375 reload_facedata;
3376 reload_archetypes;
3346 reload_regions; 3377 reload_regions;
3347 reload_facedata;
3348 #reload_archetypes;#d#
3349 reload_archetypes;
3350 reload_treasures; 3378 reload_treasures;
3351 3379
3352 warn "finished reloading resource files\n"; 3380 warn "finished reloading resource files\n";
3353}
3354
3355sub init {
3356 reload_resources;
3357} 3381}
3358 3382
3359sub reload_config { 3383sub reload_config {
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3384 open my $fh, "<:utf8", "$CONFDIR/config"
3361 or return; 3385 or return;
3375 }; 3399 };
3376 warn $@ if $@; 3400 warn $@ if $@;
3377 } 3401 }
3378} 3402}
3379 3403
3404sub pidfile() {
3405 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3406 or die "$PIDFILE: $!";
3407 flock $fh, &Fcntl::LOCK_EX
3408 or die "$PIDFILE: flock: $!";
3409 $fh
3410}
3411
3412# make sure only one server instance is running at any one time
3413sub atomic {
3414 my $fh = pidfile;
3415
3416 my $pid = <$fh>;
3417 kill 9, $pid if $pid > 0;
3418
3419 seek $fh, 0, 0;
3420 print $fh $$;
3421}
3422
3380sub main { 3423sub main {
3424 cf::init_globals; # initialise logging
3425
3426 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3427 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3428 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3429 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3430
3431 cf::init_experience;
3432 cf::init_anim;
3433 cf::init_attackmess;
3434 cf::init_dynamic;
3435 cf::init_block;
3436
3437 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3438
3381 # we must not ever block the main coroutine 3439 # we must not ever block the main coroutine
3382 local $Coro::idle = sub { 3440 local $Coro::idle = sub {
3383 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3441 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3384 (async { 3442 (async {
3385 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3443 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT; 3444 EV::loop EV::LOOP_ONESHOT;
3387 })->prio (Coro::PRIO_MAX); 3445 })->prio (Coro::PRIO_MAX);
3388 }; 3446 };
3389 3447
3390 reload_config;
3391 db_init;
3392 load_extensions;
3393
3394 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 evthread_start IO::AIO::poll_fileno; 3448 evthread_start IO::AIO::poll_fileno;
3449
3450 cf::sync_job {
3451 reload_resources;
3452 reload_config;
3453 db_init;
3454
3455 cf::load_settings;
3456 cf::load_materials;
3457 cf::init_uuid;
3458 cf::init_signals;
3459 cf::init_commands;
3460 cf::init_skills;
3461
3462 cf::init_beforeplay;
3463
3464 atomic;
3465
3466 load_extensions;
3467
3468 utime time, time, $RUNTIMEFILE;
3469
3470 # no (long-running) fork's whatsoever before this point(!)
3471 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3472
3473 (pop @POST_INIT)->(0) while @POST_INIT;
3474 };
3475
3396 EV::loop; 3476 EV::loop;
3397} 3477}
3398 3478
3399############################################################################# 3479#############################################################################
3400# initialisation and cleanup 3480# initialisation and cleanup
3408 }; 3488 };
3409 } 3489 }
3410} 3490}
3411 3491
3412sub write_runtime_sync { 3492sub write_runtime_sync {
3413 my $runtime = "$LOCALDIR/runtime";
3414
3415 # first touch the runtime file to show we are still running: 3493 # first touch the runtime file to show we are still running:
3416 # the fsync below can take a very very long time. 3494 # the fsync below can take a very very long time.
3417 3495
3418 IO::AIO::aio_utime $runtime, undef, undef; 3496 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3419 3497
3420 my $guard = cf::lock_acquire "write_runtime"; 3498 my $guard = cf::lock_acquire "write_runtime";
3421 3499
3422 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3500 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3423 or return; 3501 or return;
3424 3502
3425 my $value = $cf::RUNTIME + 90 + 10; 3503 my $value = $cf::RUNTIME + 90 + 10;
3426 # 10 is the runtime save interval, for a monotonic clock 3504 # 10 is the runtime save interval, for a monotonic clock
3427 # 60 allows for the watchdog to kill the server. 3505 # 60 allows for the watchdog to kill the server.
3437 aio_utime $fh, undef, undef; 3515 aio_utime $fh, undef, undef;
3438 3516
3439 close $fh 3517 close $fh
3440 or return; 3518 or return;
3441 3519
3442 aio_rename "$runtime~", $runtime 3520 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3443 and return; 3521 and return;
3444 3522
3445 warn "runtime file written.\n"; 3523 warn "runtime file written.\n";
3446 3524
3447 1 3525 1
3459 my $uuid = "$LOCALDIR/uuid"; 3537 my $uuid = "$LOCALDIR/uuid";
3460 3538
3461 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3539 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462 or return; 3540 or return;
3463 3541
3464 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3542 my $value = uuid_seq uuid_cur;
3543
3544 unless ($value) {
3545 warn "cowardly refusing to write zero uuid value!\n";
3546 return;
3547 }
3548
3549 my $value = uuid_str $value + $uuid_skip;
3465 $uuid_skip = 0; 3550 $uuid_skip = 0;
3466 3551
3467 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3552 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3468 and return; 3553 and return;
3469 3554
3491} 3576}
3492 3577
3493sub emergency_save() { 3578sub emergency_save() {
3494 my $freeze_guard = cf::freeze_mainloop; 3579 my $freeze_guard = cf::freeze_mainloop;
3495 3580
3496 warn "enter emergency perl save\n"; 3581 warn "emergency_perl_save: enter\n";
3497 3582
3498 cf::sync_job { 3583 cf::sync_job {
3584 # this is a trade-off: we want to be very quick here, so
3585 # save all maps without fsync, and later call a global sync
3586 # (which in turn might be very very slow)
3587 local $USE_FSYNC = 0;
3588
3499 # use a peculiar iteration method to avoid tripping on perl 3589 # use a peculiar iteration method to avoid tripping on perl
3500 # refcount bugs in for. also avoids problems with players 3590 # refcount bugs in for. also avoids problems with players
3501 # and maps saved/destroyed asynchronously. 3591 # and maps saved/destroyed asynchronously.
3502 warn "begin emergency player save\n"; 3592 warn "emergency_perl_save: begin player save\n";
3503 for my $login (keys %cf::PLAYER) { 3593 for my $login (keys %cf::PLAYER) {
3504 my $pl = $cf::PLAYER{$login} or next; 3594 my $pl = $cf::PLAYER{$login} or next;
3505 $pl->valid or next; 3595 $pl->valid or next;
3506 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3596 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3507 $pl->save; 3597 $pl->save;
3508 } 3598 }
3509 warn "end emergency player save\n"; 3599 warn "emergency_perl_save: end player save\n";
3510 3600
3511 warn "begin emergency map save\n"; 3601 warn "emergency_perl_save: begin map save\n";
3512 for my $path (keys %cf::MAP) { 3602 for my $path (keys %cf::MAP) {
3513 my $map = $cf::MAP{$path} or next; 3603 my $map = $cf::MAP{$path} or next;
3514 $map->valid or next; 3604 $map->valid or next;
3515 $map->save; 3605 $map->save;
3516 } 3606 }
3517 warn "end emergency map save\n"; 3607 warn "emergency_perl_save: end map save\n";
3518 3608
3519 warn "begin emergency database checkpoint\n"; 3609 warn "emergency_perl_save: begin database checkpoint\n";
3520 BDB::db_env_txn_checkpoint $DB_ENV; 3610 BDB::db_env_txn_checkpoint $DB_ENV;
3521 warn "end emergency database checkpoint\n"; 3611 warn "emergency_perl_save: end database checkpoint\n";
3522 3612
3523 warn "begin write uuid\n"; 3613 warn "emergency_perl_save: begin write uuid\n";
3524 write_uuid_sync 1; 3614 write_uuid_sync 1;
3525 warn "end write uuid\n"; 3615 warn "emergency_perl_save: end write uuid\n";
3526 }; 3616 };
3527 3617
3618 warn "emergency_perl_save: starting sync()\n";
3619 IO::AIO::aio_sync sub {
3620 warn "emergency_perl_save: finished sync()\n";
3621 };
3622
3528 warn "leave emergency perl save\n"; 3623 warn "emergency_perl_save: leave\n";
3529} 3624}
3530 3625
3531sub post_cleanup { 3626sub post_cleanup {
3532 my ($make_core) = @_; 3627 my ($make_core) = @_;
3533 3628
3534 warn Carp::longmess "post_cleanup backtrace" 3629 warn Carp::longmess "post_cleanup backtrace"
3535 if $make_core; 3630 if $make_core;
3631
3632 my $fh = pidfile;
3633 unlink $PIDFILE if <$fh> == $$;
3634}
3635
3636# a safer delete_package, copied from Symbol
3637sub clear_package($) {
3638 my $pkg = shift;
3639
3640 # expand to full symbol table name if needed
3641 unless ($pkg =~ /^main::.*::$/) {
3642 $pkg = "main$pkg" if $pkg =~ /^::/;
3643 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3644 $pkg .= '::' unless $pkg =~ /::$/;
3645 }
3646
3647 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3648 my $stem_symtab = *{$stem}{HASH};
3649
3650 defined $stem_symtab and exists $stem_symtab->{$leaf}
3651 or return;
3652
3653 # clear all symbols
3654 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3655 for my $name (keys %$leaf_symtab) {
3656 _gv_clear *{"$pkg$name"};
3657# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3658 }
3659 warn "cleared package $pkg\n";#d#
3536} 3660}
3537 3661
3538sub do_reload_perl() { 3662sub do_reload_perl() {
3539 # can/must only be called in main 3663 # can/must only be called in main
3540 if ($Coro::current != $Coro::main) { 3664 if ($Coro::current != $Coro::main) {
3541 warn "can only reload from main coroutine"; 3665 warn "can only reload from main coroutine";
3542 return; 3666 return;
3543 } 3667 }
3544 3668
3669 return if $RELOAD++;
3670
3671 my $t1 = EV::time;
3672
3673 while ($RELOAD) {
3545 warn "reloading..."; 3674 warn "reloading...";
3546 3675
3547 warn "entering sync_job"; 3676 warn "entering sync_job";
3548 3677
3549 cf::sync_job { 3678 cf::sync_job {
3550 cf::write_runtime_sync; # external watchdog should not bark 3679 cf::write_runtime_sync; # external watchdog should not bark
3551 cf::emergency_save; 3680 cf::emergency_save;
3552 cf::write_runtime_sync; # external watchdog should not bark 3681 cf::write_runtime_sync; # external watchdog should not bark
3553 3682
3554 warn "syncing database to disk"; 3683 warn "syncing database to disk";
3555 BDB::db_env_txn_checkpoint $DB_ENV; 3684 BDB::db_env_txn_checkpoint $DB_ENV;
3556 3685
3557 # if anything goes wrong in here, we should simply crash as we already saved 3686 # if anything goes wrong in here, we should simply crash as we already saved
3558 3687
3559 warn "flushing outstanding aio requests"; 3688 warn "flushing outstanding aio requests";
3560 for (;;) {
3561 BDB::flush;
3562 IO::AIO::flush;
3563 Coro::cede_notself;
3564 last unless IO::AIO::nreqs || BDB::nreqs; 3689 while (IO::AIO::nreqs || BDB::nreqs) {
3565 warn "iterate..."; 3690 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3566 }
3567
3568 ++$RELOAD;
3569
3570 warn "cancelling all extension coros";
3571 $_->cancel for values %EXT_CORO;
3572 %EXT_CORO = ();
3573
3574 warn "removing commands";
3575 %COMMAND = ();
3576
3577 warn "removing ext/exti commands";
3578 %EXTCMD = ();
3579 %EXTICMD = ();
3580
3581 warn "unloading/nuking all extensions";
3582 for my $pkg (@EXTS) {
3583 warn "... unloading $pkg";
3584
3585 if (my $cb = $pkg->can ("unload")) {
3586 eval {
3587 $cb->($pkg);
3588 1
3589 } or warn "$pkg unloaded, but with errors: $@";
3590 } 3691 }
3591 3692
3592 warn "... nuking $pkg"; 3693 warn "cancelling all extension coros";
3593 Symbol::delete_package $pkg; 3694 $_->cancel for values %EXT_CORO;
3594 } 3695 %EXT_CORO = ();
3595 3696
3596 warn "unloading all perl modules loaded from $LIBDIR"; 3697 warn "removing commands";
3597 while (my ($k, $v) = each %INC) { 3698 %COMMAND = ();
3598 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3599 3699
3700 warn "removing ext/exti commands";
3701 %EXTCMD = ();
3702 %EXTICMD = ();
3703
3704 warn "unloading/nuking all extensions";
3705 for my $pkg (@EXTS) {
3600 warn "... unloading $k"; 3706 warn "... unloading $pkg";
3601 delete $INC{$k};
3602 3707
3603 $k =~ s/\.pm$//;
3604 $k =~ s/\//::/g;
3605
3606 if (my $cb = $k->can ("unload_module")) { 3708 if (my $cb = $pkg->can ("unload")) {
3709 eval {
3607 $cb->(); 3710 $cb->($pkg);
3711 1
3712 } or warn "$pkg unloaded, but with errors: $@";
3713 }
3714
3715 warn "... clearing $pkg";
3716 clear_package $pkg;
3608 } 3717 }
3609 3718
3610 Symbol::delete_package $k; 3719 warn "unloading all perl modules loaded from $LIBDIR";
3720 while (my ($k, $v) = each %INC) {
3721 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3722
3723 warn "... unloading $k";
3724 delete $INC{$k};
3725
3726 $k =~ s/\.pm$//;
3727 $k =~ s/\//::/g;
3728
3729 if (my $cb = $k->can ("unload_module")) {
3730 $cb->();
3731 }
3732
3733 clear_package $k;
3611 } 3734 }
3612 3735
3613 warn "getting rid of safe::, as good as possible"; 3736 warn "getting rid of safe::, as good as possible";
3614 Symbol::delete_package "safe::$_" 3737 clear_package "safe::$_"
3615 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3738 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3616 3739
3617 warn "unloading cf.pm \"a bit\""; 3740 warn "unloading cf.pm \"a bit\"";
3618 delete $INC{"cf.pm"}; 3741 delete $INC{"cf.pm"};
3619 delete $INC{"cf/pod.pm"}; 3742 delete $INC{"cf/pod.pm"};
3620 3743
3621 # don't, removes xs symbols, too, 3744 # don't, removes xs symbols, too,
3622 # and global variables created in xs 3745 # and global variables created in xs
3623 #Symbol::delete_package __PACKAGE__; 3746 #clear_package __PACKAGE__;
3624 3747
3625 warn "unload completed, starting to reload now"; 3748 warn "unload completed, starting to reload now";
3626 3749
3627 warn "reloading cf.pm"; 3750 warn "reloading cf.pm";
3628 require cf; 3751 require cf;
3629 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3752 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3630 3753
3631 warn "loading config and database again"; 3754 warn "loading config and database again";
3632 cf::reload_config; 3755 cf::reload_config;
3633 3756
3634 warn "loading extensions"; 3757 warn "loading extensions";
3635 cf::load_extensions; 3758 cf::load_extensions;
3636 3759
3760 if ($REATTACH_ON_RELOAD) {
3637 warn "reattaching attachments to objects/players"; 3761 warn "reattaching attachments to objects/players";
3638 _global_reattach; # objects, sockets 3762 _global_reattach; # objects, sockets
3639 warn "reattaching attachments to maps"; 3763 warn "reattaching attachments to maps";
3640 reattach $_ for values %MAP; 3764 reattach $_ for values %MAP;
3641 warn "reattaching attachments to players"; 3765 warn "reattaching attachments to players";
3642 reattach $_ for values %PLAYER; 3766 reattach $_ for values %PLAYER;
3767 }
3643 3768
3769 warn "running post_init jobs";
3770 (pop @POST_INIT)->(1) while @POST_INIT;
3771
3644 warn "leaving sync_job"; 3772 warn "leaving sync_job";
3645 3773
3646 1 3774 1
3647 } or do { 3775 } or do {
3648 warn $@; 3776 warn $@;
3649 cf::cleanup "error while reloading, exiting."; 3777 cf::cleanup "error while reloading, exiting.";
3650 }; 3778 };
3651 3779
3652 warn "reloaded"; 3780 warn "reloaded";
3781 --$RELOAD;
3782 }
3783
3784 $t1 = EV::time - $t1;
3785 warn "reload completed in ${t1}s\n";
3653}; 3786};
3654 3787
3655our $RELOAD_WATCHER; # used only during reload 3788our $RELOAD_WATCHER; # used only during reload
3656 3789
3657sub reload_perl() { 3790sub reload_perl() {
3658 # doing reload synchronously and two reloads happen back-to-back, 3791 # doing reload synchronously and two reloads happen back-to-back,
3659 # coro crashes during coro_state_free->destroy here. 3792 # coro crashes during coro_state_free->destroy here.
3660 3793
3794 $RELOAD_WATCHER ||= cf::async {
3795 Coro::AIO::aio_wait cache_extensions;
3796
3661 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3797 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3662 do_reload_perl; 3798 do_reload_perl;
3663 undef $RELOAD_WATCHER; 3799 undef $RELOAD_WATCHER;
3800 };
3664 }; 3801 };
3665} 3802}
3666 3803
3667register_command "reload" => sub { 3804register_command "reload" => sub {
3668 my ($who, $arg) = @_; 3805 my ($who, $arg) = @_;
3682 3819
3683our @WAIT_FOR_TICK; 3820our @WAIT_FOR_TICK;
3684our @WAIT_FOR_TICK_BEGIN; 3821our @WAIT_FOR_TICK_BEGIN;
3685 3822
3686sub wait_for_tick { 3823sub wait_for_tick {
3687 return if tick_inhibit;
3688 return if $Coro::current == $Coro::main; 3824 return if tick_inhibit || $Coro::current == $Coro::main;
3689 3825
3690 my $signal = new Coro::Signal; 3826 my $signal = new Coro::Signal;
3691 push @WAIT_FOR_TICK, $signal; 3827 push @WAIT_FOR_TICK, $signal;
3692 $signal->wait; 3828 $signal->wait;
3693} 3829}
3694 3830
3695sub wait_for_tick_begin { 3831sub wait_for_tick_begin {
3696 return if tick_inhibit;
3697 return if $Coro::current == $Coro::main; 3832 return if tick_inhibit || $Coro::current == $Coro::main;
3698 3833
3699 my $signal = new Coro::Signal; 3834 my $signal = new Coro::Signal;
3700 push @WAIT_FOR_TICK_BEGIN, $signal; 3835 push @WAIT_FOR_TICK_BEGIN, $signal;
3701 $signal->wait; 3836 $signal->wait;
3702} 3837}
3741{ 3876{
3742 # configure BDB 3877 # configure BDB
3743 3878
3744 BDB::min_parallel 8; 3879 BDB::min_parallel 8;
3745 BDB::max_poll_reqs $TICK * 0.1; 3880 BDB::max_poll_reqs $TICK * 0.1;
3746 $Coro::BDB::WATCHER->priority (1); 3881 $AnyEvent::BDB::WATCHER->priority (1);
3747 3882
3748 unless ($DB_ENV) { 3883 unless ($DB_ENV) {
3749 $DB_ENV = BDB::db_env_create; 3884 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3885 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3751 | BDB::LOG_AUTOREMOVE, 1); 3886 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3887 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3888 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3889 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3754 3890
3755 cf::sync_job { 3891 cf::sync_job {
3756 eval { 3892 eval {
3782{ 3918{
3783 # configure IO::AIO 3919 # configure IO::AIO
3784 3920
3785 IO::AIO::min_parallel 8; 3921 IO::AIO::min_parallel 8;
3786 IO::AIO::max_poll_time $TICK * 0.1; 3922 IO::AIO::max_poll_time $TICK * 0.1;
3787 $Coro::AIO::WATCHER->priority (1); 3923 undef $AnyEvent::AIO::WATCHER;
3788} 3924}
3789 3925
3790my $_log_backtrace; 3926my $_log_backtrace;
3791 3927
3792sub _log_backtrace { 3928sub _log_backtrace {
3795 $msg =~ s/\n//; 3931 $msg =~ s/\n//;
3796 3932
3797 # limit the # of concurrent backtraces 3933 # limit the # of concurrent backtraces
3798 if ($_log_backtrace < 2) { 3934 if ($_log_backtrace < 2) {
3799 ++$_log_backtrace; 3935 ++$_log_backtrace;
3936 my $perl_bt = Carp::longmess $msg;
3800 async { 3937 async {
3801 $Coro::current->{desc} = "abt $msg"; 3938 $Coro::current->{desc} = "abt $msg";
3802 3939
3803 my @bt = fork_call { 3940 my @bt = fork_call {
3804 @addr = map { sprintf "%x", $_ } @addr; 3941 @addr = map { sprintf "%x", $_ } @addr;
3815 } 3952 }
3816 3953
3817 @funcs 3954 @funcs
3818 }; 3955 };
3819 3956
3820 LOG llevInfo, "[ABT] $msg\n"; 3957 LOG llevInfo, "[ABT] $perl_bt\n";
3958 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3821 LOG llevInfo, "[ABT] $_\n" for @bt; 3959 LOG llevInfo, "[ABT] $_\n" for @bt;
3822 --$_log_backtrace; 3960 --$_log_backtrace;
3823 }; 3961 };
3824 } else { 3962 } else {
3825 LOG llevInfo, "[ABT] $msg\n"; 3963 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines