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.411 by root, Fri Feb 1 15:54:07 2008 UTC vs.
Revision 1.444 by root, Mon Sep 8 11:27:25 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;
… …
1415 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1416 or return; 1461 or return;
1417 1462
1418 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1419 or return; 1464 or return;
1465
1420 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1422 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1423 } 1469 }
1424 } 1470 }
… …
1434 1480
1435 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1436 1482
1437 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1438 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1439 1487
1440 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1441 cf::cede_to_tick; 1489 cf::cede_to_tick;
1442} 1490}
1443 1491
… …
1475 my ($pl) = @_; 1523 my ($pl) = @_;
1476 1524
1477 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1478 1526
1479 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1480 $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
1481 1529
1482 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1483 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1484 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1485 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1486 1536
1487 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1488 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1527 1577
1528 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1529 my $path = path $login; 1579 my $path = path $login;
1530 1580
1531 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1534 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1535 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 } 1587 }
1537 1588
… …
1572 1623
1573=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1574 1625
1575Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1576 1627
1577=cut
1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1590sub expand_cfpod {
1591 my ($self, $pod) = @_;
1592
1593 my $xml;
1594
1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1598
1599 $group =~ s/&/&amp;/g;
1600 $group =~ s/</&lt;/g;
1601
1602 $xml .= $group;
1603 } elsif ($pod =~ m%\G
1604 ([BCGHITU])
1605 <
1606 (?:
1607 ([^<>]*) (?{ $group = $^N })
1608 | < $interior >
1609 )
1610 >
1611 %gcsx
1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1632 "")
1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1644
1645 for ($xml) {
1646 # create single paragraphs (very hackish)
1647 s/(?<=\S)\n(?=\w)/ /g;
1648
1649 # compress some whitespace
1650 s/\s+\n/\n/g; # ws line-ends
1651 s/\n\n+/\n/g; # double lines
1652 s/^\n+//; # beginning lines
1653 s/\n+$//; # ending lines
1654 }
1655
1656 $xml
1657}
1658
1659no re 'eval';
1660
1661sub hintmode {
1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1663 $_[0]{hintmode}
1664}
1665
1666=item $player->ext_reply ($msgid, @msg) 1628=item $player->ext_reply ($msgid, @msg)
1667 1629
1668Sends an ext reply to the player. 1630Sends an ext reply to the player.
1669 1631
1670=cut 1632=cut
… …
1736our $MAX_RESET = 3600; 1698our $MAX_RESET = 3600;
1737our $DEFAULT_RESET = 3000; 1699our $DEFAULT_RESET = 3000;
1738 1700
1739sub generate_random_map { 1701sub generate_random_map {
1740 my ($self, $rmp) = @_; 1702 my ($self, $rmp) = @_;
1703
1704 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1705
1741 # mit "rum" bekleckern, nicht 1706 # mit "rum" bekleckern, nicht
1742 $self->_create_random_map ( 1707 $self->_create_random_map (
1743 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1708 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1744 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1709 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1745 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1710 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1867 1832
1868# the temporary/swap location 1833# the temporary/swap location
1869sub save_path { 1834sub save_path {
1870 my ($self) = @_; 1835 my ($self) = @_;
1871 1836
1872 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1837 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1873 "$TMPDIR/$path.map" 1838 "$TMPDIR/$path.map"
1874} 1839}
1875 1840
1876# the unique path, undef == no special unique path 1841# the unique path, undef == no special unique path
1877sub uniq_path { 1842sub uniq_path {
1878 my ($self) = @_; 1843 my ($self) = @_;
1879 1844
1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1845 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1881 "$UNIQUEDIR/$path" 1846 "$UNIQUEDIR/$path"
1882} 1847}
1883 1848
1884# and all this just because we cannot iterate over 1849# and all this just because we cannot iterate over
1885# all maps in C++... 1850# all maps in C++...
… …
1983 1948
1984 cf::lock_wait "map_data:$path";#d#remove 1949 cf::lock_wait "map_data:$path";#d#remove
1985 cf::lock_wait "map_find:$path"; 1950 cf::lock_wait "map_find:$path";
1986 1951
1987 $cf::MAP{$path} || do { 1952 $cf::MAP{$path} || do {
1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1954 my $guard2 = cf::lock_acquire "map_find:$path";
1990 1955
1991 my $map = new_from_path cf::map $path 1956 my $map = new_from_path cf::map $path
1992 or return; 1957 or return;
1993 1958
1994 $map->{last_save} = $cf::RUNTIME; 1959 $map->{last_save} = $cf::RUNTIME;
… …
1997 or return; 1962 or return;
1998 1963
1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1964 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2000 # doing this can freeze the server in a sync job, obviously 1965 # doing this can freeze the server in a sync job, obviously
2001 #$cf::WAIT_FOR_TICK->wait; 1966 #$cf::WAIT_FOR_TICK->wait;
1967 undef $guard2;
2002 undef $guard1; 1968 undef $guard1;
2003 undef $guard2;
2004 $map->reset; 1969 $map->reset;
2005 return find $path; 1970 return find $path;
2006 } 1971 }
2007 1972
2008 $cf::MAP{$path} = $map 1973 $cf::MAP{$path} = $map
… …
2035 my $f = new_from_file cf::object::thawer $self->{load_path}; 2000 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block; 2001 $f->skip_block;
2037 $self->_load_objects ($f) 2002 $self->_load_objects ($f)
2038 or return; 2003 or return;
2039 2004
2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2005 $self->post_load_original
2041 if delete $self->{load_original}; 2006 if delete $self->{load_original};
2042 2007
2043 if (my $uniq = $self->uniq_path) { 2008 if (my $uniq = $self->uniq_path) {
2044 utf8::encode $uniq; 2009 utf8::encode $uniq;
2045 unless (aio_stat $uniq) { 2010 unless (aio_stat $uniq) {
… …
2071 } 2036 }
2072 2037
2073 $self->{last_save} = $cf::RUNTIME; 2038 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2039 $self->last_access ($cf::RUNTIME);
2075 2040
2076 $self->in_memory (cf::MAP_IN_MEMORY); 2041 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2042 }
2078 2043
2079 $self->post_load; 2044 $self->post_load;
2080} 2045}
2081 2046
… …
2139 my ($path, $origin, $load) = @_; 2104 my ($path, $origin, $load) = @_;
2140 2105
2141 $path = normalise $path, $origin && $origin->{path}; 2106 $path = normalise $path, $origin && $origin->{path};
2142 2107
2143 if (my $map = $cf::MAP{$path}) { 2108 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2109 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2145 } 2110 }
2146 2111
2147 $MAP_PREFETCH{$path} |= $load; 2112 $MAP_PREFETCH{$path} |= $load;
2148 2113
2149 $MAP_PREFETCHER ||= cf::async { 2114 $MAP_PREFETCHER ||= cf::async {
… …
2186 cf::async { 2151 cf::async {
2187 $Coro::current->{desc} = "map player save"; 2152 $Coro::current->{desc} = "map player save";
2188 $_->contr->save for $self->players; 2153 $_->contr->save for $self->players;
2189 }; 2154 };
2190 2155
2156 cf::get_slot 0.02;
2157
2191 if ($uniq) { 2158 if ($uniq) {
2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2159 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2193 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2160 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2194 } else { 2161 } else {
2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2203 $self->save; 2170 $self->save;
2204 2171
2205 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2206 2173
2207 return if $self->players; 2174 return if $self->players;
2208 return if $self->in_memory != cf::MAP_IN_MEMORY; 2175 return if $self->in_memory != cf::MAP_ACTIVE;
2209 return if $self->{deny_save}; 2176 return if $self->{deny_save};
2210 2177
2211 $self->in_memory (cf::MAP_SWAPPED); 2178 $self->in_memory (cf::MAP_SWAPPED);
2212 2179
2213 $self->deactivate; 2180 $self->deactivate;
… …
2331 2298
2332sub unique_maps() { 2299sub unique_maps() {
2333 [ 2300 [
2334 map { 2301 map {
2335 utf8::decode $_; 2302 utf8::decode $_;
2336 /\.map$/ 2303 s/\.map$//; # TODO future compatibility hack
2304 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2305 ? ()
2337 ? normalise $_ 2306 : normalise $_
2338 : ()
2339 } @{ aio_readdir $UNIQUEDIR or [] } 2307 } @{ aio_readdir $UNIQUEDIR or [] }
2340 ] 2308 ]
2341} 2309}
2342 2310
2343package cf;
2344
2345=back 2311=back
2346 2312
2347=head3 cf::object 2313=head3 cf::object
2348 2314
2349=cut 2315=cut
… …
2352 2318
2353=over 4 2319=over 4
2354 2320
2355=item $ob->inv_recursive 2321=item $ob->inv_recursive
2356 2322
2357Returns the inventory of the object _and_ their inventories, recursively. 2323Returns the inventory of the object I<and> their inventories, recursively,
2324but I<not> the object itself.
2358 2325
2359=cut 2326=cut
2360 2327
2361sub inv_recursive_; 2328sub inv_recursive_;
2362sub inv_recursive_ { 2329sub inv_recursive_ {
… …
2367 inv_recursive_ inv $_[0] 2334 inv_recursive_ inv $_[0]
2368} 2335}
2369 2336
2370=item $ref = $ob->ref 2337=item $ref = $ob->ref
2371 2338
2372creates and returns a persistent reference to an objetc that can be stored as a string. 2339Creates and returns a persistent reference to an object that can be stored as a string.
2373 2340
2374=item $ob = cf::object::deref ($refstring) 2341=item $ob = cf::object::deref ($refstring)
2375 2342
2376returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2343returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2377even if the object actually exists. May block. 2344even if the object actually exists. May block.
… …
2409can be C<undef>. Does the right thing when the player is currently in a 2376can be C<undef>. Does the right thing when the player is currently in a
2410dialogue with the given NPC character. 2377dialogue with the given NPC character.
2411 2378
2412=cut 2379=cut
2413 2380
2381our $SAY_CHANNEL = {
2382 id => "say",
2383 title => "Map",
2384 reply => "say ",
2385 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2386};
2387
2388our $CHAT_CHANNEL = {
2389 id => "chat",
2390 title => "Chat",
2391 reply => "chat ",
2392 tooltip => "Player chat and shouts, global to the server.",
2393};
2394
2414# rough implementation of a future "reply" method that works 2395# rough implementation of a future "reply" method that works
2415# with dialog boxes. 2396# with dialog boxes.
2416#TODO: the first argument must go, split into a $npc->reply_to ( method 2397#TODO: the first argument must go, split into a $npc->reply_to ( method
2417sub cf::object::player::reply($$$;$) { 2398sub cf::object::player::reply($$$;$) {
2418 my ($self, $npc, $msg, $flags) = @_; 2399 my ($self, $npc, $msg, $flags) = @_;
… …
2429 my $dialog = $pl->{npc_dialog}; 2410 my $dialog = $pl->{npc_dialog};
2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2411 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2431 2412
2432 } else { 2413 } else {
2433 $msg = $npc->name . " says: $msg" if $npc; 2414 $msg = $npc->name . " says: $msg" if $npc;
2434 $self->message ($msg, $flags); 2415 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2435 } 2416 }
2436 } 2417 }
2437} 2418}
2438 2419
2439=item $object->send_msg ($channel, $msg, $color, [extra...]) 2420=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2546Moves the player to the given map-path and coordinates by first freezing 2527Moves the player to the given map-path and coordinates by first freezing
2547her, loading and preparing them map, calling the provided $check callback 2528her, loading and preparing them map, calling the provided $check callback
2548that has to return the map if sucecssful, and then unfreezes the player on 2529that has to return the map if sucecssful, and then unfreezes the player on
2549the new (success) or old (failed) map position. In either case, $done will 2530the new (success) or old (failed) map position. In either case, $done will
2550be called at the end of this process. 2531be called at the end of this process.
2532
2533Note that $check will be called with a potentially non-loaded map, so if
2534it needs a loaded map it has to call C<< ->load >>.
2551 2535
2552=cut 2536=cut
2553 2537
2554our $GOTOGEN; 2538our $GOTOGEN;
2555 2539
… …
2634} 2618}
2635 2619
2636sub prepare_random_map { 2620sub prepare_random_map {
2637 my ($exit) = @_; 2621 my ($exit) = @_;
2638 2622
2639 my $guard = cf::lock_acquire "exit_prepare:$exit";
2640
2641 # all this does is basically replace the /! path by 2623 # all this does is basically replace the /! path by
2642 # a new random map path (?random/...) with a seed 2624 # a new random map path (?random/...) with a seed
2643 # that depends on the exit object 2625 # that depends on the exit object
2644 2626
2645 my $rmp = parse_random_map_params $exit->msg; 2627 my $rmp = parse_random_map_params $exit->msg;
… …
2647 if ($exit->map) { 2629 if ($exit->map) {
2648 $rmp->{region} = $exit->region->name; 2630 $rmp->{region} = $exit->region->name;
2649 $rmp->{origin_map} = $exit->map->path; 2631 $rmp->{origin_map} = $exit->map->path;
2650 $rmp->{origin_x} = $exit->x; 2632 $rmp->{origin_x} = $exit->x;
2651 $rmp->{origin_y} = $exit->y; 2633 $rmp->{origin_y} = $exit->y;
2634
2635 $exit->map->touch;
2652 } 2636 }
2653 2637
2654 $rmp->{random_seed} ||= $exit->random_seed; 2638 $rmp->{random_seed} ||= $exit->random_seed;
2655 2639
2656 my $data = cf::encode_json $rmp; 2640 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2657 my $md5 = Digest::MD5::md5_hex $data; 2641 my $md5 = Digest::MD5::md5_hex $data;
2658 my $meta = "$RANDOMDIR/$md5.meta"; 2642 my $meta = "$RANDOMDIR/$md5.meta";
2659 2643
2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2644 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2661 aio_write $fh, 0, (length $data), $data, 0; 2645 aio_write $fh, 0, (length $data), $data, 0;
2662 undef $fh; 2646 undef $fh;
2663 aio_rename "$meta~", $meta; 2647 aio_rename "$meta~", $meta;
2664 2648
2649 my $slaying = "?random/$md5";
2650
2651 if ($exit->valid) {
2665 $exit->slaying ("?random/$md5"); 2652 $exit->slaying ("?random/$md5");
2666 $exit->msg (undef); 2653 $exit->msg (undef);
2654 }
2667 } 2655 }
2668} 2656}
2669 2657
2670sub cf::object::player::enter_exit { 2658sub cf::object::player::enter_exit {
2671 my ($self, $exit) = @_; 2659 my ($self, $exit) = @_;
2672 2660
2673 return unless $self->type == cf::PLAYER; 2661 return unless $self->type == cf::PLAYER;
2674 2662
2675 if ($exit->slaying eq "/!") {
2676 #TODO: this should de-fi-ni-te-ly not be a sync-job
2677 # the problem is that $exit might not survive long enough
2678 # so it needs to be done right now, right here
2679 cf::sync_job { prepare_random_map $exit };
2680 }
2681
2682 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2683 my $hp = $exit->stats->hp;
2684 my $sp = $exit->stats->sp;
2685
2686 $self->enter_link; 2663 $self->enter_link;
2687 2664
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($slaying, $hp, $sp)
2690 if $exit->flag (FLAG_DAMNED);
2691
2692 (async { 2665 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2666 $Coro::current->{desc} = "enter_exit";
2694 2667
2695 $self->deactivate_recursive; # just to be sure
2696 unless (eval { 2668 unless (eval {
2669 $self->deactivate_recursive; # just to be sure
2670
2671 # random map handling
2672 {
2673 my $guard = cf::lock_acquire "exit_prepare:$exit";
2674
2675 prepare_random_map $exit
2676 if $exit->slaying eq "/!";
2677 }
2678
2679 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2680 my $x = $exit->stats->hp;
2681 my $y = $exit->stats->sp;
2682
2697 $self->goto ($slaying, $hp, $sp); 2683 $self->goto ($map, $x, $y);
2698 2684
2685 # if exit is damned, update players death & WoR home-position
2686 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED);
2688
2699 1; 2689 1
2700 }) { 2690 }) {
2701 $self->message ("Something went wrong deep within the crossfire server. " 2691 $self->message ("Something went wrong deep within the crossfire server. "
2702 . "I'll try to bring you back to the map you were before. " 2692 . "I'll try to bring you back to the map you were before. "
2703 . "Please report this to the dungeon master!", 2693 . "Please report this to the dungeon master!",
2704 cf::NDI_UNIQUE | cf::NDI_RED); 2694 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2784 id => "infobox", 2774 id => "infobox",
2785 title => "Map Info", 2775 title => "Map Info",
2786 reply => undef, 2776 reply => undef,
2787 tooltip => "Information related to the maps", 2777 tooltip => "Information related to the maps",
2788 }, 2778 },
2779 "c/party" => {
2780 id => "party",
2781 title => "Party",
2782 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party",
2784 },
2789); 2785);
2790 2786
2791sub cf::client::send_msg { 2787sub cf::client::send_msg {
2792 my ($self, $channel, $msg, $color, @extra) = @_; 2788 my ($self, $channel, $msg, $color, @extra) = @_;
2793 2789
… …
2820 if ($self->can_msg) { 2816 if ($self->can_msg) {
2821 # default colour, mask it out 2817 # default colour, mask it out
2822 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2823 if $color & cf::NDI_DEF; 2819 if $color & cf::NDI_DEF;
2824 2820
2825 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2821 my $pkt = "msg "
2822 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 );
2825
2826 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf};
2829
2830 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag";
2834 }
2835
2836 $self->send_packet ($pkt);
2827 } else { 2837 } else {
2828 if ($color >= 0) { 2838 if ($color >= 0) {
2829 # replace some tags by gcfclient-compatible ones 2839 # replace some tags by gcfclient-compatible ones
2830 for ($msg) { 2840 for ($msg) {
2831 1 while 2841 1 while
… …
3030 3040
3031The following functions and methods are available within a safe environment: 3041The following functions and methods are available within a safe environment:
3032 3042
3033 cf::object 3043 cf::object
3034 contr pay_amount pay_player map x y force_find force_add destroy 3044 contr pay_amount pay_player map x y force_find force_add destroy
3035 insert remove name archname title slaying race decrease_ob_nr 3045 insert remove name archname title slaying race decrease split
3036 3046
3037 cf::object::player 3047 cf::object::player
3038 player 3048 player
3039 3049
3040 cf::player 3050 cf::player
… …
3045 3055
3046=cut 3056=cut
3047 3057
3048for ( 3058for (
3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3059 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race 3060 insert remove inv nrof name archname title slaying race
3051 decrease_ob_nr destroy)], 3061 decrease split destroy change_exp)],
3052 ["cf::object::player" => qw(player)], 3062 ["cf::object::player" => qw(player)],
3053 ["cf::player" => qw(peaceful)], 3063 ["cf::player" => qw(peaceful)],
3054 ["cf::map" => qw(trigger)], 3064 ["cf::map" => qw(trigger)],
3055) { 3065) {
3056 no strict 'refs'; 3066 no strict 'refs';
… …
3264 while (my ($k, $v) = each %$want) { 3274 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v); 3275 $ns->fx_want ($k, $v);
3266 } 3276 }
3267}; 3277};
3268 3278
3279sub load_resource_file($) {
3280 my $guard = lock_acquire "load_resource_file";
3281
3282 my $status = load_resource_file_ $_[0];
3283 get_slot 0.1, 100;
3284 cf::arch::commit_load;
3285
3286 $status
3287}
3288
3269sub reload_regions { 3289sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework 3290 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?) 3291 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3292 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3293
… …
3286} 3306}
3287 3307
3288sub reload_archetypes { 3308sub reload_archetypes {
3289 load_resource_file "$DATADIR/archetypes" 3309 load_resource_file "$DATADIR/archetypes"
3290 or die "unable to load archetypes\n"; 3310 or die "unable to load archetypes\n";
3291 #d# NEED to laod twice to resolve forward references
3292 # this really needs to be done in an extra post-pass
3293 # (which needs to be synchronous, so solve it differently)
3294 load_resource_file "$DATADIR/archetypes"
3295 or die "unable to load archetypes\n";
3296} 3311}
3297 3312
3298sub reload_treasures { 3313sub reload_treasures {
3299 load_resource_file "$DATADIR/treasures" 3314 load_resource_file "$DATADIR/treasures"
3300 or die "unable to load treasurelists\n"; 3315 or die "unable to load treasurelists\n";
3301} 3316}
3302 3317
3303sub reload_resources { 3318sub reload_resources {
3304 warn "reloading resource files...\n"; 3319 warn "reloading resource files...\n";
3305 3320
3321 reload_facedata;
3322 reload_archetypes;
3306 reload_regions; 3323 reload_regions;
3307 reload_facedata;
3308 #reload_archetypes;#d#
3309 reload_archetypes;
3310 reload_treasures; 3324 reload_treasures;
3311 3325
3312 warn "finished reloading resource files\n"; 3326 warn "finished reloading resource files\n";
3313} 3327}
3314 3328
3315sub init { 3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
3316 reload_resources; 3334 reload_resources;
3317} 3335}
3318 3336
3319sub reload_config { 3337sub reload_config {
3320 open my $fh, "<:utf8", "$CONFDIR/config" 3338 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3345 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3363 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT; 3364 EV::loop EV::LOOP_ONESHOT;
3347 })->prio (Coro::PRIO_MAX); 3365 })->prio (Coro::PRIO_MAX);
3348 }; 3366 };
3349 3367
3368 {
3369 my $guard = freeze_mainloop;
3350 reload_config; 3370 reload_config;
3351 db_init; 3371 db_init;
3352 load_extensions; 3372 load_extensions;
3353 3373
3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3375 }
3376
3356 EV::loop; 3377 EV::loop;
3357} 3378}
3358 3379
3359############################################################################# 3380#############################################################################
3360# initialisation and cleanup 3381# initialisation and cleanup
… …
3367 cf::cleanup "SIG$signal"; 3388 cf::cleanup "SIG$signal";
3368 }; 3389 };
3369 } 3390 }
3370} 3391}
3371 3392
3372sub write_runtime { 3393sub write_runtime_sync {
3373 my $runtime = "$LOCALDIR/runtime"; 3394 my $runtime = "$LOCALDIR/runtime";
3374 3395
3375 # first touch the runtime file to show we are still running: 3396 # first touch the runtime file to show we are still running:
3376 # the fsync below can take a very very long time. 3397 # the fsync below can take a very very long time.
3377 3398
… …
3403 and return; 3424 and return;
3404 3425
3405 warn "runtime file written.\n"; 3426 warn "runtime file written.\n";
3406 3427
3407 1 3428 1
3429}
3430
3431our $uuid_lock;
3432our $uuid_skip;
3433
3434sub write_uuid_sync($) {
3435 $uuid_skip ||= $_[0];
3436
3437 return if $uuid_lock;
3438 local $uuid_lock = 1;
3439
3440 my $uuid = "$LOCALDIR/uuid";
3441
3442 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3443 or return;
3444
3445 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3446 $uuid_skip = 0;
3447
3448 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3449 and return;
3450
3451 # always fsync - this file is important
3452 aio_fsync $fh
3453 and return;
3454
3455 close $fh
3456 or return;
3457
3458 aio_rename "$uuid~", $uuid
3459 and return;
3460
3461 warn "uuid file written ($value).\n";
3462
3463 1
3464
3465}
3466
3467sub write_uuid($$) {
3468 my ($skip, $sync) = @_;
3469
3470 $sync ? write_uuid_sync $skip
3471 : async { write_uuid_sync $skip };
3408} 3472}
3409 3473
3410sub emergency_save() { 3474sub emergency_save() {
3411 my $freeze_guard = cf::freeze_mainloop; 3475 my $freeze_guard = cf::freeze_mainloop;
3412 3476
… …
3434 warn "end emergency map save\n"; 3498 warn "end emergency map save\n";
3435 3499
3436 warn "begin emergency database checkpoint\n"; 3500 warn "begin emergency database checkpoint\n";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3501 BDB::db_env_txn_checkpoint $DB_ENV;
3438 warn "end emergency database checkpoint\n"; 3502 warn "end emergency database checkpoint\n";
3503
3504 warn "begin write uuid\n";
3505 write_uuid_sync 1;
3506 warn "end write uuid\n";
3439 }; 3507 };
3440 3508
3441 warn "leave emergency perl save\n"; 3509 warn "leave emergency perl save\n";
3442} 3510}
3443 3511
… …
3445 my ($make_core) = @_; 3513 my ($make_core) = @_;
3446 3514
3447 warn Carp::longmess "post_cleanup backtrace" 3515 warn Carp::longmess "post_cleanup backtrace"
3448 if $make_core; 3516 if $make_core;
3449} 3517}
3518
3519# a safer delete_package, copied from Symbol
3520sub clear_package($) {
3521 my $pkg = shift;
3522
3523 # expand to full symbol table name if needed
3524 unless ($pkg =~ /^main::.*::$/) {
3525 $pkg = "main$pkg" if $pkg =~ /^::/;
3526 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3527 $pkg .= '::' unless $pkg =~ /::$/;
3528 }
3529
3530 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3531 my $stem_symtab = *{$stem}{HASH};
3532
3533 defined $stem_symtab and exists $stem_symtab->{$leaf}
3534 or return;
3535
3536 # clear all symbols
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 }
3542 warn "cleared package #$pkg\n";#d#
3543}
3544
3545our $RELOAD; # how many times to reload
3450 3546
3451sub do_reload_perl() { 3547sub do_reload_perl() {
3452 # can/must only be called in main 3548 # can/must only be called in main
3453 if ($Coro::current != $Coro::main) { 3549 if ($Coro::current != $Coro::main) {
3454 warn "can only reload from main coroutine"; 3550 warn "can only reload from main coroutine";
3455 return; 3551 return;
3456 } 3552 }
3457 3553
3554 return if $RELOAD++;
3555
3556 while ($RELOAD) {
3458 warn "reloading..."; 3557 warn "reloading...";
3459 3558
3460 warn "entering sync_job"; 3559 warn "entering sync_job";
3461 3560
3462 cf::sync_job { 3561 cf::sync_job {
3463 cf::write_runtime; # external watchdog should not bark 3562 cf::write_runtime_sync; # external watchdog should not bark
3464 cf::emergency_save; 3563 cf::emergency_save;
3465 cf::write_runtime; # external watchdog should not bark 3564 cf::write_runtime_sync; # external watchdog should not bark
3466 3565
3467 warn "syncing database to disk"; 3566 warn "syncing database to disk";
3468 BDB::db_env_txn_checkpoint $DB_ENV; 3567 BDB::db_env_txn_checkpoint $DB_ENV;
3469 3568
3470 # if anything goes wrong in here, we should simply crash as we already saved 3569 # if anything goes wrong in here, we should simply crash as we already saved
3471 3570
3472 warn "flushing outstanding aio requests"; 3571 warn "flushing outstanding aio requests";
3473 for (;;) {
3474 BDB::flush;
3475 IO::AIO::flush;
3476 Coro::cede_notself;
3477 last unless IO::AIO::nreqs || BDB::nreqs; 3572 while (IO::AIO::nreqs || BDB::nreqs) {
3478 warn "iterate..."; 3573 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3479 }
3480
3481 ++$RELOAD;
3482
3483 warn "cancelling all extension coros";
3484 $_->cancel for values %EXT_CORO;
3485 %EXT_CORO = ();
3486
3487 warn "removing commands";
3488 %COMMAND = ();
3489
3490 warn "removing ext/exti commands";
3491 %EXTCMD = ();
3492 %EXTICMD = ();
3493
3494 warn "unloading/nuking all extensions";
3495 for my $pkg (@EXTS) {
3496 warn "... unloading $pkg";
3497
3498 if (my $cb = $pkg->can ("unload")) {
3499 eval {
3500 $cb->($pkg);
3501 1
3502 } or warn "$pkg unloaded, but with errors: $@";
3503 } 3574 }
3504 3575
3505 warn "... nuking $pkg"; 3576 warn "cancelling all extension coros";
3506 Symbol::delete_package $pkg; 3577 $_->cancel for values %EXT_CORO;
3507 } 3578 %EXT_CORO = ();
3508 3579
3509 warn "unloading all perl modules loaded from $LIBDIR"; 3580 warn "removing commands";
3510 while (my ($k, $v) = each %INC) { 3581 %COMMAND = ();
3511 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3512 3582
3583 warn "removing ext/exti commands";
3584 %EXTCMD = ();
3585 %EXTICMD = ();
3586
3587 warn "unloading/nuking all extensions";
3588 for my $pkg (@EXTS) {
3513 warn "... unloading $k"; 3589 warn "... unloading $pkg";
3514 delete $INC{$k};
3515 3590
3516 $k =~ s/\.pm$//;
3517 $k =~ s/\//::/g;
3518
3519 if (my $cb = $k->can ("unload_module")) { 3591 if (my $cb = $pkg->can ("unload")) {
3592 eval {
3520 $cb->(); 3593 $cb->($pkg);
3594 1
3595 } or warn "$pkg unloaded, but with errors: $@";
3596 }
3597
3598 warn "... clearing $pkg";
3599 clear_package $pkg;
3521 } 3600 }
3522 3601
3523 Symbol::delete_package $k; 3602 warn "unloading all perl modules loaded from $LIBDIR";
3603 while (my ($k, $v) = each %INC) {
3604 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3605
3606 warn "... unloading $k";
3607 delete $INC{$k};
3608
3609 $k =~ s/\.pm$//;
3610 $k =~ s/\//::/g;
3611
3612 if (my $cb = $k->can ("unload_module")) {
3613 $cb->();
3614 }
3615
3616 clear_package $k;
3524 } 3617 }
3525 3618
3526 warn "getting rid of safe::, as good as possible"; 3619 warn "getting rid of safe::, as good as possible";
3527 Symbol::delete_package "safe::$_" 3620 clear_package "safe::$_"
3528 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3621 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3529 3622
3530 warn "unloading cf.pm \"a bit\""; 3623 warn "unloading cf.pm \"a bit\"";
3531 delete $INC{"cf.pm"}; 3624 delete $INC{"cf.pm"};
3532 delete $INC{"cf/pod.pm"}; 3625 delete $INC{"cf/pod.pm"};
3533 3626
3534 # don't, removes xs symbols, too, 3627 # don't, removes xs symbols, too,
3535 # and global variables created in xs 3628 # and global variables created in xs
3536 #Symbol::delete_package __PACKAGE__; 3629 #clear_package __PACKAGE__;
3537 3630
3538 warn "unload completed, starting to reload now"; 3631 warn "unload completed, starting to reload now";
3539 3632
3540 warn "reloading cf.pm"; 3633 warn "reloading cf.pm";
3541 require cf; 3634 require cf;
3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3635 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3543 3636
3544 warn "loading config and database again"; 3637 warn "loading config and database again";
3545 cf::reload_config; 3638 cf::reload_config;
3546 3639
3547 warn "loading extensions"; 3640 warn "loading extensions";
3548 cf::load_extensions; 3641 cf::load_extensions;
3549 3642
3550 warn "reattaching attachments to objects/players"; 3643 warn "reattaching attachments to objects/players";
3551 _global_reattach; # objects, sockets 3644 _global_reattach; # objects, sockets
3552 warn "reattaching attachments to maps"; 3645 warn "reattaching attachments to maps";
3553 reattach $_ for values %MAP; 3646 reattach $_ for values %MAP;
3554 warn "reattaching attachments to players"; 3647 warn "reattaching attachments to players";
3555 reattach $_ for values %PLAYER; 3648 reattach $_ for values %PLAYER;
3556 3649
3557 warn "leaving sync_job"; 3650 warn "leaving sync_job";
3558 3651
3559 1 3652 1
3560 } or do { 3653 } or do {
3561 warn $@; 3654 warn $@;
3562 cf::cleanup "error while reloading, exiting."; 3655 cf::cleanup "error while reloading, exiting.";
3563 }; 3656 };
3564 3657
3565 warn "reloaded"; 3658 warn "reloaded";
3659 --$RELOAD;
3660 }
3566}; 3661};
3567 3662
3568our $RELOAD_WATCHER; # used only during reload 3663our $RELOAD_WATCHER; # used only during reload
3569 3664
3570sub reload_perl() { 3665sub reload_perl() {
… …
3595 3690
3596our @WAIT_FOR_TICK; 3691our @WAIT_FOR_TICK;
3597our @WAIT_FOR_TICK_BEGIN; 3692our @WAIT_FOR_TICK_BEGIN;
3598 3693
3599sub wait_for_tick { 3694sub wait_for_tick {
3600 return unless $TICK_WATCHER->is_active;
3601 return if $Coro::current == $Coro::main; 3695 return if tick_inhibit || $Coro::current == $Coro::main;
3602 3696
3603 my $signal = new Coro::Signal; 3697 my $signal = new Coro::Signal;
3604 push @WAIT_FOR_TICK, $signal; 3698 push @WAIT_FOR_TICK, $signal;
3605 $signal->wait; 3699 $signal->wait;
3606} 3700}
3607 3701
3608sub wait_for_tick_begin { 3702sub wait_for_tick_begin {
3609 return unless $TICK_WATCHER->is_active;
3610 return if $Coro::current == $Coro::main; 3703 return if tick_inhibit || $Coro::current == $Coro::main;
3611 3704
3612 my $signal = new Coro::Signal; 3705 my $signal = new Coro::Signal;
3613 push @WAIT_FOR_TICK_BEGIN, $signal; 3706 push @WAIT_FOR_TICK_BEGIN, $signal;
3614 $signal->wait; 3707 $signal->wait;
3615} 3708}
3616 3709
3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3710sub tick {
3618 if ($Coro::current != $Coro::main) { 3711 if ($Coro::current != $Coro::main) {
3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3712 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3620 unless ++$bug_warning > 10; 3713 unless ++$bug_warning > 10;
3621 return; 3714 return;
3622 } 3715 }
3623 3716
3624 $NOW = $tick_start = EV::now;
3625
3626 cf::server_tick; # one server iteration 3717 cf::server_tick; # one server iteration
3627
3628 $RUNTIME += $TICK;
3629 $NEXT_TICK = $_[0]->at;
3630 3718
3631 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3719 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3720 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3633 Coro::async_pool { 3721 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver"; 3722 $Coro::current->{desc} = "runtime saver";
3635 write_runtime 3723 write_runtime_sync
3636 or warn "ERROR: unable to write runtime file: $!"; 3724 or warn "ERROR: unable to write runtime file: $!";
3637 }; 3725 };
3638 } 3726 }
3639 3727
3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3728 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3642 } 3730 }
3643 while (my $sig = shift @WAIT_FOR_TICK) { 3731 while (my $sig = shift @WAIT_FOR_TICK) {
3644 $sig->send; 3732 $sig->send;
3645 } 3733 }
3646 3734
3647 $LOAD = ($NOW - $tick_start) / $TICK; 3735 $LOAD = ($NOW - $TICK_START) / $TICK;
3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3736 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3649 3737
3650 _post_tick; 3738 if (0) {
3651}; 3739 if ($NEXT_TICK) {
3652$TICK_WATCHER->priority (EV::MAXPRI); 3740 my $jitter = $TICK_START - $NEXT_TICK;
3741 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3742 warn "jitter $JITTER\n";#d#
3743 }
3744 }
3745}
3653 3746
3654{ 3747{
3655 # configure BDB 3748 # configure BDB
3656 3749
3657 BDB::min_parallel 8; 3750 BDB::min_parallel 8;
3658 BDB::max_poll_reqs $TICK * 0.1; 3751 BDB::max_poll_reqs $TICK * 0.1;
3659 $Coro::BDB::WATCHER->priority (1); 3752 $AnyEvent::BDB::WATCHER->priority (1);
3660 3753
3661 unless ($DB_ENV) { 3754 unless ($DB_ENV) {
3662 $DB_ENV = BDB::db_env_create; 3755 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3756 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3664 | BDB::LOG_AUTOREMOVE, 1); 3757 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3758 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3759 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3760 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3667 3761
3668 cf::sync_job { 3762 cf::sync_job {
3669 eval { 3763 eval {
… …
3695{ 3789{
3696 # configure IO::AIO 3790 # configure IO::AIO
3697 3791
3698 IO::AIO::min_parallel 8; 3792 IO::AIO::min_parallel 8;
3699 IO::AIO::max_poll_time $TICK * 0.1; 3793 IO::AIO::max_poll_time $TICK * 0.1;
3700 $Coro::AIO::WATCHER->priority (1); 3794 undef $AnyEvent::AIO::WATCHER;
3701} 3795}
3702 3796
3703my $_log_backtrace; 3797my $_log_backtrace;
3704 3798
3705sub _log_backtrace { 3799sub _log_backtrace {

Diff Legend

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