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.449 by root, Sat Sep 20 00:09:27 2008 UTC

… …
19# The authors can be reached via e-mail to <support@deliantra.net> 19# The authors can be reached via e-mail to <support@deliantra.net>
20# 20#
21 21
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict "vars", "subs";
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV 3.2; 31use EV;
31use Opcode; 32use Opcode;
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35 36
36use Coro 4.50 (); 37use Coro ();
37use Coro::State; 38use Coro::State;
38use Coro::Handle; 39use Coro::Handle;
39use Coro::EV; 40use Coro::EV;
41use Coro::AnyEvent;
40use Coro::Timer; 42use Coro::Timer;
41use Coro::Signal; 43use Coro::Signal;
42use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
43use Coro::AIO; 46use Coro::AIO;
44use Coro::BDB; 47use Coro::BDB 1.6;
45use Coro::Storable; 48use Coro::Storable;
46use Coro::Util (); 49use Coro::Util ();
47 50
48use JSON::XS 2.01 (); 51use JSON::XS 2.01 ();
49use BDB (); 52use BDB ();
50use Data::Dumper; 53use Data::Dumper;
51use Digest::MD5; 54use Digest::MD5;
52use Fcntl; 55use Fcntl;
53use YAML (); 56use YAML ();
54use IO::AIO 2.51 (); 57use IO::AIO ();
55use Time::HiRes; 58use Time::HiRes;
56use Compress::LZF; 59use Compress::LZF;
57use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
58 63
59# configure various modules to our taste 64# configure various modules to our taste
60# 65#
61$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
66 74
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 76
69our %COMMAND = (); 77our %COMMAND = ();
70our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
… …
76our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
77 85
78our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far
79our @EVENT; 87our @EVENT;
80 88
81our $CONFDIR = confdir; 89our $CONFDIR = confdir;
82our $DATADIR = datadir; 90our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
92our %RESOURCE; 103our %RESOURCE;
93 104
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 107our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
99 109
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 110our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 111our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 112our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 113our $DB_ENV;
105 114
… …
123 132
124binmode STDOUT; 133binmode STDOUT;
125binmode STDERR; 134binmode STDERR;
126 135
127# read virtual server time, if available 136# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 137unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 138 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 139 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 140 $RUNTIME = <$fh> + 0.;
132} 141}
133 142
134mkdir $_ 143mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
242for my $pkg (qw( 251for my $pkg (qw(
243 cf::global cf::attachable 252 cf::global cf::attachable
244 cf::object cf::object::player 253 cf::object cf::object::player
245 cf::client cf::player 254 cf::client cf::player
246 cf::arch cf::living 255 cf::arch cf::living
256 cf::map cf::mapspace
247 cf::map cf::party cf::region 257 cf::party cf::region
248)) { 258)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 260}
252 261
253$EV::DIED = sub { 262$EV::DIED = sub {
254 warn "error in event callback: @_"; 263 warn "error in event callback: @_";
… …
427 } 436 }
428 } 437 }
429}; 438};
430 439
431sub get_slot($;$$) { 440sub get_slot($;$$) {
432 return if tick_inhibit; 441 return if tick_inhibit || $Coro::current == $Coro::main;
433 442
434 my ($time, $pri, $name) = @_; 443 my ($time, $pri, $name) = @_;
435 444
436 $time = $TICK * .6 if $time > $TICK * .6; 445 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal; 446 my $sig = new Coro::Signal;
… …
724 733
725############################################################################# 734#############################################################################
726 735
727=head2 ATTACHABLE OBJECTS 736=head2 ATTACHABLE OBJECTS
728 737
729Many objects in crossfire are so-called attachable objects. That means you can 738Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 739attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 740to it. All such attachable objects support the following methods.
732 741
733In the following description, CLASS can be any of C<global>, C<object> 742In 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 743C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
784=item cf::CLASS::attachment $name, ... 793=item cf::CLASS::attachment $name, ...
785 794
786Register an attachment by C<$name> through which attachable objects of the 795Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 796given CLASS can refer to this attachment.
788 797
789Some classes such as crossfire maps and objects can specify attachments 798Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 799that are attached at load/instantiate time, thus the need for a name.
791 800
792These calls expect any number of the following handler/hook descriptions: 801These calls expect any number of the following handler/hook descriptions:
793 802
794=over 4 803=over 4
… …
1085 1094
1086sub reattach { 1095sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1096 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1097 my ($obj) = @_;
1089 1098
1099 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1100 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1101
1092 my $registry = $obj->registry; 1102 my $registry = $obj->registry;
1093 1103
1094 @$registry = (); 1104 @$registry = ();
1095 1105
… …
1141 utf8::decode (my $decname = $filename); 1151 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1152 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1153 $decname, length $$rdata, scalar @$objs;
1144 1154
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1158 aio_fsync $fh if $cf::USE_FSYNC;
1149 close $fh; 1159 aio_close $fh;
1150 1160
1151 if (@$objs) { 1161 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1162 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1163 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1165 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1166 aio_fsync $fh if $cf::USE_FSYNC;
1157 close $fh; 1167 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1168 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1169 }
1160 } else { 1170 } else {
1161 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
1162 } 1172 }
… …
1331 1341
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1344
1335 $ext{source} = 1345 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1347 . "#line 1 \"$path\"\n{\n"
1338 . $source 1348 . $source
1339 . "\n};\n1"; 1349 . "\n};\n1";
1340 1350
1341 $todo{$base} = \%ext; 1351 $todo{$base} = \%ext;
… …
1381 1391
1382=back 1392=back
1383 1393
1384=head2 CORE EXTENSIONS 1394=head2 CORE EXTENSIONS
1385 1395
1386Functions and methods that extend core crossfire objects. 1396Functions and methods that extend core deliantra objects.
1387 1397
1388=cut 1398=cut
1389 1399
1390package cf::player; 1400package cf::player;
1391 1401
… …
1456 my $f = new_from_file cf::object::thawer path $login 1466 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1467 or return;
1458 1468
1459 my $pl = cf::player::load_pl $f 1469 my $pl = cf::player::load_pl $f
1460 or return; 1470 or return;
1471
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1472 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1473 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1474 $cf::PLAYER{$login} = $pl
1464 } 1475 }
1465 } 1476 }
… …
1518 my ($pl) = @_; 1529 my ($pl) = @_;
1519 1530
1520 my $name = $pl->ob->name; 1531 my $name = $pl->ob->name;
1521 1532
1522 $pl->{deny_save} = 1; 1533 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1534 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1535
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1537 $pl->deactivate;
1538 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1539 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1540 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1541 $pl->ns->destroy if $pl->ns;
1529 1542
1530 my $path = playerdir $pl; 1543 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1544 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1570 1583
1571 for my $login (@$dirs) { 1584 for my $login (@$dirs) {
1572 my $path = path $login; 1585 my $path = path $login;
1573 1586
1574 # a .pst is a dead give-away for a valid player 1587 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1588 # if no pst file found, open and chekc for blocked users
1589 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1590 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1591 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1592 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1593 }
1580 1594
… …
1611 } 1625 }
1612 1626
1613 \@paths 1627 \@paths
1614} 1628}
1615 1629
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1630=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1631
1618Expand crossfire pod fragments into protocol xml. 1632Expand 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 1633
1709=item $player->ext_reply ($msgid, @msg) 1634=item $player->ext_reply ($msgid, @msg)
1710 1635
1711Sends an ext reply to the player. 1636Sends an ext reply to the player.
1712 1637
… …
2029 1954
2030 cf::lock_wait "map_data:$path";#d#remove 1955 cf::lock_wait "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
2032 1957
2033 $cf::MAP{$path} || do { 1958 $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 1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
2036 1961
2037 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
2038 or return; 1963 or return;
2039 1964
2040 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
… …
2043 or return; 1968 or return;
2044 1969
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
2048 undef $guard1; 1974 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 1975 $map->reset;
2051 return find $path; 1976 return find $path;
2052 } 1977 }
2053 1978
2054 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
… …
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2007 $f->skip_block;
2083 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
2084 or return; 2009 or return;
2085 2010
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
2087 if delete $self->{load_original}; 2012 if delete $self->{load_original};
2088 2013
2089 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2015 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
… …
2457can be C<undef>. Does the right thing when the player is currently in a 2382can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2383dialogue with the given NPC character.
2459 2384
2460=cut 2385=cut
2461 2386
2387our $SAY_CHANNEL = {
2388 id => "say",
2389 title => "Map",
2390 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2392};
2393
2394our $CHAT_CHANNEL = {
2395 id => "chat",
2396 title => "Chat",
2397 reply => "chat ",
2398 tooltip => "Player chat and shouts, global to the server.",
2399};
2400
2462# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2402# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2403#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2405 my ($self, $npc, $msg, $flags) = @_;
… …
2477 my $dialog = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2418
2480 } else { 2419 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2422 }
2484 } 2423 }
2485} 2424}
2486 2425
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2426=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2512 2451
2513=item $player_object->enter_link 2452=item $player_object->enter_link
2514 2453
2515Freezes the player and moves him/her to a special map (C<{link}>). 2454Freezes the player and moves him/her to a special map (C<{link}>).
2516 2455
2517The player should be reasonably safe there for short amounts of time. You 2456The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2457for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link
2459map.
2519 2460
2520Will never block. 2461Will never block.
2521 2462
2522=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2523 2464
… …
2581 2522
2582 $map->load; 2523 $map->load;
2583 $map->load_neighbours; 2524 $map->load_neighbours;
2584 2525
2585 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2586 $self->activate_recursive; 2528 $self->activate_recursive;
2587 2529
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2590} 2532}
… …
2594Moves the player to the given map-path and coordinates by first freezing 2536Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2538that 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 2539the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2540be called at the end of this process.
2541
2542Note that $check will be called with a potentially non-loaded map, so if
2543it needs a loaded map it has to call C<< ->load >>.
2599 2544
2600=cut 2545=cut
2601 2546
2602our $GOTOGEN; 2547our $GOTOGEN;
2603 2548
… …
2682} 2627}
2683 2628
2684sub prepare_random_map { 2629sub prepare_random_map {
2685 my ($exit) = @_; 2630 my ($exit) = @_;
2686 2631
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2634 # that depends on the exit object
2692 2635
2693 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
… …
2695 if ($exit->map) { 2638 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2700 } 2645 }
2701 2646
2702 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2703 2648
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2655 undef $fh;
2711 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2712 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2715 } 2664 }
2716} 2665}
2717 2666
2718sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2720 2669
2721 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2722 2671
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; 2672 $self->enter_link;
2735 2673
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 { 2674 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2675 $Coro::current->{desc} = "enter_exit";
2742 2676
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2677 unless (eval {
2678 $self->deactivate_recursive; # just to be sure
2679
2680 # random map handling
2681 {
2682 my $guard = cf::lock_acquire "exit_prepare:$exit";
2683
2684 prepare_random_map $exit
2685 if $exit->slaying eq "/!";
2686 }
2687
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2689 my $x = $exit->stats->hp;
2690 my $y = $exit->stats->sp;
2691
2745 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2746 2693
2694 # if exit is damned, update players death & WoR home-position
2695 $self->contr->savebed ($map, $x, $y)
2696 if $exit->flag (cf::FLAG_DAMNED);
2697
2747 1; 2698 1
2748 }) { 2699 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2701 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2704
2754 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
… …
2832 id => "infobox", 2783 id => "infobox",
2833 title => "Map Info", 2784 title => "Map Info",
2834 reply => undef, 2785 reply => undef,
2835 tooltip => "Information related to the maps", 2786 tooltip => "Information related to the maps",
2836 }, 2787 },
2788 "c/party" => {
2789 id => "party",
2790 title => "Party",
2791 reply => "gsay ",
2792 tooltip => "Messages and chat related to your party",
2793 },
2837); 2794);
2838 2795
2839sub cf::client::send_msg { 2796sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2797 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2798
2842 $msg = $self->pl->expand_cfpod ($msg); 2799 $msg = $self->pl->expand_cfpod ($msg)
2800 unless $color & cf::NDI_VERBATIM;
2843 2801
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 2802 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 2803
2846 # check predefined channels, for the benefit of C 2804 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 2805 if ($CHANNEL{$channel}) {
… …
2868 if ($self->can_msg) { 2826 if ($self->can_msg) {
2869 # default colour, mask it out 2827 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2828 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2829 if $color & cf::NDI_DEF;
2872 2830
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2831 my $pkt = "msg "
2832 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2833 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2834 );
2835
2836 # try lzf for large packets
2837 $pkt = "lzf " . Compress::LZF::compress $pkt
2838 if 1024 <= length $pkt and $self->{can_lzf};
2839
2840 # split very large packets
2841 if (8192 < length $pkt and $self->{can_lzf}) {
2842 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2843 $pkt = "frag";
2844 }
2845
2846 $self->send_packet ($pkt);
2875 } else { 2847 } else {
2876 if ($color >= 0) { 2848 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones 2849 # replace some tags by gcfclient-compatible ones
2878 for ($msg) { 2850 for ($msg) {
2879 1 while 2851 1 while
… …
3078 3050
3079The following functions and methods are available within a safe environment: 3051The following functions and methods are available within a safe environment:
3080 3052
3081 cf::object 3053 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3054 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3055 insert remove name archname title slaying race decrease split
3084 3056
3085 cf::object::player 3057 cf::object::player
3086 player 3058 player
3087 3059
3088 cf::player 3060 cf::player
… …
3093 3065
3094=cut 3066=cut
3095 3067
3096for ( 3068for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3069 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3070 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3071 decrease split destroy change_exp)],
3100 ["cf::object::player" => qw(player)], 3072 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3073 ["cf::player" => qw(peaceful)],
3102 ["cf::map" => qw(trigger)], 3074 ["cf::map" => qw(trigger)],
3103) { 3075) {
3104 no strict 'refs'; 3076 no strict 'refs';
… …
3312 while (my ($k, $v) = each %$want) { 3284 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3285 $ns->fx_want ($k, $v);
3314 } 3286 }
3315}; 3287};
3316 3288
3289sub load_resource_file($) {
3290 my $guard = lock_acquire "load_resource_file";
3291
3292 my $status = load_resource_file_ $_[0];
3293 get_slot 0.1, 100;
3294 cf::arch::commit_load;
3295
3296 $status
3297}
3298
3317sub reload_regions { 3299sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3300 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3301 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3302 %ext::player_env::MUSIC_FACE_CACHE = ();
3321 3303
… …
3334} 3316}
3335 3317
3336sub reload_archetypes { 3318sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3319 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3320 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} 3321}
3345 3322
3346sub reload_treasures { 3323sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3324 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3325 or die "unable to load treasurelists\n";
3349} 3326}
3350 3327
3351sub reload_resources { 3328sub reload_resources {
3352 warn "reloading resource files...\n"; 3329 warn "reloading resource files...\n";
3353 3330
3331 reload_facedata;
3332 reload_archetypes;
3354 reload_regions; 3333 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3334 reload_treasures;
3359 3335
3360 warn "finished reloading resource files\n"; 3336 warn "finished reloading resource files\n";
3361} 3337}
3362 3338
3363sub init { 3339sub init {
3340 my $guard = freeze_mainloop;
3341
3342 evthread_start IO::AIO::poll_fileno;
3343
3364 reload_resources; 3344 reload_resources;
3365} 3345}
3366 3346
3367sub reload_config { 3347sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3348 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3383 }; 3363 };
3384 warn $@ if $@; 3364 warn $@ if $@;
3385 } 3365 }
3386} 3366}
3387 3367
3368sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!";
3371 flock $fh, &Fcntl::LOCK_EX
3372 or die "$PIDFILE: flock: $!";
3373 $fh
3374}
3375
3376# make sure only one server instance is running at any one time
3377sub atomic {
3378 my $fh = pidfile;
3379
3380 my $pid = <$fh>;
3381 kill 9, $pid if $pid > 0;
3382
3383 seek $fh, 0, 0;
3384 print $fh $$;
3385}
3386
3388sub main { 3387sub main {
3388 atomic;
3389
3389 # we must not ever block the main coroutine 3390 # we must not ever block the main coroutine
3390 local $Coro::idle = sub { 3391 local $Coro::idle = sub {
3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3392 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3392 (async { 3393 (async {
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3394 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3395 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3396 })->prio (Coro::PRIO_MAX);
3396 }; 3397 };
3397 3398
3399 {
3400 my $guard = freeze_mainloop;
3398 reload_config; 3401 reload_config;
3399 db_init; 3402 db_init;
3400 load_extensions; 3403 load_extensions;
3401 3404
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3405 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno; 3406 }
3407
3408 utime time, time, $RUNTIMEFILE;
3409
3410 # no (long-running) fork's whatsoever before this point(!)
3411 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3412
3404 EV::loop; 3413 EV::loop;
3405} 3414}
3406 3415
3407############################################################################# 3416#############################################################################
3408# initialisation and cleanup 3417# initialisation and cleanup
… …
3416 }; 3425 };
3417 } 3426 }
3418} 3427}
3419 3428
3420sub write_runtime_sync { 3429sub write_runtime_sync {
3421 my $runtime = "$LOCALDIR/runtime";
3422
3423 # first touch the runtime file to show we are still running: 3430 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3431 # the fsync below can take a very very long time.
3425 3432
3426 IO::AIO::aio_utime $runtime, undef, undef; 3433 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3434
3428 my $guard = cf::lock_acquire "write_runtime"; 3435 my $guard = cf::lock_acquire "write_runtime";
3429 3436
3430 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3437 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3431 or return; 3438 or return;
3432 3439
3433 my $value = $cf::RUNTIME + 90 + 10; 3440 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3441 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3442 # 60 allows for the watchdog to kill the server.
… …
3445 aio_utime $fh, undef, undef; 3452 aio_utime $fh, undef, undef;
3446 3453
3447 close $fh 3454 close $fh
3448 or return; 3455 or return;
3449 3456
3450 aio_rename "$runtime~", $runtime 3457 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3458 and return;
3452 3459
3453 warn "runtime file written.\n"; 3460 warn "runtime file written.\n";
3454 3461
3455 1 3462 1
… …
3539sub post_cleanup { 3546sub post_cleanup {
3540 my ($make_core) = @_; 3547 my ($make_core) = @_;
3541 3548
3542 warn Carp::longmess "post_cleanup backtrace" 3549 warn Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3550 if $make_core;
3551
3552 my $fh = pidfile;
3553 unlink $PIDFILE if <$fh> == $$;
3544} 3554}
3555
3556# a safer delete_package, copied from Symbol
3557sub clear_package($) {
3558 my $pkg = shift;
3559
3560 # expand to full symbol table name if needed
3561 unless ($pkg =~ /^main::.*::$/) {
3562 $pkg = "main$pkg" if $pkg =~ /^::/;
3563 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3564 $pkg .= '::' unless $pkg =~ /::$/;
3565 }
3566
3567 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3568 my $stem_symtab = *{$stem}{HASH};
3569
3570 defined $stem_symtab and exists $stem_symtab->{$leaf}
3571 or return;
3572
3573 # clear all symbols
3574 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3575 for my $name (keys %$leaf_symtab) {
3576 _gv_clear *{"$pkg$name"};
3577# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3578 }
3579 warn "cleared package #$pkg\n";#d#
3580}
3581
3582our $RELOAD; # how many times to reload
3545 3583
3546sub do_reload_perl() { 3584sub do_reload_perl() {
3547 # can/must only be called in main 3585 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3586 if ($Coro::current != $Coro::main) {
3549 warn "can only reload from main coroutine"; 3587 warn "can only reload from main coroutine";
3550 return; 3588 return;
3551 } 3589 }
3552 3590
3591 return if $RELOAD++;
3592
3593 while ($RELOAD) {
3553 warn "reloading..."; 3594 warn "reloading...";
3554 3595
3555 warn "entering sync_job"; 3596 warn "entering sync_job";
3556 3597
3557 cf::sync_job { 3598 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark 3599 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3600 cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark 3601 cf::write_runtime_sync; # external watchdog should not bark
3561 3602
3562 warn "syncing database to disk"; 3603 warn "syncing database to disk";
3563 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3564 3605
3565 # if anything goes wrong in here, we should simply crash as we already saved 3606 # if anything goes wrong in here, we should simply crash as we already saved
3566 3607
3567 warn "flushing outstanding aio requests"; 3608 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; 3609 while (IO::AIO::nreqs || BDB::nreqs) {
3573 warn "iterate..."; 3610 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 } 3611 }
3599 3612
3600 warn "... nuking $pkg"; 3613 warn "cancelling all extension coros";
3601 Symbol::delete_package $pkg; 3614 $_->cancel for values %EXT_CORO;
3602 } 3615 %EXT_CORO = ();
3603 3616
3604 warn "unloading all perl modules loaded from $LIBDIR"; 3617 warn "removing commands";
3605 while (my ($k, $v) = each %INC) { 3618 %COMMAND = ();
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 3619
3620 warn "removing ext/exti commands";
3621 %EXTCMD = ();
3622 %EXTICMD = ();
3623
3624 warn "unloading/nuking all extensions";
3625 for my $pkg (@EXTS) {
3608 warn "... unloading $k"; 3626 warn "... unloading $pkg";
3609 delete $INC{$k};
3610 3627
3611 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g;
3613
3614 if (my $cb = $k->can ("unload_module")) { 3628 if (my $cb = $pkg->can ("unload")) {
3629 eval {
3615 $cb->(); 3630 $cb->($pkg);
3631 1
3632 } or warn "$pkg unloaded, but with errors: $@";
3633 }
3634
3635 warn "... clearing $pkg";
3636 clear_package $pkg;
3616 } 3637 }
3617 3638
3618 Symbol::delete_package $k; 3639 warn "unloading all perl modules loaded from $LIBDIR";
3640 while (my ($k, $v) = each %INC) {
3641 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3642
3643 warn "... unloading $k";
3644 delete $INC{$k};
3645
3646 $k =~ s/\.pm$//;
3647 $k =~ s/\//::/g;
3648
3649 if (my $cb = $k->can ("unload_module")) {
3650 $cb->();
3651 }
3652
3653 clear_package $k;
3619 } 3654 }
3620 3655
3621 warn "getting rid of safe::, as good as possible"; 3656 warn "getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 3657 clear_package "safe::$_"
3623 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3658 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3624 3659
3625 warn "unloading cf.pm \"a bit\""; 3660 warn "unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 3661 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 3662 delete $INC{"cf/pod.pm"};
3628 3663
3629 # don't, removes xs symbols, too, 3664 # don't, removes xs symbols, too,
3630 # and global variables created in xs 3665 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 3666 #clear_package __PACKAGE__;
3632 3667
3633 warn "unload completed, starting to reload now"; 3668 warn "unload completed, starting to reload now";
3634 3669
3635 warn "reloading cf.pm"; 3670 warn "reloading cf.pm";
3636 require cf; 3671 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3672 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3638 3673
3639 warn "loading config and database again"; 3674 warn "loading config and database again";
3640 cf::reload_config; 3675 cf::reload_config;
3641 3676
3642 warn "loading extensions"; 3677 warn "loading extensions";
3643 cf::load_extensions; 3678 cf::load_extensions;
3644 3679
3645 warn "reattaching attachments to objects/players"; 3680 warn "reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 3681 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 3682 warn "reattaching attachments to maps";
3648 reattach $_ for values %MAP; 3683 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 3684 warn "reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 3685 reattach $_ for values %PLAYER;
3651 3686
3652 warn "leaving sync_job"; 3687 warn "leaving sync_job";
3653 3688
3654 1 3689 1
3655 } or do { 3690 } or do {
3656 warn $@; 3691 warn $@;
3657 cf::cleanup "error while reloading, exiting."; 3692 cf::cleanup "error while reloading, exiting.";
3658 }; 3693 };
3659 3694
3660 warn "reloaded"; 3695 warn "reloaded";
3696 --$RELOAD;
3697 }
3661}; 3698};
3662 3699
3663our $RELOAD_WATCHER; # used only during reload 3700our $RELOAD_WATCHER; # used only during reload
3664 3701
3665sub reload_perl() { 3702sub reload_perl() {
… …
3690 3727
3691our @WAIT_FOR_TICK; 3728our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 3729our @WAIT_FOR_TICK_BEGIN;
3693 3730
3694sub wait_for_tick { 3731sub wait_for_tick {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 3732 return if tick_inhibit || $Coro::current == $Coro::main;
3697 3733
3698 my $signal = new Coro::Signal; 3734 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 3735 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 3736 $signal->wait;
3701} 3737}
3702 3738
3703sub wait_for_tick_begin { 3739sub wait_for_tick_begin {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
3706 3741
3707 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 3743 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 3744 $signal->wait;
3710} 3745}
… …
3749{ 3784{
3750 # configure BDB 3785 # configure BDB
3751 3786
3752 BDB::min_parallel 8; 3787 BDB::min_parallel 8;
3753 BDB::max_poll_reqs $TICK * 0.1; 3788 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 3789 $AnyEvent::BDB::WATCHER->priority (1);
3755 3790
3756 unless ($DB_ENV) { 3791 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 3792 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3793 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 3794 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3795 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 3798
3763 cf::sync_job { 3799 cf::sync_job {
3764 eval { 3800 eval {
… …
3790{ 3826{
3791 # configure IO::AIO 3827 # configure IO::AIO
3792 3828
3793 IO::AIO::min_parallel 8; 3829 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 3830 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 3831 undef $AnyEvent::AIO::WATCHER;
3796} 3832}
3797 3833
3798my $_log_backtrace; 3834my $_log_backtrace;
3799 3835
3800sub _log_backtrace { 3836sub _log_backtrace {
… …
3803 $msg =~ s/\n//; 3839 $msg =~ s/\n//;
3804 3840
3805 # limit the # of concurrent backtraces 3841 # limit the # of concurrent backtraces
3806 if ($_log_backtrace < 2) { 3842 if ($_log_backtrace < 2) {
3807 ++$_log_backtrace; 3843 ++$_log_backtrace;
3844 my $perl_bt = Carp::longmess $msg;
3808 async { 3845 async {
3809 $Coro::current->{desc} = "abt $msg"; 3846 $Coro::current->{desc} = "abt $msg";
3810 3847
3811 my @bt = fork_call { 3848 my @bt = fork_call {
3812 @addr = map { sprintf "%x", $_ } @addr; 3849 @addr = map { sprintf "%x", $_ } @addr;
… …
3823 } 3860 }
3824 3861
3825 @funcs 3862 @funcs
3826 }; 3863 };
3827 3864
3828 LOG llevInfo, "[ABT] $msg\n"; 3865 LOG llevInfo, "[ABT] $perl_bt\n";
3866 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829 LOG llevInfo, "[ABT] $_\n" for @bt; 3867 LOG llevInfo, "[ABT] $_\n" for @bt;
3830 --$_log_backtrace; 3868 --$_log_backtrace;
3831 }; 3869 };
3832 } else { 3870 } else {
3833 LOG llevInfo, "[ABT] $msg\n"; 3871 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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