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.429 by root, Sat May 3 15:17:13 2008 UTC vs.
Revision 1.456 by root, Tue Sep 30 04:00:35 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
36use Coro 4.50 (); 37use Coro ();
37use Coro::State; 38use Coro::State;
38use Coro::Handle; 39use Coro::Handle;
39use Coro::EV; 40use Coro::EV;
41use Coro::AnyEvent;
40use Coro::Timer; 42use Coro::Timer;
41use Coro::Signal; 43use Coro::Signal;
42use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
43use Coro::AIO; 46use Coro::AIO;
44use Coro::BDB; 47use Coro::BDB 1.6;
45use Coro::Storable; 48use Coro::Storable;
46use Coro::Util (); 49use Coro::Util ();
47 50
48use JSON::XS 2.01 (); 51use JSON::XS 2.01 ();
49use BDB (); 52use BDB ();
50use Data::Dumper; 53use Data::Dumper;
51use Digest::MD5; 54use Digest::MD5;
52use Fcntl; 55use Fcntl;
53use YAML (); 56use YAML ();
54use IO::AIO 2.51 (); 57use IO::AIO ();
55use Time::HiRes; 58use Time::HiRes;
56use Compress::LZF; 59use Compress::LZF;
57use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
58 63
59# configure various modules to our taste 64# configure various modules to our taste
60# 65#
61$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::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 74
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 76
69our %COMMAND = (); 77our %COMMAND = ();
70our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
… …
73our %EXTCMD = (); 81our %EXTCMD = ();
74our %EXTICMD = (); 82our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
77 85
78our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 87our @EVENT;
80 88
81our $CONFDIR = confdir; 89our $CONFDIR = confdir;
82our $DATADIR = datadir; 90our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
92our %RESOURCE; 103our %RESOURCE;
93 104
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 107our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
99 109
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 110our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 111our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 112our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 113our $DB_ENV;
105 114
… …
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 130our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
123 132
133our @POST_INIT;
134
124binmode STDOUT; 135binmode STDOUT;
125binmode STDERR; 136binmode STDERR;
126 137
127# read virtual server time, if available 138# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
132} 143}
133 144
134mkdir $_ 145mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
242for my $pkg (qw( 253for my $pkg (qw(
243 cf::global cf::attachable 254 cf::global cf::attachable
244 cf::object cf::object::player 255 cf::object cf::object::player
245 cf::client cf::player 256 cf::client cf::player
246 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
247 cf::map cf::party cf::region 259 cf::party cf::region
248)) { 260)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 262}
252 263
253$EV::DIED = sub { 264$EV::DIED = sub {
254 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
… …
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 308
298sub encode_json($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
300 311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
325
301=item cf::lock_wait $string 326=item cf::lock_wait $string
302 327
303Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
304 329
305=item my $lock = cf::lock_acquire $string 330=item my $lock = cf::lock_acquire $string
… …
332 return;#d# 357 return;#d#
333 }#d# 358 }#d#
334 359
335 # wait for lock, if any 360 # wait for lock, if any
336 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
337 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule; 364 Coro::schedule;
339 } 365 }
340} 366}
341 367
… …
724 750
725############################################################################# 751#############################################################################
726 752
727=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
728 754
729Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
732 758
733In the following description, CLASS can be any of C<global>, C<object> 759In 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 760C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
784=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
785 811
786Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
788 814
789Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
791 817
792These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
793 819
794=over 4 820=over 4
… …
1085 1111
1086sub reattach { 1112sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1114 my ($obj) = @_;
1089 1115
1116 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1117 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1118
1092 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
1093 1120
1094 @$registry = (); 1121 @$registry = ();
1095 1122
… …
1160 } else { 1187 } else {
1161 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1162 } 1189 }
1163 1190
1164 aio_rename "$filename~", $filename; 1191 aio_rename "$filename~", $filename;
1192
1193 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename;
1165 } else { 1195 } else {
1166 warn "FATAL: $filename~: $!\n"; 1196 warn "FATAL: $filename~: $!\n";
1167 } 1197 }
1168 } else { 1198 } else {
1169 aio_unlink $filename; 1199 aio_unlink $filename;
… …
1331 1361
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1364
1335 $ext{source} = 1365 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1367 . "#line 1 \"$path\"\n{\n"
1338 . $source 1368 . $source
1339 . "\n};\n1"; 1369 . "\n};\n1";
1340 1370
1341 $todo{$base} = \%ext; 1371 $todo{$base} = \%ext;
… …
1381 1411
1382=back 1412=back
1383 1413
1384=head2 CORE EXTENSIONS 1414=head2 CORE EXTENSIONS
1385 1415
1386Functions and methods that extend core crossfire objects. 1416Functions and methods that extend core deliantra objects.
1387 1417
1388=cut 1418=cut
1389 1419
1390package cf::player; 1420package cf::player;
1391 1421
… …
1434 1464
1435sub exists($) { 1465sub exists($) {
1436 my ($login) = @_; 1466 my ($login) = @_;
1437 1467
1438 $cf::PLAYER{$login} 1468 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1469 or !aio_stat path $login
1440} 1470}
1441 1471
1442sub find($) { 1472sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1473 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1474 my $login = $_[0];
… …
1519 my ($pl) = @_; 1549 my ($pl) = @_;
1520 1550
1521 my $name = $pl->ob->name; 1551 my $name = $pl->ob->name;
1522 1552
1523 $pl->{deny_save} = 1; 1553 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1554 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1525 1555
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1557 $pl->deactivate;
1558 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1559 $pl->ob->check_score;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1560 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1561 $pl->ns->destroy if $pl->ns;
1530 1562
1531 my $path = playerdir $pl; 1563 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1564 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1613 } 1645 }
1614 1646
1615 \@paths 1647 \@paths
1616} 1648}
1617 1649
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1650=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1651
1620Expand crossfire pod fragments into protocol xml. 1652Expand deliantra pod fragments into protocol xml.
1621
1622=cut
1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1635sub expand_cfpod {
1636 my ($self, $pod) = @_;
1637
1638 my $xml;
1639
1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group;
1648 } elsif ($pod =~ m%\G
1649 ([BCGHITU])
1650 <
1651 (?:
1652 ([^<>]*) (?{ $group = $^N })
1653 | < $interior >
1654 )
1655 >
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "")
1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1689
1690 for ($xml) {
1691 # create single paragraphs (very hackish)
1692 s/(?<=\S)\n(?=\w)/ /g;
1693
1694 # compress some whitespace
1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 }
1700
1701 $xml
1702}
1703
1704no re 'eval';
1705
1706sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode}
1709}
1710 1653
1711=item $player->ext_reply ($msgid, @msg) 1654=item $player->ext_reply ($msgid, @msg)
1712 1655
1713Sends an ext reply to the player. 1656Sends an ext reply to the player.
1714 1657
… …
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2027 $f->skip_block;
2085 $self->_load_objects ($f) 2028 $self->_load_objects ($f)
2086 or return; 2029 or return;
2087 2030
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->post_load_original
2089 if delete $self->{load_original}; 2032 if delete $self->{load_original};
2090 2033
2091 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2035 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2036 unless (aio_stat $uniq) {
… …
2528 2471
2529=item $player_object->enter_link 2472=item $player_object->enter_link
2530 2473
2531Freezes the player and moves him/her to a special map (C<{link}>). 2474Freezes the player and moves him/her to a special map (C<{link}>).
2532 2475
2533The player should be reasonably safe there for short amounts of time. You 2476The player should be reasonably safe there for short amounts of time (e.g.
2534I<MUST> call C<leave_link> as soon as possible, though. 2477for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2478though, as the palyer cannot control the character while it is on the link
2479map.
2535 2480
2536Will never block. 2481Will never block.
2537 2482
2538=item $player_object->leave_link ($map, $x, $y) 2483=item $player_object->leave_link ($map, $x, $y)
2539 2484
… …
2597 2542
2598 $map->load; 2543 $map->load;
2599 $map->load_neighbours; 2544 $map->load_neighbours;
2600 2545
2601 return unless $self->contr->active; 2546 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2602 $self->activate_recursive; 2548 $self->activate_recursive;
2603 2549
2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2605 $self->enter_map ($map, $x, $y); 2551 $self->enter_map ($map, $x, $y);
2606} 2552}
… …
2610Moves the player to the given map-path and coordinates by first freezing 2556Moves the player to the given map-path and coordinates by first freezing
2611her, loading and preparing them map, calling the provided $check callback 2557her, loading and preparing them map, calling the provided $check callback
2612that has to return the map if sucecssful, and then unfreezes the player on 2558that has to return the map if sucecssful, and then unfreezes the player on
2613the new (success) or old (failed) map position. In either case, $done will 2559the new (success) or old (failed) map position. In either case, $done will
2614be called at the end of this process. 2560be called at the end of this process.
2561
2562Note that $check will be called with a potentially non-loaded map, so if
2563it needs a loaded map it has to call C<< ->load >>.
2615 2564
2616=cut 2565=cut
2617 2566
2618our $GOTOGEN; 2567our $GOTOGEN;
2619 2568
… …
2698} 2647}
2699 2648
2700sub prepare_random_map { 2649sub prepare_random_map {
2701 my ($exit) = @_; 2650 my ($exit) = @_;
2702 2651
2703 my $guard = cf::lock_acquire "exit_prepare:$exit";
2704
2705 # all this does is basically replace the /! path by 2652 # all this does is basically replace the /! path by
2706 # a new random map path (?random/...) with a seed 2653 # a new random map path (?random/...) with a seed
2707 # that depends on the exit object 2654 # that depends on the exit object
2708 2655
2709 my $rmp = parse_random_map_params $exit->msg; 2656 my $rmp = parse_random_map_params $exit->msg;
… …
2711 if ($exit->map) { 2658 if ($exit->map) {
2712 $rmp->{region} = $exit->region->name; 2659 $rmp->{region} = $exit->region->name;
2713 $rmp->{origin_map} = $exit->map->path; 2660 $rmp->{origin_map} = $exit->map->path;
2714 $rmp->{origin_x} = $exit->x; 2661 $rmp->{origin_x} = $exit->x;
2715 $rmp->{origin_y} = $exit->y; 2662 $rmp->{origin_y} = $exit->y;
2663
2664 $exit->map->touch;
2716 } 2665 }
2717 2666
2718 $rmp->{random_seed} ||= $exit->random_seed; 2667 $rmp->{random_seed} ||= $exit->random_seed;
2719 2668
2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2669 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2673 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2725 aio_write $fh, 0, (length $data), $data, 0; 2674 aio_write $fh, 0, (length $data), $data, 0;
2726 undef $fh; 2675 undef $fh;
2727 aio_rename "$meta~", $meta; 2676 aio_rename "$meta~", $meta;
2728 2677
2678 my $slaying = "?random/$md5";
2679
2680 if ($exit->valid) {
2729 $exit->slaying ("?random/$md5"); 2681 $exit->slaying ("?random/$md5");
2730 $exit->msg (undef); 2682 $exit->msg (undef);
2683 }
2731 } 2684 }
2732} 2685}
2733 2686
2734sub cf::object::player::enter_exit { 2687sub cf::object::player::enter_exit {
2735 my ($self, $exit) = @_; 2688 my ($self, $exit) = @_;
2736 2689
2737 return unless $self->type == cf::PLAYER; 2690 return unless $self->type == cf::PLAYER;
2738 2691
2739 if ($exit->slaying eq "/!") {
2740 #TODO: this should de-fi-ni-te-ly not be a sync-job
2741 # the problem is that $exit might not survive long enough
2742 # so it needs to be done right now, right here
2743 cf::sync_job { prepare_random_map $exit };
2744 }
2745
2746 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2747 my $hp = $exit->stats->hp;
2748 my $sp = $exit->stats->sp;
2749
2750 $self->enter_link; 2692 $self->enter_link;
2751 2693
2752 # if exit is damned, update players death & WoR home-position
2753 $self->contr->savebed ($slaying, $hp, $sp)
2754 if $exit->flag (FLAG_DAMNED);
2755
2756 (async { 2694 (async {
2757 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2695 $Coro::current->{desc} = "enter_exit";
2758 2696
2759 $self->deactivate_recursive; # just to be sure
2760 unless (eval { 2697 unless (eval {
2698 $self->deactivate_recursive; # just to be sure
2699
2700 # random map handling
2701 {
2702 my $guard = cf::lock_acquire "exit_prepare:$exit";
2703
2704 prepare_random_map $exit
2705 if $exit->slaying eq "/!";
2706 }
2707
2708 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2709 my $x = $exit->stats->hp;
2710 my $y = $exit->stats->sp;
2711
2761 $self->goto ($slaying, $hp, $sp); 2712 $self->goto ($map, $x, $y);
2762 2713
2714 # if exit is damned, update players death & WoR home-position
2715 $self->contr->savebed ($map, $x, $y)
2716 if $exit->flag (cf::FLAG_DAMNED);
2717
2763 1; 2718 1
2764 }) { 2719 }) {
2765 $self->message ("Something went wrong deep within the crossfire server. " 2720 $self->message ("Something went wrong deep within the deliantra server. "
2766 . "I'll try to bring you back to the map you were before. " 2721 . "I'll try to bring you back to the map you were before. "
2767 . "Please report this to the dungeon master!", 2722 . "Please report this to the dungeon master!",
2768 cf::NDI_UNIQUE | cf::NDI_RED); 2723 cf::NDI_UNIQUE | cf::NDI_RED);
2769 2724
2770 warn "ERROR in enter_exit: $@"; 2725 warn "ERROR in enter_exit: $@";
… …
2836 id => "infobox", 2791 id => "infobox",
2837 title => "Body Parts", 2792 title => "Body Parts",
2838 reply => undef, 2793 reply => undef,
2839 tooltip => "Shows which body parts you posess and are available", 2794 tooltip => "Shows which body parts you posess and are available",
2840 }, 2795 },
2796 "c/skills" => {
2797 id => "infobox",
2798 title => "Skills",
2799 reply => undef,
2800 tooltip => "Shows your experience per skill and item power",
2801 },
2841 "c/uptime" => { 2802 "c/uptime" => {
2842 id => "infobox", 2803 id => "infobox",
2843 title => "Uptime", 2804 title => "Uptime",
2844 reply => undef, 2805 reply => undef,
2845 tooltip => "How long the server has been running since last restart", 2806 tooltip => "How long the server has been running since last restart",
… …
2859); 2820);
2860 2821
2861sub cf::client::send_msg { 2822sub cf::client::send_msg {
2862 my ($self, $channel, $msg, $color, @extra) = @_; 2823 my ($self, $channel, $msg, $color, @extra) = @_;
2863 2824
2864 $msg = $self->pl->expand_cfpod ($msg); 2825 $msg = $self->pl->expand_cfpod ($msg)
2826 unless $color & cf::NDI_VERBATIM;
2865 2827
2866 $color &= cf::NDI_CLIENT_MASK; # just in case... 2828 $color &= cf::NDI_CLIENT_MASK; # just in case...
2867 2829
2868 # check predefined channels, for the benefit of C 2830 # check predefined channels, for the benefit of C
2869 if ($CHANNEL{$channel}) { 2831 if ($CHANNEL{$channel}) {
… …
2890 if ($self->can_msg) { 2852 if ($self->can_msg) {
2891 # default colour, mask it out 2853 # default colour, mask it out
2892 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2893 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2894 2856
2895 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2857 my $pkt = "msg "
2858 . $self->{json_coder}->encode (
2896 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 );
2861
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt);
2897 } else { 2873 } else {
2898 if ($color >= 0) { 2874 if ($color >= 0) {
2899 # replace some tags by gcfclient-compatible ones 2875 # replace some tags by gcfclient-compatible ones
2900 for ($msg) { 2876 for ($msg) {
2901 1 while 2877 1 while
… …
3115 3091
3116=cut 3092=cut
3117 3093
3118for ( 3094for (
3119 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3120 insert remove inv name archname title slaying race 3096 insert remove inv nrof name archname title slaying race
3121 decrease split destroy)], 3097 decrease split destroy change_exp)],
3122 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
3123 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful)],
3124 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
3125) { 3101) {
3126 no strict 'refs'; 3102 no strict 'refs';
… …
3384 reload_treasures; 3360 reload_treasures;
3385 3361
3386 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
3387} 3363}
3388 3364
3389sub init {
3390 my $guard = freeze_mainloop;
3391
3392 reload_resources;
3393}
3394
3395sub reload_config { 3365sub reload_config {
3396 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
3397 or return; 3367 or return;
3398 3368
3399 local $/; 3369 local $/;
… …
3411 }; 3381 };
3412 warn $@ if $@; 3382 warn $@ if $@;
3413 } 3383 }
3414} 3384}
3415 3385
3386sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!";
3389 flock $fh, &Fcntl::LOCK_EX
3390 or die "$PIDFILE: flock: $!";
3391 $fh
3392}
3393
3394# make sure only one server instance is running at any one time
3395sub atomic {
3396 my $fh = pidfile;
3397
3398 my $pid = <$fh>;
3399 kill 9, $pid if $pid > 0;
3400
3401 seek $fh, 0, 0;
3402 print $fh $$;
3403}
3404
3416sub main { 3405sub main {
3406 cf::init_globals; # initialise logging
3407
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 cf::init_block;
3418
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420
3417 # we must not ever block the main coroutine 3421 # we must not ever block the main coroutine
3418 local $Coro::idle = sub { 3422 local $Coro::idle = sub {
3419 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3423 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3420 (async { 3424 (async {
3421 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3425 $Coro::current->{desc} = "IDLE BUG HANDLER";
3422 EV::loop EV::LOOP_ONESHOT; 3426 EV::loop EV::LOOP_ONESHOT;
3423 })->prio (Coro::PRIO_MAX); 3427 })->prio (Coro::PRIO_MAX);
3424 }; 3428 };
3425 3429
3426 { 3430 evthread_start IO::AIO::poll_fileno;
3427 my $guard = freeze_mainloop; 3431
3432 cf::sync_job {
3433 reload_resources;
3428 reload_config; 3434 reload_config;
3429 db_init; 3435 db_init;
3436
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid;
3440 cf::init_signals;
3441 cf::init_commands;
3442 cf::init_skills;
3443
3444 cf::init_beforeplay;
3445
3446 atomic;
3447
3430 load_extensions; 3448 load_extensions;
3431 3449
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3450 utime time, time, $RUNTIMEFILE;
3433 evthread_start IO::AIO::poll_fileno; 3451
3452 # no (long-running) fork's whatsoever before this point(!)
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454
3455 (pop @POST_INIT)->(0) while @POST_INIT;
3434 } 3456 };
3435 3457
3436 EV::loop; 3458 EV::loop;
3437} 3459}
3438 3460
3439############################################################################# 3461#############################################################################
… …
3448 }; 3470 };
3449 } 3471 }
3450} 3472}
3451 3473
3452sub write_runtime_sync { 3474sub write_runtime_sync {
3453 my $runtime = "$LOCALDIR/runtime";
3454
3455 # first touch the runtime file to show we are still running: 3475 # first touch the runtime file to show we are still running:
3456 # the fsync below can take a very very long time. 3476 # the fsync below can take a very very long time.
3457 3477
3458 IO::AIO::aio_utime $runtime, undef, undef; 3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3459 3479
3460 my $guard = cf::lock_acquire "write_runtime"; 3480 my $guard = cf::lock_acquire "write_runtime";
3461 3481
3462 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3463 or return; 3483 or return;
3464 3484
3465 my $value = $cf::RUNTIME + 90 + 10; 3485 my $value = $cf::RUNTIME + 90 + 10;
3466 # 10 is the runtime save interval, for a monotonic clock 3486 # 10 is the runtime save interval, for a monotonic clock
3467 # 60 allows for the watchdog to kill the server. 3487 # 60 allows for the watchdog to kill the server.
… …
3477 aio_utime $fh, undef, undef; 3497 aio_utime $fh, undef, undef;
3478 3498
3479 close $fh 3499 close $fh
3480 or return; 3500 or return;
3481 3501
3482 aio_rename "$runtime~", $runtime 3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3483 and return; 3503 and return;
3484 3504
3485 warn "runtime file written.\n"; 3505 warn "runtime file written.\n";
3486 3506
3487 1 3507 1
… …
3499 my $uuid = "$LOCALDIR/uuid"; 3519 my $uuid = "$LOCALDIR/uuid";
3500 3520
3501 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3521 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3502 or return; 3522 or return;
3503 3523
3504 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3524 my $value = uuid_seq uuid_cur;
3525
3526 unless ($value) {
3527 warn "cowardly refusing to write zero uuid value!\n";
3528 return;
3529 }
3530
3531 my $value = uuid_str $value + $uuid_skip;
3505 $uuid_skip = 0; 3532 $uuid_skip = 0;
3506 3533
3507 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3534 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3508 and return; 3535 and return;
3509 3536
… …
3571sub post_cleanup { 3598sub post_cleanup {
3572 my ($make_core) = @_; 3599 my ($make_core) = @_;
3573 3600
3574 warn Carp::longmess "post_cleanup backtrace" 3601 warn Carp::longmess "post_cleanup backtrace"
3575 if $make_core; 3602 if $make_core;
3603
3604 my $fh = pidfile;
3605 unlink $PIDFILE if <$fh> == $$;
3606}
3607
3608# a safer delete_package, copied from Symbol
3609sub clear_package($) {
3610 my $pkg = shift;
3611
3612 # expand to full symbol table name if needed
3613 unless ($pkg =~ /^main::.*::$/) {
3614 $pkg = "main$pkg" if $pkg =~ /^::/;
3615 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3616 $pkg .= '::' unless $pkg =~ /::$/;
3617 }
3618
3619 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3620 my $stem_symtab = *{$stem}{HASH};
3621
3622 defined $stem_symtab and exists $stem_symtab->{$leaf}
3623 or return;
3624
3625 # clear all symbols
3626 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3627 for my $name (keys %$leaf_symtab) {
3628 _gv_clear *{"$pkg$name"};
3629# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3630 }
3631 warn "cleared package $pkg\n";#d#
3576} 3632}
3577 3633
3578sub do_reload_perl() { 3634sub do_reload_perl() {
3579 # can/must only be called in main 3635 # can/must only be called in main
3580 if ($Coro::current != $Coro::main) { 3636 if ($Coro::current != $Coro::main) {
3581 warn "can only reload from main coroutine"; 3637 warn "can only reload from main coroutine";
3582 return; 3638 return;
3583 } 3639 }
3584 3640
3641 return if $RELOAD++;
3642
3643 while ($RELOAD) {
3585 warn "reloading..."; 3644 warn "reloading...";
3586 3645
3587 warn "entering sync_job"; 3646 warn "entering sync_job";
3588 3647
3589 cf::sync_job { 3648 cf::sync_job {
3590 cf::write_runtime_sync; # external watchdog should not bark 3649 cf::write_runtime_sync; # external watchdog should not bark
3591 cf::emergency_save; 3650 cf::emergency_save;
3592 cf::write_runtime_sync; # external watchdog should not bark 3651 cf::write_runtime_sync; # external watchdog should not bark
3593 3652
3594 warn "syncing database to disk"; 3653 warn "syncing database to disk";
3595 BDB::db_env_txn_checkpoint $DB_ENV; 3654 BDB::db_env_txn_checkpoint $DB_ENV;
3596 3655
3597 # if anything goes wrong in here, we should simply crash as we already saved 3656 # if anything goes wrong in here, we should simply crash as we already saved
3598 3657
3599 warn "flushing outstanding aio requests"; 3658 warn "flushing outstanding aio requests";
3600 for (;;) {
3601 BDB::flush;
3602 IO::AIO::flush;
3603 Coro::cede_notself;
3604 last unless IO::AIO::nreqs || BDB::nreqs; 3659 while (IO::AIO::nreqs || BDB::nreqs) {
3605 warn "iterate..."; 3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3606 }
3607
3608 ++$RELOAD;
3609
3610 warn "cancelling all extension coros";
3611 $_->cancel for values %EXT_CORO;
3612 %EXT_CORO = ();
3613
3614 warn "removing commands";
3615 %COMMAND = ();
3616
3617 warn "removing ext/exti commands";
3618 %EXTCMD = ();
3619 %EXTICMD = ();
3620
3621 warn "unloading/nuking all extensions";
3622 for my $pkg (@EXTS) {
3623 warn "... unloading $pkg";
3624
3625 if (my $cb = $pkg->can ("unload")) {
3626 eval {
3627 $cb->($pkg);
3628 1
3629 } or warn "$pkg unloaded, but with errors: $@";
3630 } 3661 }
3631 3662
3632 warn "... nuking $pkg"; 3663 warn "cancelling all extension coros";
3633 Symbol::delete_package $pkg; 3664 $_->cancel for values %EXT_CORO;
3634 } 3665 %EXT_CORO = ();
3635 3666
3636 warn "unloading all perl modules loaded from $LIBDIR"; 3667 warn "removing commands";
3637 while (my ($k, $v) = each %INC) { 3668 %COMMAND = ();
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639 3669
3670 warn "removing ext/exti commands";
3671 %EXTCMD = ();
3672 %EXTICMD = ();
3673
3674 warn "unloading/nuking all extensions";
3675 for my $pkg (@EXTS) {
3640 warn "... unloading $k"; 3676 warn "... unloading $pkg";
3641 delete $INC{$k};
3642 3677
3643 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g;
3645
3646 if (my $cb = $k->can ("unload_module")) { 3678 if (my $cb = $pkg->can ("unload")) {
3679 eval {
3647 $cb->(); 3680 $cb->($pkg);
3681 1
3682 } or warn "$pkg unloaded, but with errors: $@";
3683 }
3684
3685 warn "... clearing $pkg";
3686 clear_package $pkg;
3648 } 3687 }
3649 3688
3650 Symbol::delete_package $k; 3689 warn "unloading all perl modules loaded from $LIBDIR";
3690 while (my ($k, $v) = each %INC) {
3691 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3692
3693 warn "... unloading $k";
3694 delete $INC{$k};
3695
3696 $k =~ s/\.pm$//;
3697 $k =~ s/\//::/g;
3698
3699 if (my $cb = $k->can ("unload_module")) {
3700 $cb->();
3701 }
3702
3703 clear_package $k;
3651 } 3704 }
3652 3705
3653 warn "getting rid of safe::, as good as possible"; 3706 warn "getting rid of safe::, as good as possible";
3654 Symbol::delete_package "safe::$_" 3707 clear_package "safe::$_"
3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656 3709
3657 warn "unloading cf.pm \"a bit\""; 3710 warn "unloading cf.pm \"a bit\"";
3658 delete $INC{"cf.pm"}; 3711 delete $INC{"cf.pm"};
3659 delete $INC{"cf/pod.pm"}; 3712 delete $INC{"cf/pod.pm"};
3660 3713
3661 # don't, removes xs symbols, too, 3714 # don't, removes xs symbols, too,
3662 # and global variables created in xs 3715 # and global variables created in xs
3663 #Symbol::delete_package __PACKAGE__; 3716 #clear_package __PACKAGE__;
3664 3717
3665 warn "unload completed, starting to reload now"; 3718 warn "unload completed, starting to reload now";
3666 3719
3667 warn "reloading cf.pm"; 3720 warn "reloading cf.pm";
3668 require cf; 3721 require cf;
3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3670 3723
3671 warn "loading config and database again"; 3724 warn "loading config and database again";
3672 cf::reload_config; 3725 cf::reload_config;
3673 3726
3674 warn "loading extensions"; 3727 warn "loading extensions";
3675 cf::load_extensions; 3728 cf::load_extensions;
3676 3729
3677 warn "reattaching attachments to objects/players"; 3730 warn "reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 3731 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 3732 warn "reattaching attachments to maps";
3680 reattach $_ for values %MAP; 3733 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 3734 warn "reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 3735 reattach $_ for values %PLAYER;
3683 3736
3737 warn "running post_load";
3738 (pop @POST_INIT)->(1) while @POST_INIT;
3739
3684 warn "leaving sync_job"; 3740 warn "leaving sync_job";
3685 3741
3686 1 3742 1
3687 } or do { 3743 } or do {
3688 warn $@; 3744 warn $@;
3689 cf::cleanup "error while reloading, exiting."; 3745 cf::cleanup "error while reloading, exiting.";
3690 }; 3746 };
3691 3747
3692 warn "reloaded"; 3748 warn "reloaded";
3749 --$RELOAD;
3750 }
3693}; 3751};
3694 3752
3695our $RELOAD_WATCHER; # used only during reload 3753our $RELOAD_WATCHER; # used only during reload
3696 3754
3697sub reload_perl() { 3755sub reload_perl() {
3698 # doing reload synchronously and two reloads happen back-to-back, 3756 # doing reload synchronously and two reloads happen back-to-back,
3699 # coro crashes during coro_state_free->destroy here. 3757 # coro crashes during coro_state_free->destroy here.
3700 3758
3701 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3702 do_reload_perl; 3760 do_reload_perl;
3703 undef $RELOAD_WATCHER; 3761 undef $RELOAD_WATCHER;
3704 }; 3762 };
3705} 3763}
3706 3764
… …
3779{ 3837{
3780 # configure BDB 3838 # configure BDB
3781 3839
3782 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3783 BDB::max_poll_reqs $TICK * 0.1; 3841 BDB::max_poll_reqs $TICK * 0.1;
3784 $Coro::BDB::WATCHER->priority (1); 3842 $AnyEvent::BDB::WATCHER->priority (1);
3785 3843
3786 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3787 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3788 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3789 | BDB::LOG_AUTOREMOVE, 1); 3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3848 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3790 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3791 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3792 3851
3793 cf::sync_job { 3852 cf::sync_job {
3794 eval { 3853 eval {
… …
3820{ 3879{
3821 # configure IO::AIO 3880 # configure IO::AIO
3822 3881
3823 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3824 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3825 $Coro::AIO::WATCHER->priority (1); 3884 undef $AnyEvent::AIO::WATCHER;
3826} 3885}
3827 3886
3828my $_log_backtrace; 3887my $_log_backtrace;
3829 3888
3830sub _log_backtrace { 3889sub _log_backtrace {
… …
3833 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3834 3893
3835 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3836 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3837 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3838 async { 3898 async {
3839 $Coro::current->{desc} = "abt $msg"; 3899 $Coro::current->{desc} = "abt $msg";
3840 3900
3841 my @bt = fork_call { 3901 my @bt = fork_call {
3842 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
… …
3853 } 3913 }
3854 3914
3855 @funcs 3915 @funcs
3856 }; 3916 };
3857 3917
3858 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3859 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3860 --$_log_backtrace; 3921 --$_log_backtrace;
3861 }; 3922 };
3862 } else { 3923 } else {
3863 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines