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

Diff Legend

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