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.413 by root, Sun Apr 6 16:13:20 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.32 (); 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
… …
547 reset_signals; 571 reset_signals;
548 &$cb 572 &$cb
549 }, @args; 573 }, @args;
550 574
551 wantarray ? @res : $res[-1] 575 wantarray ? @res : $res[-1]
576}
577
578=item $coin = coin_from_name $name
579
580=cut
581
582our %coin_alias = (
583 "silver" => "silvercoin",
584 "silvercoin" => "silvercoin",
585 "silvercoins" => "silvercoin",
586 "gold" => "goldcoin",
587 "goldcoin" => "goldcoin",
588 "goldcoins" => "goldcoin",
589 "platinum" => "platinacoin",
590 "platinumcoin" => "platinacoin",
591 "platinumcoins" => "platinacoin",
592 "platina" => "platinacoin",
593 "platinacoin" => "platinacoin",
594 "platinacoins" => "platinacoin",
595 "royalty" => "royalty",
596 "royalties" => "royalty",
597);
598
599sub coin_from_name($) {
600 $coin_alias{$_[0]}
601 ? cf::arch::find $coin_alias{$_[0]}
602 : undef
552} 603}
553 604
554=item $value = cf::db_get $family => $key 605=item $value = cf::db_get $family => $key
555 606
556Returns a single value from the environment database. 607Returns a single value from the environment database.
… …
695 746
696############################################################################# 747#############################################################################
697 748
698=head2 ATTACHABLE OBJECTS 749=head2 ATTACHABLE OBJECTS
699 750
700Many 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
701attach callbacks/event handlers (a collection of which is called an "attachment") 752attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 753to it. All such attachable objects support the following methods.
703 754
704In 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>
705C<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
… …
755=item cf::CLASS::attachment $name, ... 806=item cf::CLASS::attachment $name, ...
756 807
757Register an attachment by C<$name> through which attachable objects of the 808Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 809given CLASS can refer to this attachment.
759 810
760Some classes such as crossfire maps and objects can specify attachments 811Some classes such as deliantra maps and objects can specify attachments
761that 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.
762 813
763These calls expect any number of the following handler/hook descriptions: 814These calls expect any number of the following handler/hook descriptions:
764 815
765=over 4 816=over 4
… …
1056 1107
1057sub reattach { 1108sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1109 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1110 my ($obj) = @_;
1060 1111
1112 # no longer needed after getting rid of delete_package?
1061 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
1062 1114
1063 my $registry = $obj->registry; 1115 my $registry = $obj->registry;
1064 1116
1065 @$registry = (); 1117 @$registry = ();
1066 1118
… …
1112 utf8::decode (my $decname = $filename); 1164 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1165 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1166 $decname, length $$rdata, scalar @$objs;
1115 1167
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1169 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1171 aio_fsync $fh if $cf::USE_FSYNC;
1120 close $fh; 1172 aio_close $fh;
1121 1173
1122 if (@$objs) { 1174 if (@$objs) {
1123 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) {
1124 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1178 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1179 aio_fsync $fh if $cf::USE_FSYNC;
1128 close $fh; 1180 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1181 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1182 }
1131 } else { 1183 } else {
1132 aio_unlink "$filename.pst"; 1184 aio_unlink "$filename.pst";
1133 } 1185 }
… …
1302 1354
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1357
1306 $ext{source} = 1358 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1360 . "#line 1 \"$path\"\n{\n"
1309 . $source 1361 . $source
1310 . "\n};\n1"; 1362 . "\n};\n1";
1311 1363
1312 $todo{$base} = \%ext; 1364 $todo{$base} = \%ext;
… …
1352 1404
1353=back 1405=back
1354 1406
1355=head2 CORE EXTENSIONS 1407=head2 CORE EXTENSIONS
1356 1408
1357Functions and methods that extend core crossfire objects. 1409Functions and methods that extend core deliantra objects.
1358 1410
1359=cut 1411=cut
1360 1412
1361package cf::player; 1413package cf::player;
1362 1414
… …
1427 my $f = new_from_file cf::object::thawer path $login 1479 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1480 or return;
1429 1481
1430 my $pl = cf::player::load_pl $f 1482 my $pl = cf::player::load_pl $f
1431 or return; 1483 or return;
1484
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1485 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1486 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1487 $cf::PLAYER{$login} = $pl
1435 } 1488 }
1436 } 1489 }
… …
1446 1499
1447 return if $pl->{deny_save}; 1500 return if $pl->{deny_save};
1448 1501
1449 aio_mkdir playerdir $pl, 0770; 1502 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1503 $pl->{last_save} = $cf::RUNTIME;
1504
1505 cf::get_slot 0.01;
1451 1506
1452 $pl->save_pl ($path); 1507 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1508 cf::cede_to_tick;
1454} 1509}
1455 1510
… …
1487 my ($pl) = @_; 1542 my ($pl) = @_;
1488 1543
1489 my $name = $pl->ob->name; 1544 my $name = $pl->ob->name;
1490 1545
1491 $pl->{deny_save} = 1; 1546 $pl->{deny_save} = 1;
1492 $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
1493 1548
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1550 $pl->deactivate;
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1553 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1554 $pl->ns->destroy if $pl->ns;
1498 1555
1499 my $path = playerdir $pl; 1556 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1557 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1539 1596
1540 for my $login (@$dirs) { 1597 for my $login (@$dirs) {
1541 my $path = path $login; 1598 my $path = path $login;
1542 1599
1543 # a .pst is a dead give-away for a valid player 1600 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1601 # if no pst file found, open and chekc for blocked users
1602 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1603 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1604 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1605 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1606 }
1549 1607
… …
1580 } 1638 }
1581 1639
1582 \@paths 1640 \@paths
1583} 1641}
1584 1642
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1643=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1644
1587Expand crossfire pod fragments into protocol xml. 1645Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677 1646
1678=item $player->ext_reply ($msgid, @msg) 1647=item $player->ext_reply ($msgid, @msg)
1679 1648
1680Sends an ext reply to the player. 1649Sends an ext reply to the player.
1681 1650
… …
1748our $MAX_RESET = 3600; 1717our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1718our $DEFAULT_RESET = 3000;
1750 1719
1751sub generate_random_map { 1720sub generate_random_map {
1752 my ($self, $rmp) = @_; 1721 my ($self, $rmp) = @_;
1722
1723 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1724
1753 # mit "rum" bekleckern, nicht 1725 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1726 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1879 1851
1880# the temporary/swap location 1852# the temporary/swap location
1881sub save_path { 1853sub save_path {
1882 my ($self) = @_; 1854 my ($self) = @_;
1883 1855
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1856 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1857 "$TMPDIR/$path.map"
1886} 1858}
1887 1859
1888# the unique path, undef == no special unique path 1860# the unique path, undef == no special unique path
1889sub uniq_path { 1861sub uniq_path {
1890 my ($self) = @_; 1862 my ($self) = @_;
1891 1863
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1865 "$UNIQUEDIR/$path"
1894} 1866}
1895 1867
1896# and all this just because we cannot iterate over 1868# and all this just because we cannot iterate over
1897# all maps in C++... 1869# all maps in C++...
… …
1995 1967
1996 cf::lock_wait "map_data:$path";#d#remove 1968 cf::lock_wait "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 1969 cf::lock_wait "map_find:$path";
1998 1970
1999 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 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";
2002 1974
2003 my $map = new_from_path cf::map $path 1975 my $map = new_from_path cf::map $path
2004 or return; 1976 or return;
2005 1977
2006 $map->{last_save} = $cf::RUNTIME; 1978 $map->{last_save} = $cf::RUNTIME;
… …
2009 or return; 1981 or return;
2010 1982
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1983 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 1984 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 1985 #$cf::WAIT_FOR_TICK->wait;
1986 undef $guard2;
2014 undef $guard1; 1987 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 1988 $map->reset;
2017 return find $path; 1989 return find $path;
2018 } 1990 }
2019 1991
2020 $cf::MAP{$path} = $map 1992 $cf::MAP{$path} = $map
… …
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2019 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2020 $f->skip_block;
2049 $self->_load_objects ($f) 2021 $self->_load_objects ($f)
2050 or return; 2022 or return;
2051 2023
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2024 $self->post_load_original
2053 if delete $self->{load_original}; 2025 if delete $self->{load_original};
2054 2026
2055 if (my $uniq = $self->uniq_path) { 2027 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2028 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2029 unless (aio_stat $uniq) {
… …
2083 } 2055 }
2084 2056
2085 $self->{last_save} = $cf::RUNTIME; 2057 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2058 $self->last_access ($cf::RUNTIME);
2087 2059
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2060 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2061 }
2090 2062
2091 $self->post_load; 2063 $self->post_load;
2092} 2064}
2093 2065
… …
2151 my ($path, $origin, $load) = @_; 2123 my ($path, $origin, $load) = @_;
2152 2124
2153 $path = normalise $path, $origin && $origin->{path}; 2125 $path = normalise $path, $origin && $origin->{path};
2154 2126
2155 if (my $map = $cf::MAP{$path}) { 2127 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2128 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2129 }
2158 2130
2159 $MAP_PREFETCH{$path} |= $load; 2131 $MAP_PREFETCH{$path} |= $load;
2160 2132
2161 $MAP_PREFETCHER ||= cf::async { 2133 $MAP_PREFETCHER ||= cf::async {
… …
2198 cf::async { 2170 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2171 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2172 $_->contr->save for $self->players;
2201 }; 2173 };
2202 2174
2175 cf::get_slot 0.02;
2176
2203 if ($uniq) { 2177 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2178 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2179 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2180 } else {
2207 $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);
… …
2215 $self->save; 2189 $self->save;
2216 2190
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2191 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2192
2219 return if $self->players; 2193 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2194 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2195 return if $self->{deny_save};
2222 2196
2223 $self->in_memory (cf::MAP_SWAPPED); 2197 $self->in_memory (cf::MAP_SWAPPED);
2224 2198
2225 $self->deactivate; 2199 $self->deactivate;
… …
2343 2317
2344sub unique_maps() { 2318sub unique_maps() {
2345 [ 2319 [
2346 map { 2320 map {
2347 utf8::decode $_; 2321 utf8::decode $_;
2348 /\.map$/ 2322 s/\.map$//; # TODO future compatibility hack
2323 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2324 ? ()
2349 ? normalise $_ 2325 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2326 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2327 ]
2353} 2328}
2354 2329
2355package cf;
2356
2357=back 2330=back
2358 2331
2359=head3 cf::object 2332=head3 cf::object
2360 2333
2361=cut 2334=cut
… …
2364 2337
2365=over 4 2338=over 4
2366 2339
2367=item $ob->inv_recursive 2340=item $ob->inv_recursive
2368 2341
2369Returns the inventory of the object _and_ their inventories, recursively. 2342Returns the inventory of the object I<and> their inventories, recursively,
2343but I<not> the object itself.
2370 2344
2371=cut 2345=cut
2372 2346
2373sub inv_recursive_; 2347sub inv_recursive_;
2374sub inv_recursive_ { 2348sub inv_recursive_ {
… …
2379 inv_recursive_ inv $_[0] 2353 inv_recursive_ inv $_[0]
2380} 2354}
2381 2355
2382=item $ref = $ob->ref 2356=item $ref = $ob->ref
2383 2357
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2358Creates and returns a persistent reference to an object that can be stored as a string.
2385 2359
2386=item $ob = cf::object::deref ($refstring) 2360=item $ob = cf::object::deref ($refstring)
2387 2361
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2362returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2363even if the object actually exists. May block.
… …
2421can 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
2422dialogue with the given NPC character. 2396dialogue with the given NPC character.
2423 2397
2424=cut 2398=cut
2425 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
2426# rough implementation of a future "reply" method that works 2414# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2415# with dialog boxes.
2428#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
2429sub cf::object::player::reply($$$;$) { 2417sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2418 my ($self, $npc, $msg, $flags) = @_;
… …
2441 my $dialog = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2442 $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));
2443 2431
2444 } else { 2432 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2434 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2435 }
2448 } 2436 }
2449} 2437}
2450 2438
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2439=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2476 2464
2477=item $player_object->enter_link 2465=item $player_object->enter_link
2478 2466
2479Freezes 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}>).
2480 2468
2481The 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.
2482I<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.
2483 2473
2484Will never block. 2474Will never block.
2485 2475
2486=item $player_object->leave_link ($map, $x, $y) 2476=item $player_object->leave_link ($map, $x, $y)
2487 2477
… …
2545 2535
2546 $map->load; 2536 $map->load;
2547 $map->load_neighbours; 2537 $map->load_neighbours;
2548 2538
2549 return unless $self->contr->active; 2539 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2550 $self->activate_recursive; 2541 $self->activate_recursive;
2551 2542
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2544 $self->enter_map ($map, $x, $y);
2554} 2545}
… …
2558Moves 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
2559her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2560that 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
2561the 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
2562be 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 >>.
2563 2557
2564=cut 2558=cut
2565 2559
2566our $GOTOGEN; 2560our $GOTOGEN;
2567 2561
… …
2646} 2640}
2647 2641
2648sub prepare_random_map { 2642sub prepare_random_map {
2649 my ($exit) = @_; 2643 my ($exit) = @_;
2650 2644
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2645 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2646 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2647 # that depends on the exit object
2656 2648
2657 my $rmp = parse_random_map_params $exit->msg; 2649 my $rmp = parse_random_map_params $exit->msg;
… …
2659 if ($exit->map) { 2651 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2652 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2653 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2654 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2655 $rmp->{origin_y} = $exit->y;
2656
2657 $exit->map->touch;
2664 } 2658 }
2665 2659
2666 $rmp->{random_seed} ||= $exit->random_seed; 2660 $rmp->{random_seed} ||= $exit->random_seed;
2667 2661
2668 my $data = cf::encode_json $rmp; 2662 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2663 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2664 my $meta = "$RANDOMDIR/$md5.meta";
2671 2665
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2666 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2667 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2668 undef $fh;
2675 aio_rename "$meta~", $meta; 2669 aio_rename "$meta~", $meta;
2676 2670
2671 my $slaying = "?random/$md5";
2672
2673 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2674 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2675 $exit->msg (undef);
2676 }
2679 } 2677 }
2680} 2678}
2681 2679
2682sub cf::object::player::enter_exit { 2680sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2681 my ($self, $exit) = @_;
2684 2682
2685 return unless $self->type == cf::PLAYER; 2683 return unless $self->type == cf::PLAYER;
2686 2684
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2685 $self->enter_link;
2699 2686
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2687 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2688 $Coro::current->{desc} = "enter_exit";
2706 2689
2707 $self->deactivate_recursive; # just to be sure
2708 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
2709 $self->goto ($slaying, $hp, $sp); 2705 $self->goto ($map, $x, $y);
2710 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
2711 1; 2711 1
2712 }) { 2712 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "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. "
2715 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2717
2718 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
… …
2796 id => "infobox", 2796 id => "infobox",
2797 title => "Map Info", 2797 title => "Map Info",
2798 reply => undef, 2798 reply => undef,
2799 tooltip => "Information related to the maps", 2799 tooltip => "Information related to the maps",
2800 }, 2800 },
2801 "c/party" => {
2802 id => "party",
2803 title => "Party",
2804 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party",
2806 },
2801); 2807);
2802 2808
2803sub cf::client::send_msg { 2809sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2810 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2811
2806 $msg = $self->pl->expand_cfpod ($msg); 2812 $msg = $self->pl->expand_cfpod ($msg)
2813 unless $color & cf::NDI_VERBATIM;
2807 2814
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 2815 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 2816
2810 # check predefined channels, for the benefit of C 2817 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2818 if ($CHANNEL{$channel}) {
… …
2832 if ($self->can_msg) { 2839 if ($self->can_msg) {
2833 # default colour, mask it out 2840 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2842 if $color & cf::NDI_DEF;
2836 2843
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2844 my $pkt = "msg "
2845 . $self->{json_coder}->encode (
2838 [$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);
2839 } else { 2860 } else {
2840 if ($color >= 0) { 2861 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones 2862 # replace some tags by gcfclient-compatible ones
2842 for ($msg) { 2863 for ($msg) {
2843 1 while 2864 1 while
… …
3042 3063
3043The following functions and methods are available within a safe environment: 3064The following functions and methods are available within a safe environment:
3044 3065
3045 cf::object 3066 cf::object
3046 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
3047 insert remove name archname title slaying race decrease_ob_nr 3068 insert remove name archname title slaying race decrease split
3048 3069
3049 cf::object::player 3070 cf::object::player
3050 player 3071 player
3051 3072
3052 cf::player 3073 cf::player
… …
3057 3078
3058=cut 3079=cut
3059 3080
3060for ( 3081for (
3061 ["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
3062 insert remove inv name archname title slaying race 3083 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3084 decrease split destroy change_exp)],
3064 ["cf::object::player" => qw(player)], 3085 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3086 ["cf::player" => qw(peaceful)],
3066 ["cf::map" => qw(trigger)], 3087 ["cf::map" => qw(trigger)],
3067) { 3088) {
3068 no strict 'refs'; 3089 no strict 'refs';
… …
3276 while (my ($k, $v) = each %$want) { 3297 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3298 $ns->fx_want ($k, $v);
3278 } 3299 }
3279}; 3300};
3280 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
3281sub reload_regions { 3312sub reload_regions {
3282 # 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
3283 # for this (global event?) 3314 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3315 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3316
… …
3298} 3329}
3299 3330
3300sub reload_archetypes { 3331sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3332 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3333 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3334}
3309 3335
3310sub reload_treasures { 3336sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3337 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3338 or die "unable to load treasurelists\n";
3313} 3339}
3314 3340
3315sub reload_resources { 3341sub reload_resources {
3316 warn "reloading resource files...\n"; 3342 warn "reloading resource files...\n";
3317 3343
3344 reload_facedata;
3345 reload_archetypes;
3318 reload_regions; 3346 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3347 reload_treasures;
3323 3348
3324 warn "finished reloading resource files\n"; 3349 warn "finished reloading resource files\n";
3325} 3350}
3326 3351
3327sub init { 3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3328 reload_resources; 3357 reload_resources;
3329} 3358}
3330 3359
3331sub reload_config { 3360sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3361 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3347 }; 3376 };
3348 warn $@ if $@; 3377 warn $@ if $@;
3349 } 3378 }
3350} 3379}
3351 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
3352sub main { 3400sub main {
3401 atomic;
3402
3353 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
3355 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#
3356 (async { 3406 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3408 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
3360 }; 3410 };
3361 3411
3412 {
3413 my $guard = freeze_mainloop;
3362 reload_config; 3414 reload_config;
3363 db_init; 3415 db_init;
3364 load_extensions; 3416 load_extensions;
3365 3417
3366 $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
3367 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
3368 EV::loop; 3426 EV::loop;
3369} 3427}
3370 3428
3371############################################################################# 3429#############################################################################
3372# initialisation and cleanup 3430# initialisation and cleanup
… …
3379 cf::cleanup "SIG$signal"; 3437 cf::cleanup "SIG$signal";
3380 }; 3438 };
3381 } 3439 }
3382} 3440}
3383 3441
3384sub write_runtime { 3442sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime";
3386
3387 # first touch the runtime file to show we are still running: 3443 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3444 # the fsync below can take a very very long time.
3389 3445
3390 IO::AIO::aio_utime $runtime, undef, undef; 3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3447
3392 my $guard = cf::lock_acquire "write_runtime"; 3448 my $guard = cf::lock_acquire "write_runtime";
3393 3449
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3395 or return; 3451 or return;
3396 3452
3397 my $value = $cf::RUNTIME + 90 + 10; 3453 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3454 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3455 # 60 allows for the watchdog to kill the server.
… …
3409 aio_utime $fh, undef, undef; 3465 aio_utime $fh, undef, undef;
3410 3466
3411 close $fh 3467 close $fh
3412 or return; 3468 or return;
3413 3469
3414 aio_rename "$runtime~", $runtime 3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3471 and return;
3416 3472
3417 warn "runtime file written.\n"; 3473 warn "runtime file written.\n";
3418 3474
3419 1 3475 1
3476}
3477
3478our $uuid_lock;
3479our $uuid_skip;
3480
3481sub write_uuid_sync($) {
3482 $uuid_skip ||= $_[0];
3483
3484 return if $uuid_lock;
3485 local $uuid_lock = 1;
3486
3487 my $uuid = "$LOCALDIR/uuid";
3488
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return;
3491
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3493 $uuid_skip = 0;
3494
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return;
3497
3498 # always fsync - this file is important
3499 aio_fsync $fh
3500 and return;
3501
3502 close $fh
3503 or return;
3504
3505 aio_rename "$uuid~", $uuid
3506 and return;
3507
3508 warn "uuid file written ($value).\n";
3509
3510 1
3511
3512}
3513
3514sub write_uuid($$) {
3515 my ($skip, $sync) = @_;
3516
3517 $sync ? write_uuid_sync $skip
3518 : async { write_uuid_sync $skip };
3420} 3519}
3421 3520
3422sub emergency_save() { 3521sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3522 my $freeze_guard = cf::freeze_mainloop;
3424 3523
… …
3446 warn "end emergency map save\n"; 3545 warn "end emergency map save\n";
3447 3546
3448 warn "begin emergency database checkpoint\n"; 3547 warn "begin emergency database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3549 warn "end emergency database checkpoint\n";
3550
3551 warn "begin write uuid\n";
3552 write_uuid_sync 1;
3553 warn "end write uuid\n";
3451 }; 3554 };
3452 3555
3453 warn "leave emergency perl save\n"; 3556 warn "leave emergency perl save\n";
3454} 3557}
3455 3558
3456sub post_cleanup { 3559sub post_cleanup {
3457 my ($make_core) = @_; 3560 my ($make_core) = @_;
3458 3561
3459 warn Carp::longmess "post_cleanup backtrace" 3562 warn Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3563 if $make_core;
3564
3565 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$;
3461} 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
3462 3596
3463sub do_reload_perl() { 3597sub do_reload_perl() {
3464 # can/must only be called in main 3598 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3599 if ($Coro::current != $Coro::main) {
3466 warn "can only reload from main coroutine"; 3600 warn "can only reload from main coroutine";
3467 return; 3601 return;
3468 } 3602 }
3469 3603
3604 return if $RELOAD++;
3605
3606 while ($RELOAD) {
3470 warn "reloading..."; 3607 warn "reloading...";
3471 3608
3472 warn "entering sync_job"; 3609 warn "entering sync_job";
3473 3610
3474 cf::sync_job { 3611 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3612 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3613 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3614 cf::write_runtime_sync; # external watchdog should not bark
3478 3615
3479 warn "syncing database to disk"; 3616 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3617 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3618
3482 # 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
3483 3620
3484 warn "flushing outstanding aio requests"; 3621 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs; 3622 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = ();
3498
3499 warn "removing commands";
3500 %COMMAND = ();
3501
3502 warn "removing ext/exti commands";
3503 %EXTCMD = ();
3504 %EXTICMD = ();
3505
3506 warn "unloading/nuking all extensions";
3507 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg";
3509
3510 if (my $cb = $pkg->can ("unload")) {
3511 eval {
3512 $cb->($pkg);
3513 1
3514 } or warn "$pkg unloaded, but with errors: $@";
3515 } 3624 }
3516 3625
3517 warn "... nuking $pkg"; 3626 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3627 $_->cancel for values %EXT_CORO;
3519 } 3628 %EXT_CORO = ();
3520 3629
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3630 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3631 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3632
3633 warn "removing ext/exti commands";
3634 %EXTCMD = ();
3635 %EXTICMD = ();
3636
3637 warn "unloading/nuking all extensions";
3638 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3639 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3640
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3641 if (my $cb = $pkg->can ("unload")) {
3642 eval {
3532 $cb->(); 3643 $cb->($pkg);
3644 1
3645 } or warn "$pkg unloaded, but with errors: $@";
3646 }
3647
3648 warn "... clearing $pkg";
3649 clear_package $pkg;
3533 } 3650 }
3534 3651
3535 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;
3536 } 3667 }
3537 3668
3538 warn "getting rid of safe::, as good as possible"; 3669 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3670 clear_package "safe::$_"
3540 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);
3541 3672
3542 warn "unloading cf.pm \"a bit\""; 3673 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3674 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3675 delete $INC{"cf/pod.pm"};
3545 3676
3546 # don't, removes xs symbols, too, 3677 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3678 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3679 #clear_package __PACKAGE__;
3549 3680
3550 warn "unload completed, starting to reload now"; 3681 warn "unload completed, starting to reload now";
3551 3682
3552 warn "reloading cf.pm"; 3683 warn "reloading cf.pm";
3553 require cf; 3684 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3555 3686
3556 warn "loading config and database again"; 3687 warn "loading config and database again";
3557 cf::reload_config; 3688 cf::reload_config;
3558 3689
3559 warn "loading extensions"; 3690 warn "loading extensions";
3560 cf::load_extensions; 3691 cf::load_extensions;
3561 3692
3562 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
3568 3699
3569 warn "leaving sync_job"; 3700 warn "leaving sync_job";
3570 3701
3571 1 3702 1
3572 } or do { 3703 } or do {
3573 warn $@; 3704 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3705 cf::cleanup "error while reloading, exiting.";
3575 }; 3706 };
3576 3707
3577 warn "reloaded"; 3708 warn "reloaded";
3709 --$RELOAD;
3710 }
3578}; 3711};
3579 3712
3580our $RELOAD_WATCHER; # used only during reload 3713our $RELOAD_WATCHER; # used only during reload
3581 3714
3582sub reload_perl() { 3715sub reload_perl() {
… …
3607 3740
3608our @WAIT_FOR_TICK; 3741our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3742our @WAIT_FOR_TICK_BEGIN;
3610 3743
3611sub wait_for_tick { 3744sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3746
3615 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3748 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3749 $signal->wait;
3618} 3750}
3619 3751
3620sub wait_for_tick_begin { 3752sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3753 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3754
3624 my $signal = new Coro::Signal; 3755 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3756 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3757 $signal->wait;
3627} 3758}
… …
3637 3768
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3769 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3771 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3772 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3773 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3774 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3775 };
3645 } 3776 }
3646 3777
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3778 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3666{ 3797{
3667 # configure BDB 3798 # configure BDB
3668 3799
3669 BDB::min_parallel 8; 3800 BDB::min_parallel 8;
3670 BDB::max_poll_reqs $TICK * 0.1; 3801 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3802 $AnyEvent::BDB::WATCHER->priority (1);
3672 3803
3673 unless ($DB_ENV) { 3804 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3805 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3806 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | 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;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3809 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3810 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 3811
3680 cf::sync_job { 3812 cf::sync_job {
3681 eval { 3813 eval {
… …
3707{ 3839{
3708 # configure IO::AIO 3840 # configure IO::AIO
3709 3841
3710 IO::AIO::min_parallel 8; 3842 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 3843 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 3844 undef $AnyEvent::AIO::WATCHER;
3713} 3845}
3714 3846
3715my $_log_backtrace; 3847my $_log_backtrace;
3716 3848
3717sub _log_backtrace { 3849sub _log_backtrace {
… …
3720 $msg =~ s/\n//; 3852 $msg =~ s/\n//;
3721 3853
3722 # limit the # of concurrent backtraces 3854 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 3855 if ($_log_backtrace < 2) {
3724 ++$_log_backtrace; 3856 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg;
3725 async { 3858 async {
3726 $Coro::current->{desc} = "abt $msg"; 3859 $Coro::current->{desc} = "abt $msg";
3727 3860
3728 my @bt = fork_call { 3861 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 3862 @addr = map { sprintf "%x", $_ } @addr;
… …
3740 } 3873 }
3741 3874
3742 @funcs 3875 @funcs
3743 }; 3876 };
3744 3877
3745 LOG llevInfo, "[ABT] $msg\n"; 3878 LOG llevInfo, "[ABT] $perl_bt\n";
3879 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 3880 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 3881 --$_log_backtrace;
3748 }; 3882 };
3749 } else { 3883 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 3884 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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