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.422 by root, Tue Apr 15 20:46:55 2008 UTC vs.
Revision 1.448 by root, Fri Sep 19 05:30:23 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
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 68
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71{
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve";
85 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86}
66 87
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 89
69our %COMMAND = (); 90our %COMMAND = ();
70our %COMMAND_TIME = (); 91our %COMMAND_TIME = ();
… …
76our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
77 98
78our $RELOAD; # number of reloads so far 99our $RELOAD; # number of reloads so far
79our @EVENT; 100our @EVENT;
80 101
81our $CONFDIR = confdir; 102our $CONFDIR = confdir;
82our $DATADIR = datadir; 103our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 107our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 108our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 109our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 110our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 111our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 112our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime";
115
92our %RESOURCE; 116our %RESOURCE;
93 117
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 120our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 121our $USE_FSYNC = 1; # use fsync to write maps - default off
99 122
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 123our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 124our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 125our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 126our $DB_ENV;
105 127
… …
123 145
124binmode STDOUT; 146binmode STDOUT;
125binmode STDERR; 147binmode STDERR;
126 148
127# read virtual server time, if available 149# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 150unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 151 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 152 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 153 $RUNTIME = <$fh> + 0.;
132} 154}
133 155
134mkdir $_ 156mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
242for my $pkg (qw( 264for my $pkg (qw(
243 cf::global cf::attachable 265 cf::global cf::attachable
244 cf::object cf::object::player 266 cf::object cf::object::player
245 cf::client cf::player 267 cf::client cf::player
246 cf::arch cf::living 268 cf::arch cf::living
269 cf::map cf::mapspace
247 cf::map cf::party cf::region 270 cf::party cf::region
248)) { 271)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 273}
252 274
253$EV::DIED = sub { 275$EV::DIED = sub {
254 warn "error in event callback: @_"; 276 warn "error in event callback: @_";
… …
427 } 449 }
428 } 450 }
429}; 451};
430 452
431sub get_slot($;$$) { 453sub get_slot($;$$) {
432 return if tick_inhibit; 454 return if tick_inhibit || $Coro::current == $Coro::main;
433 455
434 my ($time, $pri, $name) = @_; 456 my ($time, $pri, $name) = @_;
435 457
436 $time = $TICK * .6 if $time > $TICK * .6; 458 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal; 459 my $sig = new Coro::Signal;
… …
724 746
725############################################################################# 747#############################################################################
726 748
727=head2 ATTACHABLE OBJECTS 749=head2 ATTACHABLE OBJECTS
728 750
729Many objects in crossfire are so-called attachable objects. That means you can 751Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 752attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 753to it. All such attachable objects support the following methods.
732 754
733In the following description, CLASS can be any of C<global>, C<object> 755In 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 756C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
784=item cf::CLASS::attachment $name, ... 806=item cf::CLASS::attachment $name, ...
785 807
786Register an attachment by C<$name> through which attachable objects of the 808Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 809given CLASS can refer to this attachment.
788 810
789Some classes such as crossfire maps and objects can specify attachments 811Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 812that are attached at load/instantiate time, thus the need for a name.
791 813
792These calls expect any number of the following handler/hook descriptions: 814These calls expect any number of the following handler/hook descriptions:
793 815
794=over 4 816=over 4
… …
1085 1107
1086sub reattach { 1108sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1109 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1110 my ($obj) = @_;
1089 1111
1112 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1113 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1114
1092 my $registry = $obj->registry; 1115 my $registry = $obj->registry;
1093 1116
1094 @$registry = (); 1117 @$registry = ();
1095 1118
… …
1141 utf8::decode (my $decname = $filename); 1164 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1165 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1166 $decname, length $$rdata, scalar @$objs;
1144 1167
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1169 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1171 aio_fsync $fh if $cf::USE_FSYNC;
1149 close $fh; 1172 aio_close $fh;
1150 1173
1151 if (@$objs) { 1174 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1178 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1179 aio_fsync $fh if $cf::USE_FSYNC;
1157 close $fh; 1180 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1181 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1182 }
1160 } else { 1183 } else {
1161 aio_unlink "$filename.pst"; 1184 aio_unlink "$filename.pst";
1162 } 1185 }
… …
1331 1354
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1357
1335 $ext{source} = 1358 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1360 . "#line 1 \"$path\"\n{\n"
1338 . $source 1361 . $source
1339 . "\n};\n1"; 1362 . "\n};\n1";
1340 1363
1341 $todo{$base} = \%ext; 1364 $todo{$base} = \%ext;
… …
1381 1404
1382=back 1405=back
1383 1406
1384=head2 CORE EXTENSIONS 1407=head2 CORE EXTENSIONS
1385 1408
1386Functions and methods that extend core crossfire objects. 1409Functions and methods that extend core deliantra objects.
1387 1410
1388=cut 1411=cut
1389 1412
1390package cf::player; 1413package cf::player;
1391 1414
… …
1456 my $f = new_from_file cf::object::thawer path $login 1479 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1480 or return;
1458 1481
1459 my $pl = cf::player::load_pl $f 1482 my $pl = cf::player::load_pl $f
1460 or return; 1483 or return;
1484
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1485 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1486 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1487 $cf::PLAYER{$login} = $pl
1464 } 1488 }
1465 } 1489 }
… …
1518 my ($pl) = @_; 1542 my ($pl) = @_;
1519 1543
1520 my $name = $pl->ob->name; 1544 my $name = $pl->ob->name;
1521 1545
1522 $pl->{deny_save} = 1; 1546 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1547 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1548
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1550 $pl->deactivate;
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1553 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1554 $pl->ns->destroy if $pl->ns;
1529 1555
1530 my $path = playerdir $pl; 1556 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1557 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1570 1596
1571 for my $login (@$dirs) { 1597 for my $login (@$dirs) {
1572 my $path = path $login; 1598 my $path = path $login;
1573 1599
1574 # a .pst is a dead give-away for a valid player 1600 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1601 # if no pst file found, open and chekc for blocked users
1602 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1603 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1604 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1605 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1606 }
1580 1607
… …
1611 } 1638 }
1612 1639
1613 \@paths 1640 \@paths
1614} 1641}
1615 1642
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1643=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1644
1618Expand crossfire pod fragments into protocol xml. 1645Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1646
1709=item $player->ext_reply ($msgid, @msg) 1647=item $player->ext_reply ($msgid, @msg)
1710 1648
1711Sends an ext reply to the player. 1649Sends an ext reply to the player.
1712 1650
… …
2029 1967
2030 cf::lock_wait "map_data:$path";#d#remove 1968 cf::lock_wait "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 1969 cf::lock_wait "map_find:$path";
2032 1970
2033 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
2036 1974
2037 my $map = new_from_path cf::map $path 1975 my $map = new_from_path cf::map $path
2038 or return; 1976 or return;
2039 1977
2040 $map->{last_save} = $cf::RUNTIME; 1978 $map->{last_save} = $cf::RUNTIME;
… …
2043 or return; 1981 or return;
2044 1982
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1983 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 1984 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 1985 #$cf::WAIT_FOR_TICK->wait;
1986 undef $guard2;
2048 undef $guard1; 1987 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 1988 $map->reset;
2051 return find $path; 1989 return find $path;
2052 } 1990 }
2053 1991
2054 $cf::MAP{$path} = $map 1992 $cf::MAP{$path} = $map
… …
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2019 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2020 $f->skip_block;
2083 $self->_load_objects ($f) 2021 $self->_load_objects ($f)
2084 or return; 2022 or return;
2085 2023
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2024 $self->post_load_original
2087 if delete $self->{load_original}; 2025 if delete $self->{load_original};
2088 2026
2089 if (my $uniq = $self->uniq_path) { 2027 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2028 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2029 unless (aio_stat $uniq) {
… …
2457can be C<undef>. Does the right thing when the player is currently in a 2395can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2396dialogue with the given NPC character.
2459 2397
2460=cut 2398=cut
2461 2399
2400our $SAY_CHANNEL = {
2401 id => "say",
2402 title => "Map",
2403 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2405};
2406
2407our $CHAT_CHANNEL = {
2408 id => "chat",
2409 title => "Chat",
2410 reply => "chat ",
2411 tooltip => "Player chat and shouts, global to the server.",
2412};
2413
2462# rough implementation of a future "reply" method that works 2414# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2415# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2416#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2417sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2418 my ($self, $npc, $msg, $flags) = @_;
… …
2477 my $dialog = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2431
2480 } else { 2432 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2434 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2435 }
2484 } 2436 }
2485} 2437}
2486 2438
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2439=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2512 2464
2513=item $player_object->enter_link 2465=item $player_object->enter_link
2514 2466
2515Freezes the player and moves him/her to a special map (C<{link}>). 2467Freezes the player and moves him/her to a special map (C<{link}>).
2516 2468
2517The player should be reasonably safe there for short amounts of time. You 2469The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2470for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2471though, as the palyer cannot control the character while it is on the link
2472map.
2519 2473
2520Will never block. 2474Will never block.
2521 2475
2522=item $player_object->leave_link ($map, $x, $y) 2476=item $player_object->leave_link ($map, $x, $y)
2523 2477
… …
2581 2535
2582 $map->load; 2536 $map->load;
2583 $map->load_neighbours; 2537 $map->load_neighbours;
2584 2538
2585 return unless $self->contr->active; 2539 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2586 $self->activate_recursive; 2541 $self->activate_recursive;
2587 2542
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2544 $self->enter_map ($map, $x, $y);
2590} 2545}
… …
2594Moves the player to the given map-path and coordinates by first freezing 2549Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2551that has to return the map if sucecssful, and then unfreezes the player on
2597the new (success) or old (failed) map position. In either case, $done will 2552the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2553be called at the end of this process.
2554
2555Note that $check will be called with a potentially non-loaded map, so if
2556it needs a loaded map it has to call C<< ->load >>.
2599 2557
2600=cut 2558=cut
2601 2559
2602our $GOTOGEN; 2560our $GOTOGEN;
2603 2561
… …
2682} 2640}
2683 2641
2684sub prepare_random_map { 2642sub prepare_random_map {
2685 my ($exit) = @_; 2643 my ($exit) = @_;
2686 2644
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2645 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2646 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2647 # that depends on the exit object
2692 2648
2693 my $rmp = parse_random_map_params $exit->msg; 2649 my $rmp = parse_random_map_params $exit->msg;
… …
2695 if ($exit->map) { 2651 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2652 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2653 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2654 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2655 $rmp->{origin_y} = $exit->y;
2656
2657 $exit->map->touch;
2700 } 2658 }
2701 2659
2702 $rmp->{random_seed} ||= $exit->random_seed; 2660 $rmp->{random_seed} ||= $exit->random_seed;
2703 2661
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2662 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2666 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2667 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2668 undef $fh;
2711 aio_rename "$meta~", $meta; 2669 aio_rename "$meta~", $meta;
2712 2670
2671 my $slaying = "?random/$md5";
2672
2673 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2674 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2675 $exit->msg (undef);
2676 }
2715 } 2677 }
2716} 2678}
2717 2679
2718sub cf::object::player::enter_exit { 2680sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2681 my ($self, $exit) = @_;
2720 2682
2721 return unless $self->type == cf::PLAYER; 2683 return unless $self->type == cf::PLAYER;
2722 2684
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2685 $self->enter_link;
2735 2686
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2687 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2688 $Coro::current->{desc} = "enter_exit";
2742 2689
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2690 unless (eval {
2691 $self->deactivate_recursive; # just to be sure
2692
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2702 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp;
2704
2745 $self->goto ($slaying, $hp, $sp); 2705 $self->goto ($map, $x, $y);
2746 2706
2707 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y)
2709 if $exit->flag (cf::FLAG_DAMNED);
2710
2747 1; 2711 1
2748 }) { 2712 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2714 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2717
2754 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
… …
2832 id => "infobox", 2796 id => "infobox",
2833 title => "Map Info", 2797 title => "Map Info",
2834 reply => undef, 2798 reply => undef,
2835 tooltip => "Information related to the maps", 2799 tooltip => "Information related to the maps",
2836 }, 2800 },
2801 "c/party" => {
2802 id => "party",
2803 title => "Party",
2804 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party",
2806 },
2837); 2807);
2838 2808
2839sub cf::client::send_msg { 2809sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2810 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2811
2842 $msg = $self->pl->expand_cfpod ($msg); 2812 $msg = $self->pl->expand_cfpod ($msg)
2813 unless $color & cf::NDI_VERBATIM;
2843 2814
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 2815 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 2816
2846 # check predefined channels, for the benefit of C 2817 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 2818 if ($CHANNEL{$channel}) {
… …
2868 if ($self->can_msg) { 2839 if ($self->can_msg) {
2869 # default colour, mask it out 2840 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2842 if $color & cf::NDI_DEF;
2872 2843
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2844 my $pkt = "msg "
2845 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 );
2848
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt);
2875 } else { 2860 } else {
2876 if ($color >= 0) { 2861 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones 2862 # replace some tags by gcfclient-compatible ones
2878 for ($msg) { 2863 for ($msg) {
2879 1 while 2864 1 while
… …
3078 3063
3079The following functions and methods are available within a safe environment: 3064The following functions and methods are available within a safe environment:
3080 3065
3081 cf::object 3066 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3067 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3068 insert remove name archname title slaying race decrease split
3084 3069
3085 cf::object::player 3070 cf::object::player
3086 player 3071 player
3087 3072
3088 cf::player 3073 cf::player
… …
3093 3078
3094=cut 3079=cut
3095 3080
3096for ( 3081for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3083 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3084 decrease split destroy change_exp)],
3100 ["cf::object::player" => qw(player)], 3085 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3086 ["cf::player" => qw(peaceful)],
3102 ["cf::map" => qw(trigger)], 3087 ["cf::map" => qw(trigger)],
3103) { 3088) {
3104 no strict 'refs'; 3089 no strict 'refs';
… …
3312 while (my ($k, $v) = each %$want) { 3297 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3298 $ns->fx_want ($k, $v);
3314 } 3299 }
3315}; 3300};
3316 3301
3302sub load_resource_file($) {
3303 my $guard = lock_acquire "load_resource_file";
3304
3305 my $status = load_resource_file_ $_[0];
3306 get_slot 0.1, 100;
3307 cf::arch::commit_load;
3308
3309 $status
3310}
3311
3317sub reload_regions { 3312sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3313 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3314 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3315 %ext::player_env::MUSIC_FACE_CACHE = ();
3321 3316
… …
3334} 3329}
3335 3330
3336sub reload_archetypes { 3331sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3332 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3333 or die "unable to load archetypes\n";
3339 #d# NEED to laod twice to resolve forward references
3340 # this really needs to be done in an extra post-pass
3341 # (which needs to be synchronous, so solve it differently)
3342 load_resource_file "$DATADIR/archetypes"
3343 or die "unable to load archetypes\n";
3344} 3334}
3345 3335
3346sub reload_treasures { 3336sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3337 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3338 or die "unable to load treasurelists\n";
3349} 3339}
3350 3340
3351sub reload_resources { 3341sub reload_resources {
3352 warn "reloading resource files...\n"; 3342 warn "reloading resource files...\n";
3353 3343
3344 reload_facedata;
3345 reload_archetypes;
3354 reload_regions; 3346 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3347 reload_treasures;
3359 3348
3360 warn "finished reloading resource files\n"; 3349 warn "finished reloading resource files\n";
3361} 3350}
3362 3351
3363sub init { 3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3364 reload_resources; 3357 reload_resources;
3365} 3358}
3366 3359
3367sub reload_config { 3360sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3361 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3383 }; 3376 };
3384 warn $@ if $@; 3377 warn $@ if $@;
3385 } 3378 }
3386} 3379}
3387 3380
3381sub pidfile() {
3382 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3383 or die "$PIDFILE: $!";
3384 flock $fh, &Fcntl::LOCK_EX
3385 or die "$PIDFILE: flock: $!";
3386 $fh
3387}
3388
3389# make sure only one server instance is running at any one time
3390sub atomic {
3391 my $fh = pidfile;
3392
3393 my $pid = <$fh>;
3394 kill 9, $pid if $pid > 0;
3395
3396 seek $fh, 0, 0;
3397 print $fh $$;
3398}
3399
3388sub main { 3400sub main {
3401 atomic;
3402
3389 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
3390 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3392 (async { 3406 (async {
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3408 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
3396 }; 3410 };
3397 3411
3412 {
3413 my $guard = freeze_mainloop;
3398 reload_config; 3414 reload_config;
3399 db_init; 3415 db_init;
3400 load_extensions; 3416 load_extensions;
3401 3417
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno; 3419 }
3420
3421 utime time, time, $RUNTIMEFILE;
3422
3423 # no (long-running) fork's whatsoever before this point(!)
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425
3404 EV::loop; 3426 EV::loop;
3405} 3427}
3406 3428
3407############################################################################# 3429#############################################################################
3408# initialisation and cleanup 3430# initialisation and cleanup
… …
3416 }; 3438 };
3417 } 3439 }
3418} 3440}
3419 3441
3420sub write_runtime_sync { 3442sub write_runtime_sync {
3421 my $runtime = "$LOCALDIR/runtime";
3422
3423 # first touch the runtime file to show we are still running: 3443 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3444 # the fsync below can take a very very long time.
3425 3445
3426 IO::AIO::aio_utime $runtime, undef, undef; 3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3447
3428 my $guard = cf::lock_acquire "write_runtime"; 3448 my $guard = cf::lock_acquire "write_runtime";
3429 3449
3430 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3431 or return; 3451 or return;
3432 3452
3433 my $value = $cf::RUNTIME + 90 + 10; 3453 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3454 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3455 # 60 allows for the watchdog to kill the server.
… …
3445 aio_utime $fh, undef, undef; 3465 aio_utime $fh, undef, undef;
3446 3466
3447 close $fh 3467 close $fh
3448 or return; 3468 or return;
3449 3469
3450 aio_rename "$runtime~", $runtime 3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3471 and return;
3452 3472
3453 warn "runtime file written.\n"; 3473 warn "runtime file written.\n";
3454 3474
3455 1 3475 1
… …
3539sub post_cleanup { 3559sub post_cleanup {
3540 my ($make_core) = @_; 3560 my ($make_core) = @_;
3541 3561
3542 warn Carp::longmess "post_cleanup backtrace" 3562 warn Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3563 if $make_core;
3564
3565 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$;
3544} 3567}
3568
3569# a safer delete_package, copied from Symbol
3570sub clear_package($) {
3571 my $pkg = shift;
3572
3573 # expand to full symbol table name if needed
3574 unless ($pkg =~ /^main::.*::$/) {
3575 $pkg = "main$pkg" if $pkg =~ /^::/;
3576 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3577 $pkg .= '::' unless $pkg =~ /::$/;
3578 }
3579
3580 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3581 my $stem_symtab = *{$stem}{HASH};
3582
3583 defined $stem_symtab and exists $stem_symtab->{$leaf}
3584 or return;
3585
3586 # clear all symbols
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 }
3592 warn "cleared package #$pkg\n";#d#
3593}
3594
3595our $RELOAD; # how many times to reload
3545 3596
3546sub do_reload_perl() { 3597sub do_reload_perl() {
3547 # can/must only be called in main 3598 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3599 if ($Coro::current != $Coro::main) {
3549 warn "can only reload from main coroutine"; 3600 warn "can only reload from main coroutine";
3550 return; 3601 return;
3551 } 3602 }
3552 3603
3604 return if $RELOAD++;
3605
3606 while ($RELOAD) {
3553 warn "reloading..."; 3607 warn "reloading...";
3554 3608
3555 warn "entering sync_job"; 3609 warn "entering sync_job";
3556 3610
3557 cf::sync_job { 3611 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark 3612 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3613 cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark 3614 cf::write_runtime_sync; # external watchdog should not bark
3561 3615
3562 warn "syncing database to disk"; 3616 warn "syncing database to disk";
3563 BDB::db_env_txn_checkpoint $DB_ENV; 3617 BDB::db_env_txn_checkpoint $DB_ENV;
3564 3618
3565 # if anything goes wrong in here, we should simply crash as we already saved 3619 # if anything goes wrong in here, we should simply crash as we already saved
3566 3620
3567 warn "flushing outstanding aio requests"; 3621 warn "flushing outstanding aio requests";
3568 for (;;) {
3569 BDB::flush;
3570 IO::AIO::flush;
3571 Coro::cede_notself;
3572 last unless IO::AIO::nreqs || BDB::nreqs; 3622 while (IO::AIO::nreqs || BDB::nreqs) {
3573 warn "iterate..."; 3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3574 }
3575
3576 ++$RELOAD;
3577
3578 warn "cancelling all extension coros";
3579 $_->cancel for values %EXT_CORO;
3580 %EXT_CORO = ();
3581
3582 warn "removing commands";
3583 %COMMAND = ();
3584
3585 warn "removing ext/exti commands";
3586 %EXTCMD = ();
3587 %EXTICMD = ();
3588
3589 warn "unloading/nuking all extensions";
3590 for my $pkg (@EXTS) {
3591 warn "... unloading $pkg";
3592
3593 if (my $cb = $pkg->can ("unload")) {
3594 eval {
3595 $cb->($pkg);
3596 1
3597 } or warn "$pkg unloaded, but with errors: $@";
3598 } 3624 }
3599 3625
3600 warn "... nuking $pkg"; 3626 warn "cancelling all extension coros";
3601 Symbol::delete_package $pkg; 3627 $_->cancel for values %EXT_CORO;
3602 } 3628 %EXT_CORO = ();
3603 3629
3604 warn "unloading all perl modules loaded from $LIBDIR"; 3630 warn "removing commands";
3605 while (my ($k, $v) = each %INC) { 3631 %COMMAND = ();
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 3632
3633 warn "removing ext/exti commands";
3634 %EXTCMD = ();
3635 %EXTICMD = ();
3636
3637 warn "unloading/nuking all extensions";
3638 for my $pkg (@EXTS) {
3608 warn "... unloading $k"; 3639 warn "... unloading $pkg";
3609 delete $INC{$k};
3610 3640
3611 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g;
3613
3614 if (my $cb = $k->can ("unload_module")) { 3641 if (my $cb = $pkg->can ("unload")) {
3642 eval {
3615 $cb->(); 3643 $cb->($pkg);
3644 1
3645 } or warn "$pkg unloaded, but with errors: $@";
3646 }
3647
3648 warn "... clearing $pkg";
3649 clear_package $pkg;
3616 } 3650 }
3617 3651
3618 Symbol::delete_package $k; 3652 warn "unloading all perl modules loaded from $LIBDIR";
3653 while (my ($k, $v) = each %INC) {
3654 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3655
3656 warn "... unloading $k";
3657 delete $INC{$k};
3658
3659 $k =~ s/\.pm$//;
3660 $k =~ s/\//::/g;
3661
3662 if (my $cb = $k->can ("unload_module")) {
3663 $cb->();
3664 }
3665
3666 clear_package $k;
3619 } 3667 }
3620 3668
3621 warn "getting rid of safe::, as good as possible"; 3669 warn "getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 3670 clear_package "safe::$_"
3623 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3624 3672
3625 warn "unloading cf.pm \"a bit\""; 3673 warn "unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 3674 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 3675 delete $INC{"cf/pod.pm"};
3628 3676
3629 # don't, removes xs symbols, too, 3677 # don't, removes xs symbols, too,
3630 # and global variables created in xs 3678 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 3679 #clear_package __PACKAGE__;
3632 3680
3633 warn "unload completed, starting to reload now"; 3681 warn "unload completed, starting to reload now";
3634 3682
3635 warn "reloading cf.pm"; 3683 warn "reloading cf.pm";
3636 require cf; 3684 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3638 3686
3639 warn "loading config and database again"; 3687 warn "loading config and database again";
3640 cf::reload_config; 3688 cf::reload_config;
3641 3689
3642 warn "loading extensions"; 3690 warn "loading extensions";
3643 cf::load_extensions; 3691 cf::load_extensions;
3644 3692
3645 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
3648 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
3651 3699
3652 warn "leaving sync_job"; 3700 warn "leaving sync_job";
3653 3701
3654 1 3702 1
3655 } or do { 3703 } or do {
3656 warn $@; 3704 warn $@;
3657 cf::cleanup "error while reloading, exiting."; 3705 cf::cleanup "error while reloading, exiting.";
3658 }; 3706 };
3659 3707
3660 warn "reloaded"; 3708 warn "reloaded";
3709 --$RELOAD;
3710 }
3661}; 3711};
3662 3712
3663our $RELOAD_WATCHER; # used only during reload 3713our $RELOAD_WATCHER; # used only during reload
3664 3714
3665sub reload_perl() { 3715sub reload_perl() {
… …
3690 3740
3691our @WAIT_FOR_TICK; 3741our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 3742our @WAIT_FOR_TICK_BEGIN;
3693 3743
3694sub wait_for_tick { 3744sub wait_for_tick {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3697 3746
3698 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 3748 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 3749 $signal->wait;
3701} 3750}
3702 3751
3703sub wait_for_tick_begin { 3752sub wait_for_tick_begin {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 3753 return if tick_inhibit || $Coro::current == $Coro::main;
3706 3754
3707 my $signal = new Coro::Signal; 3755 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 3756 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 3757 $signal->wait;
3710} 3758}
… …
3749{ 3797{
3750 # configure BDB 3798 # configure BDB
3751 3799
3752 BDB::min_parallel 8; 3800 BDB::min_parallel 8;
3753 BDB::max_poll_reqs $TICK * 0.1; 3801 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 3802 $AnyEvent::BDB::WATCHER->priority (1);
3755 3803
3756 unless ($DB_ENV) { 3804 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 3805 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3806 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 3807 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3808 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3809 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3810 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 3811
3763 cf::sync_job { 3812 cf::sync_job {
3764 eval { 3813 eval {
… …
3790{ 3839{
3791 # configure IO::AIO 3840 # configure IO::AIO
3792 3841
3793 IO::AIO::min_parallel 8; 3842 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 3843 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 3844 undef $AnyEvent::AIO::WATCHER;
3796} 3845}
3797 3846
3798my $_log_backtrace; 3847my $_log_backtrace;
3799 3848
3800sub _log_backtrace { 3849sub _log_backtrace {
… …
3803 $msg =~ s/\n//; 3852 $msg =~ s/\n//;
3804 3853
3805 # limit the # of concurrent backtraces 3854 # limit the # of concurrent backtraces
3806 if ($_log_backtrace < 2) { 3855 if ($_log_backtrace < 2) {
3807 ++$_log_backtrace; 3856 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg;
3808 async { 3858 async {
3809 $Coro::current->{desc} = "abt $msg"; 3859 $Coro::current->{desc} = "abt $msg";
3810 3860
3811 my @bt = fork_call { 3861 my @bt = fork_call {
3812 @addr = map { sprintf "%x", $_ } @addr; 3862 @addr = map { sprintf "%x", $_ } @addr;
… …
3823 } 3873 }
3824 3874
3825 @funcs 3875 @funcs
3826 }; 3876 };
3827 3877
3828 LOG llevInfo, "[ABT] $msg\n"; 3878 LOG llevInfo, "[ABT] $perl_bt\n";
3879 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829 LOG llevInfo, "[ABT] $_\n" for @bt; 3880 LOG llevInfo, "[ABT] $_\n" for @bt;
3830 --$_log_backtrace; 3881 --$_log_backtrace;
3831 }; 3882 };
3832 } else { 3883 } else {
3833 LOG llevInfo, "[ABT] $msg\n"; 3884 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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