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.414 by root, Thu Apr 10 09:10:45 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($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main;
442
432 my ($time, $pri, $name) = @_; 443 my ($time, $pri, $name) = @_;
433 444
434 $time = $TICK * .6 if $time > $TICK * .6; 445 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 446 my $sig = new Coro::Signal;
436 447
… …
547 reset_signals; 558 reset_signals;
548 &$cb 559 &$cb
549 }, @args; 560 }, @args;
550 561
551 wantarray ? @res : $res[-1] 562 wantarray ? @res : $res[-1]
563}
564
565=item $coin = coin_from_name $name
566
567=cut
568
569our %coin_alias = (
570 "silver" => "silvercoin",
571 "silvercoin" => "silvercoin",
572 "silvercoins" => "silvercoin",
573 "gold" => "goldcoin",
574 "goldcoin" => "goldcoin",
575 "goldcoins" => "goldcoin",
576 "platinum" => "platinacoin",
577 "platinumcoin" => "platinacoin",
578 "platinumcoins" => "platinacoin",
579 "platina" => "platinacoin",
580 "platinacoin" => "platinacoin",
581 "platinacoins" => "platinacoin",
582 "royalty" => "royalty",
583 "royalties" => "royalty",
584);
585
586sub coin_from_name($) {
587 $coin_alias{$_[0]}
588 ? cf::arch::find $coin_alias{$_[0]}
589 : undef
552} 590}
553 591
554=item $value = cf::db_get $family => $key 592=item $value = cf::db_get $family => $key
555 593
556Returns a single value from the environment database. 594Returns a single value from the environment database.
… …
695 733
696############################################################################# 734#############################################################################
697 735
698=head2 ATTACHABLE OBJECTS 736=head2 ATTACHABLE OBJECTS
699 737
700Many 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
701attach callbacks/event handlers (a collection of which is called an "attachment") 739attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 740to it. All such attachable objects support the following methods.
703 741
704In 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>
705C<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
… …
755=item cf::CLASS::attachment $name, ... 793=item cf::CLASS::attachment $name, ...
756 794
757Register an attachment by C<$name> through which attachable objects of the 795Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 796given CLASS can refer to this attachment.
759 797
760Some classes such as crossfire maps and objects can specify attachments 798Some classes such as deliantra maps and objects can specify attachments
761that 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.
762 800
763These calls expect any number of the following handler/hook descriptions: 801These calls expect any number of the following handler/hook descriptions:
764 802
765=over 4 803=over 4
… …
1056 1094
1057sub reattach { 1095sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1096 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1097 my ($obj) = @_;
1060 1098
1099 # no longer needed after getting rid of delete_package?
1061 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
1062 1101
1063 my $registry = $obj->registry; 1102 my $registry = $obj->registry;
1064 1103
1065 @$registry = (); 1104 @$registry = ();
1066 1105
… …
1112 utf8::decode (my $decname = $filename); 1151 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1152 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1153 $decname, length $$rdata, scalar @$objs;
1115 1154
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1158 aio_fsync $fh if $cf::USE_FSYNC;
1120 close $fh; 1159 aio_close $fh;
1121 1160
1122 if (@$objs) { 1161 if (@$objs) {
1123 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) {
1124 chmod SAVE_MODE, $fh; 1163 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1165 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1166 aio_fsync $fh if $cf::USE_FSYNC;
1128 close $fh; 1167 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1168 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1169 }
1131 } else { 1170 } else {
1132 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
1133 } 1172 }
… …
1302 1341
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1344
1306 $ext{source} = 1345 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1347 . "#line 1 \"$path\"\n{\n"
1309 . $source 1348 . $source
1310 . "\n};\n1"; 1349 . "\n};\n1";
1311 1350
1312 $todo{$base} = \%ext; 1351 $todo{$base} = \%ext;
… …
1352 1391
1353=back 1392=back
1354 1393
1355=head2 CORE EXTENSIONS 1394=head2 CORE EXTENSIONS
1356 1395
1357Functions and methods that extend core crossfire objects. 1396Functions and methods that extend core deliantra objects.
1358 1397
1359=cut 1398=cut
1360 1399
1361package cf::player; 1400package cf::player;
1362 1401
… …
1427 my $f = new_from_file cf::object::thawer path $login 1466 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1467 or return;
1429 1468
1430 my $pl = cf::player::load_pl $f 1469 my $pl = cf::player::load_pl $f
1431 or return; 1470 or return;
1471
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1472 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1473 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1474 $cf::PLAYER{$login} = $pl
1435 } 1475 }
1436 } 1476 }
… …
1446 1486
1447 return if $pl->{deny_save}; 1487 return if $pl->{deny_save};
1448 1488
1449 aio_mkdir playerdir $pl, 0770; 1489 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1490 $pl->{last_save} = $cf::RUNTIME;
1491
1492 cf::get_slot 0.01;
1451 1493
1452 $pl->save_pl ($path); 1494 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1495 cf::cede_to_tick;
1454} 1496}
1455 1497
… …
1487 my ($pl) = @_; 1529 my ($pl) = @_;
1488 1530
1489 my $name = $pl->ob->name; 1531 my $name = $pl->ob->name;
1490 1532
1491 $pl->{deny_save} = 1; 1533 $pl->{deny_save} = 1;
1492 $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
1493 1535
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1537 $pl->deactivate;
1538 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1539 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1540 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1541 $pl->ns->destroy if $pl->ns;
1498 1542
1499 my $path = playerdir $pl; 1543 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1544 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1539 1583
1540 for my $login (@$dirs) { 1584 for my $login (@$dirs) {
1541 my $path = path $login; 1585 my $path = path $login;
1542 1586
1543 # a .pst is a dead give-away for a valid player 1587 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1588 # if no pst file found, open and chekc for blocked users
1589 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1590 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1591 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1592 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1593 }
1549 1594
… …
1580 } 1625 }
1581 1626
1582 \@paths 1627 \@paths
1583} 1628}
1584 1629
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1630=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1631
1587Expand crossfire pod fragments into protocol xml. 1632Expand 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 1633
1678=item $player->ext_reply ($msgid, @msg) 1634=item $player->ext_reply ($msgid, @msg)
1679 1635
1680Sends an ext reply to the player. 1636Sends an ext reply to the player.
1681 1637
… …
1748our $MAX_RESET = 3600; 1704our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1705our $DEFAULT_RESET = 3000;
1750 1706
1751sub generate_random_map { 1707sub generate_random_map {
1752 my ($self, $rmp) = @_; 1708 my ($self, $rmp) = @_;
1709
1710 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1711
1753 # mit "rum" bekleckern, nicht 1712 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1713 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1879 1838
1880# the temporary/swap location 1839# the temporary/swap location
1881sub save_path { 1840sub save_path {
1882 my ($self) = @_; 1841 my ($self) = @_;
1883 1842
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1844 "$TMPDIR/$path.map"
1886} 1845}
1887 1846
1888# the unique path, undef == no special unique path 1847# the unique path, undef == no special unique path
1889sub uniq_path { 1848sub uniq_path {
1890 my ($self) = @_; 1849 my ($self) = @_;
1891 1850
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1852 "$UNIQUEDIR/$path"
1894} 1853}
1895 1854
1896# and all this just because we cannot iterate over 1855# and all this just because we cannot iterate over
1897# all maps in C++... 1856# all maps in C++...
… …
1995 1954
1996 cf::lock_wait "map_data:$path";#d#remove 1955 cf::lock_wait "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
1998 1957
1999 $cf::MAP{$path} || do { 1958 $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 1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
2002 1961
2003 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
2004 or return; 1963 or return;
2005 1964
2006 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
… …
2009 or return; 1968 or return;
2010 1969
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
2014 undef $guard1; 1974 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 1975 $map->reset;
2017 return find $path; 1976 return find $path;
2018 } 1977 }
2019 1978
2020 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
… …
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2007 $f->skip_block;
2049 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
2050 or return; 2009 or return;
2051 2010
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
2053 if delete $self->{load_original}; 2012 if delete $self->{load_original};
2054 2013
2055 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2015 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
… …
2083 } 2042 }
2084 2043
2085 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2045 $self->last_access ($cf::RUNTIME);
2087 2046
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2048 }
2090 2049
2091 $self->post_load; 2050 $self->post_load;
2092} 2051}
2093 2052
… …
2151 my ($path, $origin, $load) = @_; 2110 my ($path, $origin, $load) = @_;
2152 2111
2153 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
2154 2113
2155 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2116 }
2158 2117
2159 $MAP_PREFETCH{$path} |= $load; 2118 $MAP_PREFETCH{$path} |= $load;
2160 2119
2161 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
… …
2198 cf::async { 2157 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2158 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
2201 }; 2160 };
2202 2161
2162 cf::get_slot 0.02;
2163
2203 if ($uniq) { 2164 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2166 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2167 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2215 $self->save; 2176 $self->save;
2216 2177
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2179
2219 return if $self->players; 2180 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2181 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2222 2183
2223 $self->in_memory (cf::MAP_SWAPPED); 2184 $self->in_memory (cf::MAP_SWAPPED);
2224 2185
2225 $self->deactivate; 2186 $self->deactivate;
… …
2343 2304
2344sub unique_maps() { 2305sub unique_maps() {
2345 [ 2306 [
2346 map { 2307 map {
2347 utf8::decode $_; 2308 utf8::decode $_;
2348 /\.map$/ 2309 s/\.map$//; # TODO future compatibility hack
2310 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2311 ? ()
2349 ? normalise $_ 2312 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2313 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2314 ]
2353} 2315}
2354 2316
2355package cf;
2356
2357=back 2317=back
2358 2318
2359=head3 cf::object 2319=head3 cf::object
2360 2320
2361=cut 2321=cut
… …
2364 2324
2365=over 4 2325=over 4
2366 2326
2367=item $ob->inv_recursive 2327=item $ob->inv_recursive
2368 2328
2369Returns the inventory of the object _and_ their inventories, recursively. 2329Returns the inventory of the object I<and> their inventories, recursively,
2330but I<not> the object itself.
2370 2331
2371=cut 2332=cut
2372 2333
2373sub inv_recursive_; 2334sub inv_recursive_;
2374sub inv_recursive_ { 2335sub inv_recursive_ {
… …
2379 inv_recursive_ inv $_[0] 2340 inv_recursive_ inv $_[0]
2380} 2341}
2381 2342
2382=item $ref = $ob->ref 2343=item $ref = $ob->ref
2383 2344
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2345Creates and returns a persistent reference to an object that can be stored as a string.
2385 2346
2386=item $ob = cf::object::deref ($refstring) 2347=item $ob = cf::object::deref ($refstring)
2387 2348
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2349returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2350even if the object actually exists. May block.
… …
2421can 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
2422dialogue with the given NPC character. 2383dialogue with the given NPC character.
2423 2384
2424=cut 2385=cut
2425 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
2426# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2402# with dialog boxes.
2428#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
2429sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2405 my ($self, $npc, $msg, $flags) = @_;
… …
2441 my $dialog = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2442 $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));
2443 2418
2444 } else { 2419 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2422 }
2448 } 2423 }
2449} 2424}
2450 2425
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2426=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2476 2451
2477=item $player_object->enter_link 2452=item $player_object->enter_link
2478 2453
2479Freezes 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}>).
2480 2455
2481The 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.
2482I<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.
2483 2460
2484Will never block. 2461Will never block.
2485 2462
2486=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2487 2464
… …
2545 2522
2546 $map->load; 2523 $map->load;
2547 $map->load_neighbours; 2524 $map->load_neighbours;
2548 2525
2549 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2550 $self->activate_recursive; 2528 $self->activate_recursive;
2551 2529
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2554} 2532}
… …
2558Moves 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
2559her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2560that 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
2561the 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
2562be 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 >>.
2563 2544
2564=cut 2545=cut
2565 2546
2566our $GOTOGEN; 2547our $GOTOGEN;
2567 2548
… …
2646} 2627}
2647 2628
2648sub prepare_random_map { 2629sub prepare_random_map {
2649 my ($exit) = @_; 2630 my ($exit) = @_;
2650 2631
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2634 # that depends on the exit object
2656 2635
2657 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
… …
2659 if ($exit->map) { 2638 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2664 } 2645 }
2665 2646
2666 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2667 2648
2668 my $data = cf::encode_json $rmp; 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2650 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2651 my $meta = "$RANDOMDIR/$md5.meta";
2671 2652
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2655 undef $fh;
2675 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2676 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2679 } 2664 }
2680} 2665}
2681 2666
2682sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2684 2669
2685 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2686 2671
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; 2672 $self->enter_link;
2699 2673
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 { 2674 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2675 $Coro::current->{desc} = "enter_exit";
2706 2676
2707 $self->deactivate_recursive; # just to be sure
2708 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
2709 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2710 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
2711 1; 2698 1
2712 }) { 2699 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "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. "
2715 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2704
2718 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
… …
2796 id => "infobox", 2783 id => "infobox",
2797 title => "Map Info", 2784 title => "Map Info",
2798 reply => undef, 2785 reply => undef,
2799 tooltip => "Information related to the maps", 2786 tooltip => "Information related to the maps",
2800 }, 2787 },
2788 "c/party" => {
2789 id => "party",
2790 title => "Party",
2791 reply => "gsay ",
2792 tooltip => "Messages and chat related to your party",
2793 },
2801); 2794);
2802 2795
2803sub cf::client::send_msg { 2796sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2797 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2798
2806 $msg = $self->pl->expand_cfpod ($msg); 2799 $msg = $self->pl->expand_cfpod ($msg)
2800 unless $color & cf::NDI_VERBATIM;
2807 2801
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 2802 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 2803
2810 # check predefined channels, for the benefit of C 2804 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2805 if ($CHANNEL{$channel}) {
… …
2832 if ($self->can_msg) { 2826 if ($self->can_msg) {
2833 # default colour, mask it out 2827 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2828 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2829 if $color & cf::NDI_DEF;
2836 2830
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2831 my $pkt = "msg "
2832 . $self->{json_coder}->encode (
2838 [$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);
2839 } else { 2847 } else {
2840 if ($color >= 0) { 2848 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones 2849 # replace some tags by gcfclient-compatible ones
2842 for ($msg) { 2850 for ($msg) {
2843 1 while 2851 1 while
… …
3042 3050
3043The following functions and methods are available within a safe environment: 3051The following functions and methods are available within a safe environment:
3044 3052
3045 cf::object 3053 cf::object
3046 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
3047 insert remove name archname title slaying race decrease_ob_nr 3055 insert remove name archname title slaying race decrease split
3048 3056
3049 cf::object::player 3057 cf::object::player
3050 player 3058 player
3051 3059
3052 cf::player 3060 cf::player
… …
3057 3065
3058=cut 3066=cut
3059 3067
3060for ( 3068for (
3061 ["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
3062 insert remove inv name archname title slaying race 3070 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3071 decrease split destroy change_exp)],
3064 ["cf::object::player" => qw(player)], 3072 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3073 ["cf::player" => qw(peaceful)],
3066 ["cf::map" => qw(trigger)], 3074 ["cf::map" => qw(trigger)],
3067) { 3075) {
3068 no strict 'refs'; 3076 no strict 'refs';
… …
3276 while (my ($k, $v) = each %$want) { 3284 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3285 $ns->fx_want ($k, $v);
3278 } 3286 }
3279}; 3287};
3280 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
3281sub reload_regions { 3299sub reload_regions {
3282 # 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
3283 # for this (global event?) 3301 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3302 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3303
… …
3298} 3316}
3299 3317
3300sub reload_archetypes { 3318sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3319 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3320 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} 3321}
3309 3322
3310sub reload_treasures { 3323sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3324 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3325 or die "unable to load treasurelists\n";
3313} 3326}
3314 3327
3315sub reload_resources { 3328sub reload_resources {
3316 warn "reloading resource files...\n"; 3329 warn "reloading resource files...\n";
3317 3330
3331 reload_facedata;
3332 reload_archetypes;
3318 reload_regions; 3333 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3334 reload_treasures;
3323 3335
3324 warn "finished reloading resource files\n"; 3336 warn "finished reloading resource files\n";
3325} 3337}
3326 3338
3327sub init { 3339sub init {
3340 my $guard = freeze_mainloop;
3341
3342 evthread_start IO::AIO::poll_fileno;
3343
3328 reload_resources; 3344 reload_resources;
3329} 3345}
3330 3346
3331sub reload_config { 3347sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3348 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3347 }; 3363 };
3348 warn $@ if $@; 3364 warn $@ if $@;
3349 } 3365 }
3350} 3366}
3351 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
3352sub main { 3387sub main {
3388 atomic;
3389
3353 # we must not ever block the main coroutine 3390 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3391 local $Coro::idle = sub {
3355 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#
3356 (async { 3393 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3394 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3395 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3396 })->prio (Coro::PRIO_MAX);
3360 }; 3397 };
3361 3398
3399 {
3400 my $guard = freeze_mainloop;
3362 reload_config; 3401 reload_config;
3363 db_init; 3402 db_init;
3364 load_extensions; 3403 load_extensions;
3365 3404
3366 $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
3367 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
3368 EV::loop; 3413 EV::loop;
3369} 3414}
3370 3415
3371############################################################################# 3416#############################################################################
3372# initialisation and cleanup 3417# initialisation and cleanup
… …
3379 cf::cleanup "SIG$signal"; 3424 cf::cleanup "SIG$signal";
3380 }; 3425 };
3381 } 3426 }
3382} 3427}
3383 3428
3384sub write_runtime { 3429sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime";
3386
3387 # first touch the runtime file to show we are still running: 3430 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3431 # the fsync below can take a very very long time.
3389 3432
3390 IO::AIO::aio_utime $runtime, undef, undef; 3433 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3434
3392 my $guard = cf::lock_acquire "write_runtime"; 3435 my $guard = cf::lock_acquire "write_runtime";
3393 3436
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3437 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3395 or return; 3438 or return;
3396 3439
3397 my $value = $cf::RUNTIME + 90 + 10; 3440 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3441 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3442 # 60 allows for the watchdog to kill the server.
… …
3409 aio_utime $fh, undef, undef; 3452 aio_utime $fh, undef, undef;
3410 3453
3411 close $fh 3454 close $fh
3412 or return; 3455 or return;
3413 3456
3414 aio_rename "$runtime~", $runtime 3457 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3458 and return;
3416 3459
3417 warn "runtime file written.\n"; 3460 warn "runtime file written.\n";
3418 3461
3419 1 3462 1
3463}
3464
3465our $uuid_lock;
3466our $uuid_skip;
3467
3468sub write_uuid_sync($) {
3469 $uuid_skip ||= $_[0];
3470
3471 return if $uuid_lock;
3472 local $uuid_lock = 1;
3473
3474 my $uuid = "$LOCALDIR/uuid";
3475
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return;
3478
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3480 $uuid_skip = 0;
3481
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return;
3484
3485 # always fsync - this file is important
3486 aio_fsync $fh
3487 and return;
3488
3489 close $fh
3490 or return;
3491
3492 aio_rename "$uuid~", $uuid
3493 and return;
3494
3495 warn "uuid file written ($value).\n";
3496
3497 1
3498
3499}
3500
3501sub write_uuid($$) {
3502 my ($skip, $sync) = @_;
3503
3504 $sync ? write_uuid_sync $skip
3505 : async { write_uuid_sync $skip };
3420} 3506}
3421 3507
3422sub emergency_save() { 3508sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3509 my $freeze_guard = cf::freeze_mainloop;
3424 3510
… …
3446 warn "end emergency map save\n"; 3532 warn "end emergency map save\n";
3447 3533
3448 warn "begin emergency database checkpoint\n"; 3534 warn "begin emergency database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3535 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3536 warn "end emergency database checkpoint\n";
3537
3538 warn "begin write uuid\n";
3539 write_uuid_sync 1;
3540 warn "end write uuid\n";
3451 }; 3541 };
3452 3542
3453 warn "leave emergency perl save\n"; 3543 warn "leave emergency perl save\n";
3454} 3544}
3455 3545
3456sub post_cleanup { 3546sub post_cleanup {
3457 my ($make_core) = @_; 3547 my ($make_core) = @_;
3458 3548
3459 warn Carp::longmess "post_cleanup backtrace" 3549 warn Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3550 if $make_core;
3551
3552 my $fh = pidfile;
3553 unlink $PIDFILE if <$fh> == $$;
3461} 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
3462 3583
3463sub do_reload_perl() { 3584sub do_reload_perl() {
3464 # can/must only be called in main 3585 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3586 if ($Coro::current != $Coro::main) {
3466 warn "can only reload from main coroutine"; 3587 warn "can only reload from main coroutine";
3467 return; 3588 return;
3468 } 3589 }
3469 3590
3591 return if $RELOAD++;
3592
3593 while ($RELOAD) {
3470 warn "reloading..."; 3594 warn "reloading...";
3471 3595
3472 warn "entering sync_job"; 3596 warn "entering sync_job";
3473 3597
3474 cf::sync_job { 3598 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3599 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3600 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3601 cf::write_runtime_sync; # external watchdog should not bark
3478 3602
3479 warn "syncing database to disk"; 3603 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3605
3482 # 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
3483 3607
3484 warn "flushing outstanding aio requests"; 3608 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; 3609 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3610 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 } 3611 }
3516 3612
3517 warn "... nuking $pkg"; 3613 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3614 $_->cancel for values %EXT_CORO;
3519 } 3615 %EXT_CORO = ();
3520 3616
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3617 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3618 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3619
3620 warn "removing ext/exti commands";
3621 %EXTCMD = ();
3622 %EXTICMD = ();
3623
3624 warn "unloading/nuking all extensions";
3625 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3626 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3627
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3628 if (my $cb = $pkg->can ("unload")) {
3629 eval {
3532 $cb->(); 3630 $cb->($pkg);
3631 1
3632 } or warn "$pkg unloaded, but with errors: $@";
3633 }
3634
3635 warn "... clearing $pkg";
3636 clear_package $pkg;
3533 } 3637 }
3534 3638
3535 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;
3536 } 3654 }
3537 3655
3538 warn "getting rid of safe::, as good as possible"; 3656 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3657 clear_package "safe::$_"
3540 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);
3541 3659
3542 warn "unloading cf.pm \"a bit\""; 3660 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3661 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3662 delete $INC{"cf/pod.pm"};
3545 3663
3546 # don't, removes xs symbols, too, 3664 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3665 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3666 #clear_package __PACKAGE__;
3549 3667
3550 warn "unload completed, starting to reload now"; 3668 warn "unload completed, starting to reload now";
3551 3669
3552 warn "reloading cf.pm"; 3670 warn "reloading cf.pm";
3553 require cf; 3671 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3672 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3555 3673
3556 warn "loading config and database again"; 3674 warn "loading config and database again";
3557 cf::reload_config; 3675 cf::reload_config;
3558 3676
3559 warn "loading extensions"; 3677 warn "loading extensions";
3560 cf::load_extensions; 3678 cf::load_extensions;
3561 3679
3562 warn "reattaching attachments to objects/players"; 3680 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3681 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3682 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3683 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3684 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3685 reattach $_ for values %PLAYER;
3568 3686
3569 warn "leaving sync_job"; 3687 warn "leaving sync_job";
3570 3688
3571 1 3689 1
3572 } or do { 3690 } or do {
3573 warn $@; 3691 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3692 cf::cleanup "error while reloading, exiting.";
3575 }; 3693 };
3576 3694
3577 warn "reloaded"; 3695 warn "reloaded";
3696 --$RELOAD;
3697 }
3578}; 3698};
3579 3699
3580our $RELOAD_WATCHER; # used only during reload 3700our $RELOAD_WATCHER; # used only during reload
3581 3701
3582sub reload_perl() { 3702sub reload_perl() {
… …
3607 3727
3608our @WAIT_FOR_TICK; 3728our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3729our @WAIT_FOR_TICK_BEGIN;
3610 3730
3611sub wait_for_tick { 3731sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3732 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3733
3615 my $signal = new Coro::Signal; 3734 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3735 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3736 $signal->wait;
3618} 3737}
3619 3738
3620sub wait_for_tick_begin { 3739sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3741
3624 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3743 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3744 $signal->wait;
3627} 3745}
… …
3637 3755
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3756 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3757 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3758 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3759 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3760 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3761 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3762 };
3645 } 3763 }
3646 3764
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3765 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3666{ 3784{
3667 # configure BDB 3785 # configure BDB
3668 3786
3669 BDB::min_parallel 8; 3787 BDB::min_parallel 8;
3670 BDB::max_poll_reqs $TICK * 0.1; 3788 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3789 $AnyEvent::BDB::WATCHER->priority (1);
3672 3790
3673 unless ($DB_ENV) { 3791 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3792 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3793 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | 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;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 3798
3680 cf::sync_job { 3799 cf::sync_job {
3681 eval { 3800 eval {
… …
3707{ 3826{
3708 # configure IO::AIO 3827 # configure IO::AIO
3709 3828
3710 IO::AIO::min_parallel 8; 3829 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 3830 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 3831 undef $AnyEvent::AIO::WATCHER;
3713} 3832}
3714 3833
3715my $_log_backtrace; 3834my $_log_backtrace;
3716 3835
3717sub _log_backtrace { 3836sub _log_backtrace {
… …
3720 $msg =~ s/\n//; 3839 $msg =~ s/\n//;
3721 3840
3722 # limit the # of concurrent backtraces 3841 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 3842 if ($_log_backtrace < 2) {
3724 ++$_log_backtrace; 3843 ++$_log_backtrace;
3844 my $perl_bt = Carp::longmess $msg;
3725 async { 3845 async {
3726 $Coro::current->{desc} = "abt $msg"; 3846 $Coro::current->{desc} = "abt $msg";
3727 3847
3728 my @bt = fork_call { 3848 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 3849 @addr = map { sprintf "%x", $_ } @addr;
… …
3740 } 3860 }
3741 3861
3742 @funcs 3862 @funcs
3743 }; 3863 };
3744 3864
3745 LOG llevInfo, "[ABT] $msg\n"; 3865 LOG llevInfo, "[ABT] $perl_bt\n";
3866 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 3867 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 3868 --$_log_backtrace;
3748 }; 3869 };
3749 } else { 3870 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 3871 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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