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.410 by root, Tue Jan 15 12:02:24 2008 UTC vs.
Revision 1.443 by root, Sun Aug 31 10:05:26 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use EV 1.86; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
15use Coro 4.32 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
18use Coro::EV; 40use Coro::EV;
41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
23use Coro::BDB; 47use Coro::BDB 1.6;
24use Coro::Storable; 48use Coro::Storable;
25use Coro::Util (); 49use Coro::Util ();
26 50
27use JSON::XS 2.01 (); 51use JSON::XS 2.01 ();
28use BDB (); 52use BDB ();
29use Data::Dumper; 53use Data::Dumper;
30use Digest::MD5; 54use Digest::MD5;
31use Fcntl; 55use Fcntl;
32use YAML (); 56use YAML ();
33use IO::AIO 2.51 (); 57use IO::AIO ();
34use Time::HiRes; 58use Time::HiRes;
35use Compress::LZF; 59use Compress::LZF;
36use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
37 63
38# configure various modules to our taste 64# configure various modules to our taste
39# 65#
40$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
41Coro::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
… …
69our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE; 97our %RESOURCE;
72 98
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 101our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
79 103
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 107our $DB_ENV;
85 108
… …
96# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 121
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
102 126
103binmode STDOUT; 127binmode STDOUT;
104binmode STDERR; 128binmode STDERR;
105 129
106# read virtual server time, if available 130# read virtual server time, if available
… …
221for my $pkg (qw( 245for my $pkg (qw(
222 cf::global cf::attachable 246 cf::global cf::attachable
223 cf::object cf::object::player 247 cf::object cf::object::player
224 cf::client cf::player 248 cf::client cf::player
225 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
226 cf::map cf::party cf::region 251 cf::party cf::region
227)) { 252)) {
228 no strict 'refs';
229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
230} 254}
231 255
232$EV::DIED = sub { 256$EV::DIED = sub {
233 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
… …
339 363
340 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
341} 365}
342 366
343sub freeze_mainloop { 367sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
345 369
346 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 371}
352 372
353=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
354 374
355Like EV::periodic, but randomly selects a starting point so that the actions 375Like EV::periodic, but randomly selects a starting point so that the actions
… …
410 } 430 }
411 } 431 }
412}; 432};
413 433
414sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
415 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
416 438
417 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
419 441
… …
456 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
458 480
459 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
460 482
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
464 484
465 my $busy = 1; 485 my $busy = 1;
466 my @res; 486 my @res;
467 487
… …
478 } else { 498 } else {
479 EV::loop EV::LOOP_ONESHOT; 499 EV::loop EV::LOOP_ONESHOT;
480 } 500 }
481 } 501 }
482 502
483 $time = EV::time - $time; 503 my $time = EV::time - $time;
484 504
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
489 506
490 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
491 } else { 508 } else {
492 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
493 510
… …
535 reset_signals; 552 reset_signals;
536 &$cb 553 &$cb
537 }, @args; 554 }, @args;
538 555
539 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
540} 584}
541 585
542=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
543 587
544Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
1044 1088
1045sub reattach { 1089sub reattach {
1046 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1047 my ($obj) = @_; 1091 my ($obj) = @_;
1048 1092
1093 # no longer needed after getting rid of delete_package?
1049 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1050 1095
1051 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1052 1097
1053 @$registry = (); 1098 @$registry = ();
1054 1099
… …
1100 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1103 1148
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1108 close $fh; 1153 aio_close $fh;
1109 1154
1110 if (@$objs) { 1155 if (@$objs) {
1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1112 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1115 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1116 close $fh; 1161 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1163 }
1119 } else { 1164 } else {
1120 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1121 } 1166 }
… …
1290 1335
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1338
1294 $ext{source} = 1339 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1296 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1297 . $source 1342 . $source
1298 . "\n};\n1"; 1343 . "\n};\n1";
1299 1344
1300 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1316 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1317 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1318 1363
1319 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1320 warn $msg; 1365 warn $msg;
1321 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1322 exit 1;
1323 } 1367 }
1324 1368
1325 warn $msg; 1369 warn $msg;
1326 } 1370 }
1327 1371
… …
1416 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1417 or return; 1461 or return;
1418 1462
1419 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1420 or return; 1464 or return;
1465
1421 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1423 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1424 } 1469 }
1425 } 1470 }
… …
1435 1480
1436 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1437 1482
1438 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1439 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1440 1487
1441 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1442 cf::cede_to_tick; 1489 cf::cede_to_tick;
1443} 1490}
1444 1491
… …
1476 my ($pl) = @_; 1523 my ($pl) = @_;
1477 1524
1478 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1479 1526
1480 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1481 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1482 1529
1483 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1484 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1485 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1486 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1487 1536
1488 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1489 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1528 1577
1529 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1530 my $path = path $login; 1579 my $path = path $login;
1531 1580
1532 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1535 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1536 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 } 1587 }
1538 1588
… …
1575 1625
1576Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1577 1627
1578=cut 1628=cut
1579 1629
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1591sub expand_cfpod { 1630sub expand_cfpod {
1592 my ($self, $pod) = @_; 1631 my ($self, $pod) = @_;
1593 1632
1633 my @nest = [qr<\G$>, undef, ""];
1594 my $xml; 1634 my $xml;
1595 1635
1636 for ($pod) {
1596 while () { 1637 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) { 1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1598 $group = $1;
1599
1600 $group =~ s/&/&amp;/g;
1601 $group =~ s/</&lt;/g;
1602
1603 $xml .= $group; 1639 $xml .= $1;
1604 } elsif ($pod =~ m%\G 1640 } elsif (/\G\n(?=\S)/xgcs) {
1605 ([BCGHITU]) 1641 $xml .= " ";
1606 < 1642 } elsif (/\G\n/xgcs) {
1607 (?: 1643 $xml .= "\n";
1608 ([^<>]*) (?{ $group = $^N }) 1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1609 | < $interior > 1645 my ($code, $delim) = ($1, scalar reverse $2);
1610 ) 1646 $delim =~ y/</>/; # delim now contains the stop sequence
1611 > 1647 $delim = qr{\G\Q$delim};
1612 %gcsx
1613 ) {
1614 my ($code, $data) = ($1, $group);
1615 1648
1649 my $cb;
1650
1616 if ($code eq "B") { 1651 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>"; 1652 $cb = sub { "<b>$_[0]</b>" };
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") { 1653 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>"; 1654 $cb = sub { "<tt>$_[0]</tt>" };
1624 } elsif ($code eq "T") { 1655 } elsif ($code eq "E") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>"; 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1626 } elsif ($code eq "G") { 1657 } elsif ($code eq "G") {
1658 $cb = sub {
1627 my ($male, $female) = split /\|/, $data; 1659 my ($male, $female) = split /\|/, $_[0];
1628 $data = $self->gender ? $female : $male; 1660 $self->gender ? $female : $male
1629 $xml .= expand_cfpod ($self, $data); 1661 };
1630 } elsif ($code eq "H") { 1662 } elsif ($code eq "H") {
1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>", 1663 $cb = sub {
1664 (
1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1633 "") 1667 "",
1634 [$self->{hintmode}]; 1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1635 } else { 1699 } else {
1636 $xml .= "error processing '$code($data)' directive"; 1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1637 } 1707 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 } 1708 }
1642 last;
1643 }
1644 }
1645
1646 for ($xml) {
1647 # create single paragraphs (very hackish)
1648 s/(?<=\S)\n(?=\w)/ /g;
1649
1650 # compress some whitespace
1651 s/\s+\n/\n/g; # ws line-ends
1652 s/\n\n+/\n/g; # double lines
1653 s/^\n+//; # beginning lines
1654 s/\n+$//; # ending lines
1655 } 1709 }
1656 1710
1657 $xml 1711 $xml
1658} 1712}
1659
1660no re 'eval';
1661 1713
1662sub hintmode { 1714sub hintmode {
1663 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1664 $_[0]{hintmode} 1716 $_[0]{hintmode}
1665} 1717}
… …
1737our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1738our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1739 1791
1740sub generate_random_map { 1792sub generate_random_map {
1741 my ($self, $rmp) = @_; 1793 my ($self, $rmp) = @_;
1794
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796
1742 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1743 $self->_create_random_map ( 1798 $self->_create_random_map (
1744 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1745 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1746 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1868 1923
1869# the temporary/swap location 1924# the temporary/swap location
1870sub save_path { 1925sub save_path {
1871 my ($self) = @_; 1926 my ($self) = @_;
1872 1927
1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1874 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1875} 1930}
1876 1931
1877# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1878sub uniq_path { 1933sub uniq_path {
1879 my ($self) = @_; 1934 my ($self) = @_;
1880 1935
1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1882 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1883} 1938}
1884 1939
1885# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1886# all maps in C++... 1941# all maps in C++...
… …
1984 2039
1985 cf::lock_wait "map_data:$path";#d#remove 2040 cf::lock_wait "map_data:$path";#d#remove
1986 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
1987 2042
1988 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
1991 2046
1992 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
1993 or return; 2048 or return;
1994 2049
1995 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
… …
1998 or return; 2053 or return;
1999 2054
2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2001 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
2002 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
2003 undef $guard1; 2059 undef $guard1;
2004 undef $guard2;
2005 $map->reset; 2060 $map->reset;
2006 return find $path; 2061 return find $path;
2007 } 2062 }
2008 2063
2009 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
… …
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2091 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2092 $f->skip_block;
2038 $self->_load_objects ($f) 2093 $self->_load_objects ($f)
2039 or return; 2094 or return;
2040 2095
2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
2042 if delete $self->{load_original}; 2097 if delete $self->{load_original};
2043 2098
2044 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2100 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2101 unless (aio_stat $uniq) {
… …
2072 } 2127 }
2073 2128
2074 $self->{last_save} = $cf::RUNTIME; 2129 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2130 $self->last_access ($cf::RUNTIME);
2076 2131
2077 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2133 }
2079 2134
2080 $self->post_load; 2135 $self->post_load;
2081} 2136}
2082 2137
… …
2140 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
2141 2196
2142 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
2143 2198
2144 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2146 } 2201 }
2147 2202
2148 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
2149 2204
2150 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
… …
2187 cf::async { 2242 cf::async {
2188 $Coro::current->{desc} = "map player save"; 2243 $Coro::current->{desc} = "map player save";
2189 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2190 }; 2245 };
2191 2246
2247 cf::get_slot 0.02;
2248
2192 if ($uniq) { 2249 if ($uniq) {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2194 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2195 } else { 2252 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2204 $self->save; 2261 $self->save;
2205 2262
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2264
2208 return if $self->players; 2265 return if $self->players;
2209 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2211 2268
2212 $self->in_memory (cf::MAP_SWAPPED); 2269 $self->in_memory (cf::MAP_SWAPPED);
2213 2270
2214 $self->deactivate; 2271 $self->deactivate;
… …
2332 2389
2333sub unique_maps() { 2390sub unique_maps() {
2334 [ 2391 [
2335 map { 2392 map {
2336 utf8::decode $_; 2393 utf8::decode $_;
2337 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2338 ? normalise $_ 2397 : normalise $_
2339 : ()
2340 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2341 ] 2399 ]
2342} 2400}
2343 2401
2344package cf;
2345
2346=back 2402=back
2347 2403
2348=head3 cf::object 2404=head3 cf::object
2349 2405
2350=cut 2406=cut
… …
2353 2409
2354=over 4 2410=over 4
2355 2411
2356=item $ob->inv_recursive 2412=item $ob->inv_recursive
2357 2413
2358Returns the inventory of the object _and_ their inventories, recursively. 2414Returns the inventory of the object I<and> their inventories, recursively,
2415but I<not> the object itself.
2359 2416
2360=cut 2417=cut
2361 2418
2362sub inv_recursive_; 2419sub inv_recursive_;
2363sub inv_recursive_ { 2420sub inv_recursive_ {
… …
2368 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2369} 2426}
2370 2427
2371=item $ref = $ob->ref 2428=item $ref = $ob->ref
2372 2429
2373creates and returns a persistent reference to an objetc that can be stored as a string. 2430Creates and returns a persistent reference to an object that can be stored as a string.
2374 2431
2375=item $ob = cf::object::deref ($refstring) 2432=item $ob = cf::object::deref ($refstring)
2376 2433
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2434returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block. 2435even if the object actually exists. May block.
… …
2410can be C<undef>. Does the right thing when the player is currently in a 2467can be C<undef>. Does the right thing when the player is currently in a
2411dialogue with the given NPC character. 2468dialogue with the given NPC character.
2412 2469
2413=cut 2470=cut
2414 2471
2472our $SAY_CHANNEL = {
2473 id => "say",
2474 title => "Map",
2475 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2477};
2478
2479our $CHAT_CHANNEL = {
2480 id => "chat",
2481 title => "Chat",
2482 reply => "chat ",
2483 tooltip => "Player chat and shouts, global to the server.",
2484};
2485
2415# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2416# with dialog boxes. 2487# with dialog boxes.
2417#TODO: the first argument must go, split into a $npc->reply_to ( method 2488#TODO: the first argument must go, split into a $npc->reply_to ( method
2418sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2419 my ($self, $npc, $msg, $flags) = @_; 2490 my ($self, $npc, $msg, $flags) = @_;
… …
2430 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2431 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2502 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2432 2503
2433 } else { 2504 } else {
2434 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2435 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2436 } 2507 }
2437 } 2508 }
2438} 2509}
2439 2510
2440=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2547Moves the player to the given map-path and coordinates by first freezing 2618Moves the player to the given map-path and coordinates by first freezing
2548her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2549that has to return the map if sucecssful, and then unfreezes the player on 2620that has to return the map if sucecssful, and then unfreezes the player on
2550the new (success) or old (failed) map position. In either case, $done will 2621the new (success) or old (failed) map position. In either case, $done will
2551be called at the end of this process. 2622be called at the end of this process.
2623
2624Note that $check will be called with a potentially non-loaded map, so if
2625it needs a loaded map it has to call C<< ->load >>.
2552 2626
2553=cut 2627=cut
2554 2628
2555our $GOTOGEN; 2629our $GOTOGEN;
2556 2630
… …
2635} 2709}
2636 2710
2637sub prepare_random_map { 2711sub prepare_random_map {
2638 my ($exit) = @_; 2712 my ($exit) = @_;
2639 2713
2640 my $guard = cf::lock_acquire "exit_prepare:$exit";
2641
2642 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2643 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2644 # that depends on the exit object 2716 # that depends on the exit object
2645 2717
2646 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
… …
2648 if ($exit->map) { 2720 if ($exit->map) {
2649 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2650 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2651 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2652 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2653 } 2727 }
2654 2728
2655 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2656 2730
2657 my $data = cf::encode_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2658 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2659 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2660 2734
2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2662 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2663 undef $fh; 2737 undef $fh;
2664 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2665 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2666 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2667 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2668 } 2746 }
2669} 2747}
2670 2748
2671sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2672 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2673 2751
2674 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2675 2753
2676 if ($exit->slaying eq "/!") {
2677 #TODO: this should de-fi-ni-te-ly not be a sync-job
2678 # the problem is that $exit might not survive long enough
2679 # so it needs to be done right now, right here
2680 cf::sync_job { prepare_random_map $exit };
2681 }
2682
2683 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2684 my $hp = $exit->stats->hp;
2685 my $sp = $exit->stats->sp;
2686
2687 $self->enter_link; 2754 $self->enter_link;
2688 2755
2689 # if exit is damned, update players death & WoR home-position
2690 $self->contr->savebed ($slaying, $hp, $sp)
2691 if $exit->flag (FLAG_DAMNED);
2692
2693 (async { 2756 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2757 $Coro::current->{desc} = "enter_exit";
2695 2758
2696 $self->deactivate_recursive; # just to be sure
2697 unless (eval { 2759 unless (eval {
2760 $self->deactivate_recursive; # just to be sure
2761
2762 # random map handling
2763 {
2764 my $guard = cf::lock_acquire "exit_prepare:$exit";
2765
2766 prepare_random_map $exit
2767 if $exit->slaying eq "/!";
2768 }
2769
2770 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2771 my $x = $exit->stats->hp;
2772 my $y = $exit->stats->sp;
2773
2698 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2699 2775
2776 # if exit is damned, update players death & WoR home-position
2777 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED);
2779
2700 1; 2780 1
2701 }) { 2781 }) {
2702 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2703 . "I'll try to bring you back to the map you were before. " 2783 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2785 id => "infobox", 2865 id => "infobox",
2786 title => "Map Info", 2866 title => "Map Info",
2787 reply => undef, 2867 reply => undef,
2788 tooltip => "Information related to the maps", 2868 tooltip => "Information related to the maps",
2789 }, 2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2875 },
2790); 2876);
2791 2877
2792sub cf::client::send_msg { 2878sub cf::client::send_msg {
2793 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2794 2880
… …
2821 if ($self->can_msg) { 2907 if ($self->can_msg) {
2822 # default colour, mask it out 2908 # default colour, mask it out
2823 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2824 if $color & cf::NDI_DEF; 2910 if $color & cf::NDI_DEF;
2825 2911
2826 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2912 my $pkt = "msg "
2913 . $self->{json_coder}->encode (
2827 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2914 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2915 );
2916
2917 # try lzf for large packets
2918 $pkt = "lzf " . Compress::LZF::compress $pkt
2919 if 1024 <= length $pkt and $self->{can_lzf};
2920
2921 # split very large packets
2922 if (8192 < length $pkt and $self->{can_lzf}) {
2923 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2924 $pkt = "frag";
2925 }
2926
2927 $self->send_packet ($pkt);
2828 } else { 2928 } else {
2829 if ($color >= 0) { 2929 if ($color >= 0) {
2830 # replace some tags by gcfclient-compatible ones 2930 # replace some tags by gcfclient-compatible ones
2831 for ($msg) { 2931 for ($msg) {
2832 1 while 2932 1 while
… …
3031 3131
3032The following functions and methods are available within a safe environment: 3132The following functions and methods are available within a safe environment:
3033 3133
3034 cf::object 3134 cf::object
3035 contr pay_amount pay_player map x y force_find force_add destroy 3135 contr pay_amount pay_player map x y force_find force_add destroy
3036 insert remove name archname title slaying race decrease_ob_nr 3136 insert remove name archname title slaying race decrease split
3037 3137
3038 cf::object::player 3138 cf::object::player
3039 player 3139 player
3040 3140
3041 cf::player 3141 cf::player
… …
3046 3146
3047=cut 3147=cut
3048 3148
3049for ( 3149for (
3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3150 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3051 insert remove inv name archname title slaying race 3151 insert remove inv nrof name archname title slaying race
3052 decrease_ob_nr destroy)], 3152 decrease split destroy change_exp)],
3053 ["cf::object::player" => qw(player)], 3153 ["cf::object::player" => qw(player)],
3054 ["cf::player" => qw(peaceful)], 3154 ["cf::player" => qw(peaceful)],
3055 ["cf::map" => qw(trigger)], 3155 ["cf::map" => qw(trigger)],
3056) { 3156) {
3057 no strict 'refs'; 3157 no strict 'refs';
… …
3265 while (my ($k, $v) = each %$want) { 3365 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v); 3366 $ns->fx_want ($k, $v);
3267 } 3367 }
3268}; 3368};
3269 3369
3370sub load_resource_file($) {
3371 my $guard = lock_acquire "load_resource_file";
3372
3373 my $status = load_resource_file_ $_[0];
3374 get_slot 0.1, 100;
3375 cf::arch::commit_load;
3376
3377 $status
3378}
3379
3270sub reload_regions { 3380sub reload_regions {
3271 # HACK to clear player env face cache, we need some signal framework 3381 # HACK to clear player env face cache, we need some signal framework
3272 # for this (global event?) 3382 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = (); 3383 %ext::player_env::MUSIC_FACE_CACHE = ();
3274 3384
… …
3287} 3397}
3288 3398
3289sub reload_archetypes { 3399sub reload_archetypes {
3290 load_resource_file "$DATADIR/archetypes" 3400 load_resource_file "$DATADIR/archetypes"
3291 or die "unable to load archetypes\n"; 3401 or die "unable to load archetypes\n";
3292 #d# NEED to laod twice to resolve forward references
3293 # this really needs to be done in an extra post-pass
3294 # (which needs to be synchronous, so solve it differently)
3295 load_resource_file "$DATADIR/archetypes"
3296 or die "unable to load archetypes\n";
3297} 3402}
3298 3403
3299sub reload_treasures { 3404sub reload_treasures {
3300 load_resource_file "$DATADIR/treasures" 3405 load_resource_file "$DATADIR/treasures"
3301 or die "unable to load treasurelists\n"; 3406 or die "unable to load treasurelists\n";
3302} 3407}
3303 3408
3304sub reload_resources { 3409sub reload_resources {
3305 warn "reloading resource files...\n"; 3410 warn "reloading resource files...\n";
3306 3411
3412 reload_facedata;
3413 reload_archetypes;
3307 reload_regions; 3414 reload_regions;
3308 reload_facedata;
3309 #reload_archetypes;#d#
3310 reload_archetypes;
3311 reload_treasures; 3415 reload_treasures;
3312 3416
3313 warn "finished reloading resource files\n"; 3417 warn "finished reloading resource files\n";
3314} 3418}
3315 3419
3316sub init { 3420sub init {
3421 my $guard = freeze_mainloop;
3422
3423 evthread_start IO::AIO::poll_fileno;
3424
3317 reload_resources; 3425 reload_resources;
3318} 3426}
3319 3427
3320sub reload_config { 3428sub reload_config {
3321 open my $fh, "<:utf8", "$CONFDIR/config" 3429 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3346 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT; 3455 EV::loop EV::LOOP_ONESHOT;
3348 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3349 }; 3457 };
3350 3458
3459 {
3460 my $guard = freeze_mainloop;
3351 reload_config; 3461 reload_config;
3352 db_init; 3462 db_init;
3353 load_extensions; 3463 load_extensions;
3354 3464
3355 $TICK_WATCHER->start;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3466 }
3467
3357 EV::loop; 3468 EV::loop;
3358} 3469}
3359 3470
3360############################################################################# 3471#############################################################################
3361# initialisation and cleanup 3472# initialisation and cleanup
… …
3368 cf::cleanup "SIG$signal"; 3479 cf::cleanup "SIG$signal";
3369 }; 3480 };
3370 } 3481 }
3371} 3482}
3372 3483
3373sub write_runtime { 3484sub write_runtime_sync {
3374 my $runtime = "$LOCALDIR/runtime"; 3485 my $runtime = "$LOCALDIR/runtime";
3375 3486
3376 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
3377 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
3378 3489
… …
3404 and return; 3515 and return;
3405 3516
3406 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
3407 3518
3408 1 3519 1
3520}
3521
3522our $uuid_lock;
3523our $uuid_skip;
3524
3525sub write_uuid_sync($) {
3526 $uuid_skip ||= $_[0];
3527
3528 return if $uuid_lock;
3529 local $uuid_lock = 1;
3530
3531 my $uuid = "$LOCALDIR/uuid";
3532
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return;
3535
3536 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3537 $uuid_skip = 0;
3538
3539 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3540 and return;
3541
3542 # always fsync - this file is important
3543 aio_fsync $fh
3544 and return;
3545
3546 close $fh
3547 or return;
3548
3549 aio_rename "$uuid~", $uuid
3550 and return;
3551
3552 warn "uuid file written ($value).\n";
3553
3554 1
3555
3556}
3557
3558sub write_uuid($$) {
3559 my ($skip, $sync) = @_;
3560
3561 $sync ? write_uuid_sync $skip
3562 : async { write_uuid_sync $skip };
3409} 3563}
3410 3564
3411sub emergency_save() { 3565sub emergency_save() {
3412 my $freeze_guard = cf::freeze_mainloop; 3566 my $freeze_guard = cf::freeze_mainloop;
3413 3567
… …
3435 warn "end emergency map save\n"; 3589 warn "end emergency map save\n";
3436 3590
3437 warn "begin emergency database checkpoint\n"; 3591 warn "begin emergency database checkpoint\n";
3438 BDB::db_env_txn_checkpoint $DB_ENV; 3592 BDB::db_env_txn_checkpoint $DB_ENV;
3439 warn "end emergency database checkpoint\n"; 3593 warn "end emergency database checkpoint\n";
3594
3595 warn "begin write uuid\n";
3596 write_uuid_sync 1;
3597 warn "end write uuid\n";
3440 }; 3598 };
3441 3599
3442 warn "leave emergency perl save\n"; 3600 warn "leave emergency perl save\n";
3443} 3601}
3444 3602
… …
3446 my ($make_core) = @_; 3604 my ($make_core) = @_;
3447 3605
3448 warn Carp::longmess "post_cleanup backtrace" 3606 warn Carp::longmess "post_cleanup backtrace"
3449 if $make_core; 3607 if $make_core;
3450} 3608}
3609
3610# a safer delete_package, copied from Symbol
3611sub clear_package($) {
3612 my $pkg = shift;
3613
3614 # expand to full symbol table name if needed
3615 unless ($pkg =~ /^main::.*::$/) {
3616 $pkg = "main$pkg" if $pkg =~ /^::/;
3617 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3618 $pkg .= '::' unless $pkg =~ /::$/;
3619 }
3620
3621 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3622 my $stem_symtab = *{$stem}{HASH};
3623
3624 defined $stem_symtab and exists $stem_symtab->{$leaf}
3625 or return;
3626
3627 # clear all symbols
3628 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3629 for my $name (keys %$leaf_symtab) {
3630 _gv_clear *{"$pkg$name"};
3631# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3632 }
3633 warn "cleared package #$pkg\n";#d#
3634}
3635
3636our $RELOAD; # how many times to reload
3451 3637
3452sub do_reload_perl() { 3638sub do_reload_perl() {
3453 # can/must only be called in main 3639 # can/must only be called in main
3454 if ($Coro::current != $Coro::main) { 3640 if ($Coro::current != $Coro::main) {
3455 warn "can only reload from main coroutine"; 3641 warn "can only reload from main coroutine";
3456 return; 3642 return;
3457 } 3643 }
3458 3644
3645 return if $RELOAD++;
3646
3647 while ($RELOAD) {
3459 warn "reloading..."; 3648 warn "reloading...";
3460 3649
3461 warn "entering sync_job"; 3650 warn "entering sync_job";
3462 3651
3463 cf::sync_job { 3652 cf::sync_job {
3464 cf::write_runtime; # external watchdog should not bark 3653 cf::write_runtime_sync; # external watchdog should not bark
3465 cf::emergency_save; 3654 cf::emergency_save;
3466 cf::write_runtime; # external watchdog should not bark 3655 cf::write_runtime_sync; # external watchdog should not bark
3467 3656
3468 warn "syncing database to disk"; 3657 warn "syncing database to disk";
3469 BDB::db_env_txn_checkpoint $DB_ENV; 3658 BDB::db_env_txn_checkpoint $DB_ENV;
3470 3659
3471 # if anything goes wrong in here, we should simply crash as we already saved 3660 # if anything goes wrong in here, we should simply crash as we already saved
3472 3661
3473 warn "flushing outstanding aio requests"; 3662 warn "flushing outstanding aio requests";
3474 for (;;) {
3475 BDB::flush;
3476 IO::AIO::flush;
3477 Coro::cede_notself;
3478 last unless IO::AIO::nreqs || BDB::nreqs; 3663 while (IO::AIO::nreqs || BDB::nreqs) {
3479 warn "iterate..."; 3664 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3480 }
3481
3482 ++$RELOAD;
3483
3484 warn "cancelling all extension coros";
3485 $_->cancel for values %EXT_CORO;
3486 %EXT_CORO = ();
3487
3488 warn "removing commands";
3489 %COMMAND = ();
3490
3491 warn "removing ext/exti commands";
3492 %EXTCMD = ();
3493 %EXTICMD = ();
3494
3495 warn "unloading/nuking all extensions";
3496 for my $pkg (@EXTS) {
3497 warn "... unloading $pkg";
3498
3499 if (my $cb = $pkg->can ("unload")) {
3500 eval {
3501 $cb->($pkg);
3502 1
3503 } or warn "$pkg unloaded, but with errors: $@";
3504 } 3665 }
3505 3666
3506 warn "... nuking $pkg"; 3667 warn "cancelling all extension coros";
3507 Symbol::delete_package $pkg; 3668 $_->cancel for values %EXT_CORO;
3508 } 3669 %EXT_CORO = ();
3509 3670
3510 warn "unloading all perl modules loaded from $LIBDIR"; 3671 warn "removing commands";
3511 while (my ($k, $v) = each %INC) { 3672 %COMMAND = ();
3512 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3513 3673
3674 warn "removing ext/exti commands";
3675 %EXTCMD = ();
3676 %EXTICMD = ();
3677
3678 warn "unloading/nuking all extensions";
3679 for my $pkg (@EXTS) {
3514 warn "... unloading $k"; 3680 warn "... unloading $pkg";
3515 delete $INC{$k};
3516 3681
3517 $k =~ s/\.pm$//;
3518 $k =~ s/\//::/g;
3519
3520 if (my $cb = $k->can ("unload_module")) { 3682 if (my $cb = $pkg->can ("unload")) {
3683 eval {
3521 $cb->(); 3684 $cb->($pkg);
3685 1
3686 } or warn "$pkg unloaded, but with errors: $@";
3687 }
3688
3689 warn "... clearing $pkg";
3690 clear_package $pkg;
3522 } 3691 }
3523 3692
3524 Symbol::delete_package $k; 3693 warn "unloading all perl modules loaded from $LIBDIR";
3694 while (my ($k, $v) = each %INC) {
3695 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3696
3697 warn "... unloading $k";
3698 delete $INC{$k};
3699
3700 $k =~ s/\.pm$//;
3701 $k =~ s/\//::/g;
3702
3703 if (my $cb = $k->can ("unload_module")) {
3704 $cb->();
3705 }
3706
3707 clear_package $k;
3525 } 3708 }
3526 3709
3527 warn "getting rid of safe::, as good as possible"; 3710 warn "getting rid of safe::, as good as possible";
3528 Symbol::delete_package "safe::$_" 3711 clear_package "safe::$_"
3529 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3712 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3530 3713
3531 warn "unloading cf.pm \"a bit\""; 3714 warn "unloading cf.pm \"a bit\"";
3532 delete $INC{"cf.pm"}; 3715 delete $INC{"cf.pm"};
3533 delete $INC{"cf/pod.pm"}; 3716 delete $INC{"cf/pod.pm"};
3534 3717
3535 # don't, removes xs symbols, too, 3718 # don't, removes xs symbols, too,
3536 # and global variables created in xs 3719 # and global variables created in xs
3537 #Symbol::delete_package __PACKAGE__; 3720 #clear_package __PACKAGE__;
3538 3721
3539 warn "unload completed, starting to reload now"; 3722 warn "unload completed, starting to reload now";
3540 3723
3541 warn "reloading cf.pm"; 3724 warn "reloading cf.pm";
3542 require cf; 3725 require cf;
3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3726 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3544 3727
3545 warn "loading config and database again"; 3728 warn "loading config and database again";
3546 cf::reload_config; 3729 cf::reload_config;
3547 3730
3548 warn "loading extensions"; 3731 warn "loading extensions";
3549 cf::load_extensions; 3732 cf::load_extensions;
3550 3733
3551 warn "reattaching attachments to objects/players"; 3734 warn "reattaching attachments to objects/players";
3552 _global_reattach; # objects, sockets 3735 _global_reattach; # objects, sockets
3553 warn "reattaching attachments to maps"; 3736 warn "reattaching attachments to maps";
3554 reattach $_ for values %MAP; 3737 reattach $_ for values %MAP;
3555 warn "reattaching attachments to players"; 3738 warn "reattaching attachments to players";
3556 reattach $_ for values %PLAYER; 3739 reattach $_ for values %PLAYER;
3557 3740
3558 warn "leaving sync_job"; 3741 warn "leaving sync_job";
3559 3742
3560 1 3743 1
3561 } or do { 3744 } or do {
3562 warn $@; 3745 warn $@;
3563 warn "error while reloading, exiting."; 3746 cf::cleanup "error while reloading, exiting.";
3564 exit 1;
3565 }; 3747 };
3566 3748
3567 warn "reloaded"; 3749 warn "reloaded";
3750 --$RELOAD;
3751 }
3568}; 3752};
3569 3753
3570our $RELOAD_WATCHER; # used only during reload 3754our $RELOAD_WATCHER; # used only during reload
3571 3755
3572sub reload_perl() { 3756sub reload_perl() {
… …
3597 3781
3598our @WAIT_FOR_TICK; 3782our @WAIT_FOR_TICK;
3599our @WAIT_FOR_TICK_BEGIN; 3783our @WAIT_FOR_TICK_BEGIN;
3600 3784
3601sub wait_for_tick { 3785sub wait_for_tick {
3602 return unless $TICK_WATCHER->is_active;
3603 return if $Coro::current == $Coro::main; 3786 return if tick_inhibit || $Coro::current == $Coro::main;
3604 3787
3605 my $signal = new Coro::Signal; 3788 my $signal = new Coro::Signal;
3606 push @WAIT_FOR_TICK, $signal; 3789 push @WAIT_FOR_TICK, $signal;
3607 $signal->wait; 3790 $signal->wait;
3608} 3791}
3609 3792
3610sub wait_for_tick_begin { 3793sub wait_for_tick_begin {
3611 return unless $TICK_WATCHER->is_active;
3612 return if $Coro::current == $Coro::main; 3794 return if tick_inhibit || $Coro::current == $Coro::main;
3613 3795
3614 my $signal = new Coro::Signal; 3796 my $signal = new Coro::Signal;
3615 push @WAIT_FOR_TICK_BEGIN, $signal; 3797 push @WAIT_FOR_TICK_BEGIN, $signal;
3616 $signal->wait; 3798 $signal->wait;
3617} 3799}
3618 3800
3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3801sub tick {
3620 if ($Coro::current != $Coro::main) { 3802 if ($Coro::current != $Coro::main) {
3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3803 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3622 unless ++$bug_warning > 10; 3804 unless ++$bug_warning > 10;
3623 return; 3805 return;
3624 } 3806 }
3625 3807
3626 $NOW = $tick_start = EV::now;
3627
3628 cf::server_tick; # one server iteration 3808 cf::server_tick; # one server iteration
3629
3630 $RUNTIME += $TICK;
3631 $NEXT_TICK = $_[0]->at;
3632 3809
3633 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3810 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3811 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3635 Coro::async_pool { 3812 Coro::async_pool {
3636 $Coro::current->{desc} = "runtime saver"; 3813 $Coro::current->{desc} = "runtime saver";
3637 write_runtime 3814 write_runtime_sync
3638 or warn "ERROR: unable to write runtime file: $!"; 3815 or warn "ERROR: unable to write runtime file: $!";
3639 }; 3816 };
3640 } 3817 }
3641 3818
3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3819 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3644 } 3821 }
3645 while (my $sig = shift @WAIT_FOR_TICK) { 3822 while (my $sig = shift @WAIT_FOR_TICK) {
3646 $sig->send; 3823 $sig->send;
3647 } 3824 }
3648 3825
3649 $LOAD = ($NOW - $tick_start) / $TICK; 3826 $LOAD = ($NOW - $TICK_START) / $TICK;
3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3827 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3651 3828
3652 _post_tick; 3829 if (0) {
3653}; 3830 if ($NEXT_TICK) {
3654$TICK_WATCHER->priority (EV::MAXPRI); 3831 my $jitter = $TICK_START - $NEXT_TICK;
3832 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3833 warn "jitter $JITTER\n";#d#
3834 }
3835 }
3836}
3655 3837
3656{ 3838{
3657 # configure BDB 3839 # configure BDB
3658 3840
3659 BDB::min_parallel 8; 3841 BDB::min_parallel 8;
3660 BDB::max_poll_reqs $TICK * 0.1; 3842 BDB::max_poll_reqs $TICK * 0.1;
3661 $Coro::BDB::WATCHER->priority (1); 3843 $AnyEvent::BDB::WATCHER->priority (1);
3662 3844
3663 unless ($DB_ENV) { 3845 unless ($DB_ENV) {
3664 $DB_ENV = BDB::db_env_create; 3846 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3847 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3666 | BDB::LOG_AUTOREMOVE, 1); 3848 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3849 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3851 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3669 3852
3670 cf::sync_job { 3853 cf::sync_job {
3671 eval { 3854 eval {
… …
3697{ 3880{
3698 # configure IO::AIO 3881 # configure IO::AIO
3699 3882
3700 IO::AIO::min_parallel 8; 3883 IO::AIO::min_parallel 8;
3701 IO::AIO::max_poll_time $TICK * 0.1; 3884 IO::AIO::max_poll_time $TICK * 0.1;
3702 $Coro::AIO::WATCHER->priority (1); 3885 undef $AnyEvent::AIO::WATCHER;
3703} 3886}
3704 3887
3705my $_log_backtrace; 3888my $_log_backtrace;
3706 3889
3707sub _log_backtrace { 3890sub _log_backtrace {

Diff Legend

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