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.419 by root, Sun Apr 13 01:34:09 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($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main;
455
432 my ($time, $pri, $name) = @_; 456 my ($time, $pri, $name) = @_;
433 457
434 $time = $TICK * .6 if $time > $TICK * .6; 458 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 459 my $sig = new Coro::Signal;
436 460
… …
722 746
723############################################################################# 747#############################################################################
724 748
725=head2 ATTACHABLE OBJECTS 749=head2 ATTACHABLE OBJECTS
726 750
727Many 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
728attach callbacks/event handlers (a collection of which is called an "attachment") 752attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 753to it. All such attachable objects support the following methods.
730 754
731In 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>
732C<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
… …
782=item cf::CLASS::attachment $name, ... 806=item cf::CLASS::attachment $name, ...
783 807
784Register an attachment by C<$name> through which attachable objects of the 808Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 809given CLASS can refer to this attachment.
786 810
787Some classes such as crossfire maps and objects can specify attachments 811Some classes such as deliantra maps and objects can specify attachments
788that 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.
789 813
790These calls expect any number of the following handler/hook descriptions: 814These calls expect any number of the following handler/hook descriptions:
791 815
792=over 4 816=over 4
… …
1083 1107
1084sub reattach { 1108sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1109 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1110 my ($obj) = @_;
1087 1111
1112 # no longer needed after getting rid of delete_package?
1088 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
1089 1114
1090 my $registry = $obj->registry; 1115 my $registry = $obj->registry;
1091 1116
1092 @$registry = (); 1117 @$registry = ();
1093 1118
… …
1139 utf8::decode (my $decname = $filename); 1164 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1165 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1166 $decname, length $$rdata, scalar @$objs;
1142 1167
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1169 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1171 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1172 aio_close $fh;
1148 1173
1149 if (@$objs) { 1174 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1178 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1179 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1180 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1181 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1182 }
1158 } else { 1183 } else {
1159 aio_unlink "$filename.pst"; 1184 aio_unlink "$filename.pst";
1160 } 1185 }
… …
1329 1354
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1357
1333 $ext{source} = 1358 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1360 . "#line 1 \"$path\"\n{\n"
1336 . $source 1361 . $source
1337 . "\n};\n1"; 1362 . "\n};\n1";
1338 1363
1339 $todo{$base} = \%ext; 1364 $todo{$base} = \%ext;
… …
1379 1404
1380=back 1405=back
1381 1406
1382=head2 CORE EXTENSIONS 1407=head2 CORE EXTENSIONS
1383 1408
1384Functions and methods that extend core crossfire objects. 1409Functions and methods that extend core deliantra objects.
1385 1410
1386=cut 1411=cut
1387 1412
1388package cf::player; 1413package cf::player;
1389 1414
… …
1454 my $f = new_from_file cf::object::thawer path $login 1479 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1480 or return;
1456 1481
1457 my $pl = cf::player::load_pl $f 1482 my $pl = cf::player::load_pl $f
1458 or return; 1483 or return;
1484
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1485 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1486 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1487 $cf::PLAYER{$login} = $pl
1462 } 1488 }
1463 } 1489 }
… …
1473 1499
1474 return if $pl->{deny_save}; 1500 return if $pl->{deny_save};
1475 1501
1476 aio_mkdir playerdir $pl, 0770; 1502 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1503 $pl->{last_save} = $cf::RUNTIME;
1504
1505 cf::get_slot 0.01;
1478 1506
1479 $pl->save_pl ($path); 1507 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1508 cf::cede_to_tick;
1481} 1509}
1482 1510
… …
1514 my ($pl) = @_; 1542 my ($pl) = @_;
1515 1543
1516 my $name = $pl->ob->name; 1544 my $name = $pl->ob->name;
1517 1545
1518 $pl->{deny_save} = 1; 1546 $pl->{deny_save} = 1;
1519 $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
1520 1548
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1550 $pl->deactivate;
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1553 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1554 $pl->ns->destroy if $pl->ns;
1525 1555
1526 my $path = playerdir $pl; 1556 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1557 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1566 1596
1567 for my $login (@$dirs) { 1597 for my $login (@$dirs) {
1568 my $path = path $login; 1598 my $path = path $login;
1569 1599
1570 # a .pst is a dead give-away for a valid player 1600 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1601 # if no pst file found, open and chekc for blocked users
1602 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1603 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1604 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1605 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1606 }
1576 1607
… …
1607 } 1638 }
1608 1639
1609 \@paths 1640 \@paths
1610} 1641}
1611 1642
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1643=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1644
1614Expand crossfire pod fragments into protocol xml. 1645Expand 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 1646
1705=item $player->ext_reply ($msgid, @msg) 1647=item $player->ext_reply ($msgid, @msg)
1706 1648
1707Sends an ext reply to the player. 1649Sends an ext reply to the player.
1708 1650
… …
2025 1967
2026 cf::lock_wait "map_data:$path";#d#remove 1968 cf::lock_wait "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 1969 cf::lock_wait "map_find:$path";
2028 1970
2029 $cf::MAP{$path} || do { 1971 $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 1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
2032 1974
2033 my $map = new_from_path cf::map $path 1975 my $map = new_from_path cf::map $path
2034 or return; 1976 or return;
2035 1977
2036 $map->{last_save} = $cf::RUNTIME; 1978 $map->{last_save} = $cf::RUNTIME;
… …
2039 or return; 1981 or return;
2040 1982
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1983 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 1984 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 1985 #$cf::WAIT_FOR_TICK->wait;
1986 undef $guard2;
2044 undef $guard1; 1987 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 1988 $map->reset;
2047 return find $path; 1989 return find $path;
2048 } 1990 }
2049 1991
2050 $cf::MAP{$path} = $map 1992 $cf::MAP{$path} = $map
… …
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2019 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2020 $f->skip_block;
2079 $self->_load_objects ($f) 2021 $self->_load_objects ($f)
2080 or return; 2022 or return;
2081 2023
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2024 $self->post_load_original
2083 if delete $self->{load_original}; 2025 if delete $self->{load_original};
2084 2026
2085 if (my $uniq = $self->uniq_path) { 2027 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2028 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2029 unless (aio_stat $uniq) {
… …
2113 } 2055 }
2114 2056
2115 $self->{last_save} = $cf::RUNTIME; 2057 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2058 $self->last_access ($cf::RUNTIME);
2117 2059
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2060 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2061 }
2120 2062
2121 $self->post_load; 2063 $self->post_load;
2122} 2064}
2123 2065
… …
2181 my ($path, $origin, $load) = @_; 2123 my ($path, $origin, $load) = @_;
2182 2124
2183 $path = normalise $path, $origin && $origin->{path}; 2125 $path = normalise $path, $origin && $origin->{path};
2184 2126
2185 if (my $map = $cf::MAP{$path}) { 2127 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2128 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2129 }
2188 2130
2189 $MAP_PREFETCH{$path} |= $load; 2131 $MAP_PREFETCH{$path} |= $load;
2190 2132
2191 $MAP_PREFETCHER ||= cf::async { 2133 $MAP_PREFETCHER ||= cf::async {
… …
2228 cf::async { 2170 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2171 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2172 $_->contr->save for $self->players;
2231 }; 2173 };
2232 2174
2175 cf::get_slot 0.02;
2176
2233 if ($uniq) { 2177 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2178 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2179 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2180 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2245 $self->save; 2189 $self->save;
2246 2190
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2191 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2192
2249 return if $self->players; 2193 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2194 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2195 return if $self->{deny_save};
2252 2196
2253 $self->in_memory (cf::MAP_SWAPPED); 2197 $self->in_memory (cf::MAP_SWAPPED);
2254 2198
2255 $self->deactivate; 2199 $self->deactivate;
… …
2451can 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
2452dialogue with the given NPC character. 2396dialogue with the given NPC character.
2453 2397
2454=cut 2398=cut
2455 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
2456# rough implementation of a future "reply" method that works 2414# rough implementation of a future "reply" method that works
2457# with dialog boxes. 2415# with dialog boxes.
2458#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
2459sub cf::object::player::reply($$$;$) { 2417sub cf::object::player::reply($$$;$) {
2460 my ($self, $npc, $msg, $flags) = @_; 2418 my ($self, $npc, $msg, $flags) = @_;
… …
2471 my $dialog = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2472 $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));
2473 2431
2474 } else { 2432 } else {
2475 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2476 $self->message ($msg, $flags); 2434 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2477 } 2435 }
2478 } 2436 }
2479} 2437}
2480 2438
2481=item $object->send_msg ($channel, $msg, $color, [extra...]) 2439=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2506 2464
2507=item $player_object->enter_link 2465=item $player_object->enter_link
2508 2466
2509Freezes 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}>).
2510 2468
2511The 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.
2512I<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.
2513 2473
2514Will never block. 2474Will never block.
2515 2475
2516=item $player_object->leave_link ($map, $x, $y) 2476=item $player_object->leave_link ($map, $x, $y)
2517 2477
… …
2575 2535
2576 $map->load; 2536 $map->load;
2577 $map->load_neighbours; 2537 $map->load_neighbours;
2578 2538
2579 return unless $self->contr->active; 2539 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2580 $self->activate_recursive; 2541 $self->activate_recursive;
2581 2542
2582 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2583 $self->enter_map ($map, $x, $y); 2544 $self->enter_map ($map, $x, $y);
2584} 2545}
… …
2588Moves 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
2589her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2590that 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
2591the 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
2592be 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 >>.
2593 2557
2594=cut 2558=cut
2595 2559
2596our $GOTOGEN; 2560our $GOTOGEN;
2597 2561
… …
2676} 2640}
2677 2641
2678sub prepare_random_map { 2642sub prepare_random_map {
2679 my ($exit) = @_; 2643 my ($exit) = @_;
2680 2644
2681 my $guard = cf::lock_acquire "exit_prepare:$exit";
2682
2683 # all this does is basically replace the /! path by 2645 # all this does is basically replace the /! path by
2684 # a new random map path (?random/...) with a seed 2646 # a new random map path (?random/...) with a seed
2685 # that depends on the exit object 2647 # that depends on the exit object
2686 2648
2687 my $rmp = parse_random_map_params $exit->msg; 2649 my $rmp = parse_random_map_params $exit->msg;
… …
2689 if ($exit->map) { 2651 if ($exit->map) {
2690 $rmp->{region} = $exit->region->name; 2652 $rmp->{region} = $exit->region->name;
2691 $rmp->{origin_map} = $exit->map->path; 2653 $rmp->{origin_map} = $exit->map->path;
2692 $rmp->{origin_x} = $exit->x; 2654 $rmp->{origin_x} = $exit->x;
2693 $rmp->{origin_y} = $exit->y; 2655 $rmp->{origin_y} = $exit->y;
2656
2657 $exit->map->touch;
2694 } 2658 }
2695 2659
2696 $rmp->{random_seed} ||= $exit->random_seed; 2660 $rmp->{random_seed} ||= $exit->random_seed;
2697 2661
2698 my $data = cf::encode_json $rmp; 2662 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2699 my $md5 = Digest::MD5::md5_hex $data; 2663 my $md5 = Digest::MD5::md5_hex $data;
2700 my $meta = "$RANDOMDIR/$md5.meta"; 2664 my $meta = "$RANDOMDIR/$md5.meta";
2701 2665
2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2666 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2703 aio_write $fh, 0, (length $data), $data, 0; 2667 aio_write $fh, 0, (length $data), $data, 0;
2704 undef $fh; 2668 undef $fh;
2705 aio_rename "$meta~", $meta; 2669 aio_rename "$meta~", $meta;
2706 2670
2671 my $slaying = "?random/$md5";
2672
2673 if ($exit->valid) {
2707 $exit->slaying ("?random/$md5"); 2674 $exit->slaying ("?random/$md5");
2708 $exit->msg (undef); 2675 $exit->msg (undef);
2676 }
2709 } 2677 }
2710} 2678}
2711 2679
2712sub cf::object::player::enter_exit { 2680sub cf::object::player::enter_exit {
2713 my ($self, $exit) = @_; 2681 my ($self, $exit) = @_;
2714 2682
2715 return unless $self->type == cf::PLAYER; 2683 return unless $self->type == cf::PLAYER;
2716 2684
2717 if ($exit->slaying eq "/!") {
2718 #TODO: this should de-fi-ni-te-ly not be a sync-job
2719 # the problem is that $exit might not survive long enough
2720 # so it needs to be done right now, right here
2721 cf::sync_job { prepare_random_map $exit };
2722 }
2723
2724 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2725 my $hp = $exit->stats->hp;
2726 my $sp = $exit->stats->sp;
2727
2728 $self->enter_link; 2685 $self->enter_link;
2729 2686
2730 # if exit is damned, update players death & WoR home-position
2731 $self->contr->savebed ($slaying, $hp, $sp)
2732 if $exit->flag (FLAG_DAMNED);
2733
2734 (async { 2687 (async {
2735 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2688 $Coro::current->{desc} = "enter_exit";
2736 2689
2737 $self->deactivate_recursive; # just to be sure
2738 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
2739 $self->goto ($slaying, $hp, $sp); 2705 $self->goto ($map, $x, $y);
2740 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
2741 1; 2711 1
2742 }) { 2712 }) {
2743 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2744 . "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. "
2745 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2746 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2747 2717
2748 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
… …
2826 id => "infobox", 2796 id => "infobox",
2827 title => "Map Info", 2797 title => "Map Info",
2828 reply => undef, 2798 reply => undef,
2829 tooltip => "Information related to the maps", 2799 tooltip => "Information related to the maps",
2830 }, 2800 },
2801 "c/party" => {
2802 id => "party",
2803 title => "Party",
2804 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party",
2806 },
2831); 2807);
2832 2808
2833sub cf::client::send_msg { 2809sub cf::client::send_msg {
2834 my ($self, $channel, $msg, $color, @extra) = @_; 2810 my ($self, $channel, $msg, $color, @extra) = @_;
2835 2811
2836 $msg = $self->pl->expand_cfpod ($msg); 2812 $msg = $self->pl->expand_cfpod ($msg)
2813 unless $color & cf::NDI_VERBATIM;
2837 2814
2838 $color &= cf::NDI_CLIENT_MASK; # just in case... 2815 $color &= cf::NDI_CLIENT_MASK; # just in case...
2839 2816
2840 # check predefined channels, for the benefit of C 2817 # check predefined channels, for the benefit of C
2841 if ($CHANNEL{$channel}) { 2818 if ($CHANNEL{$channel}) {
… …
2862 if ($self->can_msg) { 2839 if ($self->can_msg) {
2863 # default colour, mask it out 2840 # default colour, mask it out
2864 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2865 if $color & cf::NDI_DEF; 2842 if $color & cf::NDI_DEF;
2866 2843
2867 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2844 my $pkt = "msg "
2845 . $self->{json_coder}->encode (
2868 [$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);
2869 } else { 2860 } else {
2870 if ($color >= 0) { 2861 if ($color >= 0) {
2871 # replace some tags by gcfclient-compatible ones 2862 # replace some tags by gcfclient-compatible ones
2872 for ($msg) { 2863 for ($msg) {
2873 1 while 2864 1 while
… …
3072 3063
3073The following functions and methods are available within a safe environment: 3064The following functions and methods are available within a safe environment:
3074 3065
3075 cf::object 3066 cf::object
3076 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
3077 insert remove name archname title slaying race decrease_ob_nr 3068 insert remove name archname title slaying race decrease split
3078 3069
3079 cf::object::player 3070 cf::object::player
3080 player 3071 player
3081 3072
3082 cf::player 3073 cf::player
… …
3087 3078
3088=cut 3079=cut
3089 3080
3090for ( 3081for (
3091 ["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
3092 insert remove inv name archname title slaying race 3083 insert remove inv nrof name archname title slaying race
3093 decrease_ob_nr destroy)], 3084 decrease split destroy change_exp)],
3094 ["cf::object::player" => qw(player)], 3085 ["cf::object::player" => qw(player)],
3095 ["cf::player" => qw(peaceful)], 3086 ["cf::player" => qw(peaceful)],
3096 ["cf::map" => qw(trigger)], 3087 ["cf::map" => qw(trigger)],
3097) { 3088) {
3098 no strict 'refs'; 3089 no strict 'refs';
… …
3306 while (my ($k, $v) = each %$want) { 3297 while (my ($k, $v) = each %$want) {
3307 $ns->fx_want ($k, $v); 3298 $ns->fx_want ($k, $v);
3308 } 3299 }
3309}; 3300};
3310 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
3311sub reload_regions { 3312sub reload_regions {
3312 # 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
3313 # for this (global event?) 3314 # for this (global event?)
3314 %ext::player_env::MUSIC_FACE_CACHE = (); 3315 %ext::player_env::MUSIC_FACE_CACHE = ();
3315 3316
… …
3328} 3329}
3329 3330
3330sub reload_archetypes { 3331sub reload_archetypes {
3331 load_resource_file "$DATADIR/archetypes" 3332 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n"; 3333 or die "unable to load archetypes\n";
3333 #d# NEED to laod twice to resolve forward references
3334 # this really needs to be done in an extra post-pass
3335 # (which needs to be synchronous, so solve it differently)
3336 load_resource_file "$DATADIR/archetypes"
3337 or die "unable to load archetypes\n";
3338} 3334}
3339 3335
3340sub reload_treasures { 3336sub reload_treasures {
3341 load_resource_file "$DATADIR/treasures" 3337 load_resource_file "$DATADIR/treasures"
3342 or die "unable to load treasurelists\n"; 3338 or die "unable to load treasurelists\n";
3343} 3339}
3344 3340
3345sub reload_resources { 3341sub reload_resources {
3346 warn "reloading resource files...\n"; 3342 warn "reloading resource files...\n";
3347 3343
3344 reload_facedata;
3345 reload_archetypes;
3348 reload_regions; 3346 reload_regions;
3349 reload_facedata;
3350 #reload_archetypes;#d#
3351 reload_archetypes;
3352 reload_treasures; 3347 reload_treasures;
3353 3348
3354 warn "finished reloading resource files\n"; 3349 warn "finished reloading resource files\n";
3355} 3350}
3356 3351
3357sub init { 3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3358 reload_resources; 3357 reload_resources;
3359} 3358}
3360 3359
3361sub reload_config { 3360sub reload_config {
3362 open my $fh, "<:utf8", "$CONFDIR/config" 3361 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3377 }; 3376 };
3378 warn $@ if $@; 3377 warn $@ if $@;
3379 } 3378 }
3380} 3379}
3381 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
3382sub main { 3400sub main {
3401 atomic;
3402
3383 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
3385 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#
3386 (async { 3406 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3408 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
3390 }; 3410 };
3391 3411
3412 {
3413 my $guard = freeze_mainloop;
3392 reload_config; 3414 reload_config;
3393 db_init; 3415 db_init;
3394 load_extensions; 3416 load_extensions;
3395 3417
3396 $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
3397 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
3398 EV::loop; 3426 EV::loop;
3399} 3427}
3400 3428
3401############################################################################# 3429#############################################################################
3402# initialisation and cleanup 3430# initialisation and cleanup
… …
3410 }; 3438 };
3411 } 3439 }
3412} 3440}
3413 3441
3414sub write_runtime_sync { 3442sub write_runtime_sync {
3415 my $runtime = "$LOCALDIR/runtime";
3416
3417 # first touch the runtime file to show we are still running: 3443 # first touch the runtime file to show we are still running:
3418 # the fsync below can take a very very long time. 3444 # the fsync below can take a very very long time.
3419 3445
3420 IO::AIO::aio_utime $runtime, undef, undef; 3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3421 3447
3422 my $guard = cf::lock_acquire "write_runtime"; 3448 my $guard = cf::lock_acquire "write_runtime";
3423 3449
3424 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3425 or return; 3451 or return;
3426 3452
3427 my $value = $cf::RUNTIME + 90 + 10; 3453 my $value = $cf::RUNTIME + 90 + 10;
3428 # 10 is the runtime save interval, for a monotonic clock 3454 # 10 is the runtime save interval, for a monotonic clock
3429 # 60 allows for the watchdog to kill the server. 3455 # 60 allows for the watchdog to kill the server.
… …
3439 aio_utime $fh, undef, undef; 3465 aio_utime $fh, undef, undef;
3440 3466
3441 close $fh 3467 close $fh
3442 or return; 3468 or return;
3443 3469
3444 aio_rename "$runtime~", $runtime 3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3445 and return; 3471 and return;
3446 3472
3447 warn "runtime file written.\n"; 3473 warn "runtime file written.\n";
3448 3474
3449 1 3475 1
… …
3533sub post_cleanup { 3559sub post_cleanup {
3534 my ($make_core) = @_; 3560 my ($make_core) = @_;
3535 3561
3536 warn Carp::longmess "post_cleanup backtrace" 3562 warn Carp::longmess "post_cleanup backtrace"
3537 if $make_core; 3563 if $make_core;
3564
3565 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$;
3538} 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
3539 3596
3540sub do_reload_perl() { 3597sub do_reload_perl() {
3541 # can/must only be called in main 3598 # can/must only be called in main
3542 if ($Coro::current != $Coro::main) { 3599 if ($Coro::current != $Coro::main) {
3543 warn "can only reload from main coroutine"; 3600 warn "can only reload from main coroutine";
3544 return; 3601 return;
3545 } 3602 }
3546 3603
3604 return if $RELOAD++;
3605
3606 while ($RELOAD) {
3547 warn "reloading..."; 3607 warn "reloading...";
3548 3608
3549 warn "entering sync_job"; 3609 warn "entering sync_job";
3550 3610
3551 cf::sync_job { 3611 cf::sync_job {
3552 cf::write_runtime_sync; # external watchdog should not bark 3612 cf::write_runtime_sync; # external watchdog should not bark
3553 cf::emergency_save; 3613 cf::emergency_save;
3554 cf::write_runtime_sync; # external watchdog should not bark 3614 cf::write_runtime_sync; # external watchdog should not bark
3555 3615
3556 warn "syncing database to disk"; 3616 warn "syncing database to disk";
3557 BDB::db_env_txn_checkpoint $DB_ENV; 3617 BDB::db_env_txn_checkpoint $DB_ENV;
3558 3618
3559 # 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
3560 3620
3561 warn "flushing outstanding aio requests"; 3621 warn "flushing outstanding aio requests";
3562 for (;;) {
3563 BDB::flush;
3564 IO::AIO::flush;
3565 Coro::cede_notself;
3566 last unless IO::AIO::nreqs || BDB::nreqs; 3622 while (IO::AIO::nreqs || BDB::nreqs) {
3567 warn "iterate..."; 3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3568 }
3569
3570 ++$RELOAD;
3571
3572 warn "cancelling all extension coros";
3573 $_->cancel for values %EXT_CORO;
3574 %EXT_CORO = ();
3575
3576 warn "removing commands";
3577 %COMMAND = ();
3578
3579 warn "removing ext/exti commands";
3580 %EXTCMD = ();
3581 %EXTICMD = ();
3582
3583 warn "unloading/nuking all extensions";
3584 for my $pkg (@EXTS) {
3585 warn "... unloading $pkg";
3586
3587 if (my $cb = $pkg->can ("unload")) {
3588 eval {
3589 $cb->($pkg);
3590 1
3591 } or warn "$pkg unloaded, but with errors: $@";
3592 } 3624 }
3593 3625
3594 warn "... nuking $pkg"; 3626 warn "cancelling all extension coros";
3595 Symbol::delete_package $pkg; 3627 $_->cancel for values %EXT_CORO;
3596 } 3628 %EXT_CORO = ();
3597 3629
3598 warn "unloading all perl modules loaded from $LIBDIR"; 3630 warn "removing commands";
3599 while (my ($k, $v) = each %INC) { 3631 %COMMAND = ();
3600 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3601 3632
3633 warn "removing ext/exti commands";
3634 %EXTCMD = ();
3635 %EXTICMD = ();
3636
3637 warn "unloading/nuking all extensions";
3638 for my $pkg (@EXTS) {
3602 warn "... unloading $k"; 3639 warn "... unloading $pkg";
3603 delete $INC{$k};
3604 3640
3605 $k =~ s/\.pm$//;
3606 $k =~ s/\//::/g;
3607
3608 if (my $cb = $k->can ("unload_module")) { 3641 if (my $cb = $pkg->can ("unload")) {
3642 eval {
3609 $cb->(); 3643 $cb->($pkg);
3644 1
3645 } or warn "$pkg unloaded, but with errors: $@";
3646 }
3647
3648 warn "... clearing $pkg";
3649 clear_package $pkg;
3610 } 3650 }
3611 3651
3612 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;
3613 } 3667 }
3614 3668
3615 warn "getting rid of safe::, as good as possible"; 3669 warn "getting rid of safe::, as good as possible";
3616 Symbol::delete_package "safe::$_" 3670 clear_package "safe::$_"
3617 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);
3618 3672
3619 warn "unloading cf.pm \"a bit\""; 3673 warn "unloading cf.pm \"a bit\"";
3620 delete $INC{"cf.pm"}; 3674 delete $INC{"cf.pm"};
3621 delete $INC{"cf/pod.pm"}; 3675 delete $INC{"cf/pod.pm"};
3622 3676
3623 # don't, removes xs symbols, too, 3677 # don't, removes xs symbols, too,
3624 # and global variables created in xs 3678 # and global variables created in xs
3625 #Symbol::delete_package __PACKAGE__; 3679 #clear_package __PACKAGE__;
3626 3680
3627 warn "unload completed, starting to reload now"; 3681 warn "unload completed, starting to reload now";
3628 3682
3629 warn "reloading cf.pm"; 3683 warn "reloading cf.pm";
3630 require cf; 3684 require cf;
3631 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3632 3686
3633 warn "loading config and database again"; 3687 warn "loading config and database again";
3634 cf::reload_config; 3688 cf::reload_config;
3635 3689
3636 warn "loading extensions"; 3690 warn "loading extensions";
3637 cf::load_extensions; 3691 cf::load_extensions;
3638 3692
3639 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
3640 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
3641 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
3642 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
3643 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
3644 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
3645 3699
3646 warn "leaving sync_job"; 3700 warn "leaving sync_job";
3647 3701
3648 1 3702 1
3649 } or do { 3703 } or do {
3650 warn $@; 3704 warn $@;
3651 cf::cleanup "error while reloading, exiting."; 3705 cf::cleanup "error while reloading, exiting.";
3652 }; 3706 };
3653 3707
3654 warn "reloaded"; 3708 warn "reloaded";
3709 --$RELOAD;
3710 }
3655}; 3711};
3656 3712
3657our $RELOAD_WATCHER; # used only during reload 3713our $RELOAD_WATCHER; # used only during reload
3658 3714
3659sub reload_perl() { 3715sub reload_perl() {
… …
3684 3740
3685our @WAIT_FOR_TICK; 3741our @WAIT_FOR_TICK;
3686our @WAIT_FOR_TICK_BEGIN; 3742our @WAIT_FOR_TICK_BEGIN;
3687 3743
3688sub wait_for_tick { 3744sub wait_for_tick {
3689 return if tick_inhibit;
3690 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3691 3746
3692 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3693 push @WAIT_FOR_TICK, $signal; 3748 push @WAIT_FOR_TICK, $signal;
3694 $signal->wait; 3749 $signal->wait;
3695} 3750}
3696 3751
3697sub wait_for_tick_begin { 3752sub wait_for_tick_begin {
3698 return if tick_inhibit;
3699 return if $Coro::current == $Coro::main; 3753 return if tick_inhibit || $Coro::current == $Coro::main;
3700 3754
3701 my $signal = new Coro::Signal; 3755 my $signal = new Coro::Signal;
3702 push @WAIT_FOR_TICK_BEGIN, $signal; 3756 push @WAIT_FOR_TICK_BEGIN, $signal;
3703 $signal->wait; 3757 $signal->wait;
3704} 3758}
… …
3743{ 3797{
3744 # configure BDB 3798 # configure BDB
3745 3799
3746 BDB::min_parallel 8; 3800 BDB::min_parallel 8;
3747 BDB::max_poll_reqs $TICK * 0.1; 3801 BDB::max_poll_reqs $TICK * 0.1;
3748 $Coro::BDB::WATCHER->priority (1); 3802 $AnyEvent::BDB::WATCHER->priority (1);
3749 3803
3750 unless ($DB_ENV) { 3804 unless ($DB_ENV) {
3751 $DB_ENV = BDB::db_env_create; 3805 $DB_ENV = BDB::db_env_create;
3752 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3806 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3753 | 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;
3754 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3809 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3755 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3810 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3756 3811
3757 cf::sync_job { 3812 cf::sync_job {
3758 eval { 3813 eval {
… …
3784{ 3839{
3785 # configure IO::AIO 3840 # configure IO::AIO
3786 3841
3787 IO::AIO::min_parallel 8; 3842 IO::AIO::min_parallel 8;
3788 IO::AIO::max_poll_time $TICK * 0.1; 3843 IO::AIO::max_poll_time $TICK * 0.1;
3789 $Coro::AIO::WATCHER->priority (1); 3844 undef $AnyEvent::AIO::WATCHER;
3790} 3845}
3791 3846
3792my $_log_backtrace; 3847my $_log_backtrace;
3793 3848
3794sub _log_backtrace { 3849sub _log_backtrace {
… …
3797 $msg =~ s/\n//; 3852 $msg =~ s/\n//;
3798 3853
3799 # limit the # of concurrent backtraces 3854 # limit the # of concurrent backtraces
3800 if ($_log_backtrace < 2) { 3855 if ($_log_backtrace < 2) {
3801 ++$_log_backtrace; 3856 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg;
3802 async { 3858 async {
3803 $Coro::current->{desc} = "abt $msg"; 3859 $Coro::current->{desc} = "abt $msg";
3804 3860
3805 my @bt = fork_call { 3861 my @bt = fork_call {
3806 @addr = map { sprintf "%x", $_ } @addr; 3862 @addr = map { sprintf "%x", $_ } @addr;
… …
3817 } 3873 }
3818 3874
3819 @funcs 3875 @funcs
3820 }; 3876 };
3821 3877
3822 LOG llevInfo, "[ABT] $msg\n"; 3878 LOG llevInfo, "[ABT] $perl_bt\n";
3879 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3823 LOG llevInfo, "[ABT] $_\n" for @bt; 3880 LOG llevInfo, "[ABT] $_\n" for @bt;
3824 --$_log_backtrace; 3881 --$_log_backtrace;
3825 }; 3882 };
3826 } else { 3883 } else {
3827 LOG llevInfo, "[ABT] $msg\n"; 3884 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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