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.446 by root, Tue Sep 16 16:03:02 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
… …
55our %EXT_MAP = (); # pluggable maps 81our %EXT_MAP = (); # pluggable maps
56 82
57our $RELOAD; # number of reloads so far 83our $RELOAD; # number of reloads so far
58our @EVENT; 84our @EVENT;
59 85
60our $CONFDIR = confdir; 86our $CONFDIR = confdir;
61our $DATADIR = datadir; 87our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 88our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 89our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 90our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 91our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime";
99
71our %RESOURCE; 100our %RESOURCE;
72 101
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 102our $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 103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 104our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 105our $USE_FSYNC = 1; # use fsync to write maps - default off
79 106
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 107our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 108our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 109our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 110our $DB_ENV;
85 111
… …
96# used to convert map paths into valid unix filenames by replacing / by ∕ 122# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 123our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 124
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 125our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 126our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 128our $TICK_START; # for load detecting purposes
102 129
103binmode STDOUT; 130binmode STDOUT;
104binmode STDERR; 131binmode STDERR;
105 132
106# read virtual server time, if available 133# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 134unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 135 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 136 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 137 $RUNTIME = <$fh> + 0.;
111} 138}
112 139
113mkdir $_ 140mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
221for my $pkg (qw( 248for my $pkg (qw(
222 cf::global cf::attachable 249 cf::global cf::attachable
223 cf::object cf::object::player 250 cf::object cf::object::player
224 cf::client cf::player 251 cf::client cf::player
225 cf::arch cf::living 252 cf::arch cf::living
253 cf::map cf::mapspace
226 cf::map cf::party cf::region 254 cf::party cf::region
227)) { 255)) {
228 no strict 'refs';
229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
230} 257}
231 258
232$EV::DIED = sub { 259$EV::DIED = sub {
233 warn "error in event callback: @_"; 260 warn "error in event callback: @_";
… …
339 366
340 ! ! $LOCK{$key} 367 ! ! $LOCK{$key}
341} 368}
342 369
343sub freeze_mainloop { 370sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 371 tick_inhibit_inc;
345 372
346 my $guard = Coro::guard { 373 Coro::guard \&tick_inhibit_dec;
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 374}
352 375
353=item cf::periodic $interval, $cb 376=item cf::periodic $interval, $cb
354 377
355Like EV::periodic, but randomly selects a starting point so that the actions 378Like EV::periodic, but randomly selects a starting point so that the actions
… …
410 } 433 }
411 } 434 }
412}; 435};
413 436
414sub get_slot($;$$) { 437sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main;
439
415 my ($time, $pri, $name) = @_; 440 my ($time, $pri, $name) = @_;
416 441
417 $time = $TICK * .6 if $time > $TICK * .6; 442 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal; 443 my $sig = new Coro::Signal;
419 444
… …
456 # this is the main coro, too bad, we have to block 481 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 482 # till the operation succeeds, freezing the server :/
458 483
459 LOG llevError, Carp::longmess "sync job";#d# 484 LOG llevError, Carp::longmess "sync job";#d#
460 485
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 486 my $freeze_guard = freeze_mainloop;
464 487
465 my $busy = 1; 488 my $busy = 1;
466 my @res; 489 my @res;
467 490
… …
478 } else { 501 } else {
479 EV::loop EV::LOOP_ONESHOT; 502 EV::loop EV::LOOP_ONESHOT;
480 } 503 }
481 } 504 }
482 505
483 $time = EV::time - $time; 506 my $time = EV::time - $time;
484 507
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 508 $TICK_START += $time; # do not account sync jobs to server load
489 509
490 wantarray ? @res : $res[0] 510 wantarray ? @res : $res[0]
491 } else { 511 } else {
492 # we are in another coroutine, how wonderful, everything just works 512 # we are in another coroutine, how wonderful, everything just works
493 513
… …
535 reset_signals; 555 reset_signals;
536 &$cb 556 &$cb
537 }, @args; 557 }, @args;
538 558
539 wantarray ? @res : $res[-1] 559 wantarray ? @res : $res[-1]
560}
561
562=item $coin = coin_from_name $name
563
564=cut
565
566our %coin_alias = (
567 "silver" => "silvercoin",
568 "silvercoin" => "silvercoin",
569 "silvercoins" => "silvercoin",
570 "gold" => "goldcoin",
571 "goldcoin" => "goldcoin",
572 "goldcoins" => "goldcoin",
573 "platinum" => "platinacoin",
574 "platinumcoin" => "platinacoin",
575 "platinumcoins" => "platinacoin",
576 "platina" => "platinacoin",
577 "platinacoin" => "platinacoin",
578 "platinacoins" => "platinacoin",
579 "royalty" => "royalty",
580 "royalties" => "royalty",
581);
582
583sub coin_from_name($) {
584 $coin_alias{$_[0]}
585 ? cf::arch::find $coin_alias{$_[0]}
586 : undef
540} 587}
541 588
542=item $value = cf::db_get $family => $key 589=item $value = cf::db_get $family => $key
543 590
544Returns a single value from the environment database. 591Returns a single value from the environment database.
… …
1044 1091
1045sub reattach { 1092sub reattach {
1046 # basically do the same as instantiate, without calling instantiate 1093 # basically do the same as instantiate, without calling instantiate
1047 my ($obj) = @_; 1094 my ($obj) = @_;
1048 1095
1096 # no longer needed after getting rid of delete_package?
1049 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1097 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1050 1098
1051 my $registry = $obj->registry; 1099 my $registry = $obj->registry;
1052 1100
1053 @$registry = (); 1101 @$registry = ();
1054 1102
… …
1100 utf8::decode (my $decname = $filename); 1148 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1149 warn sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1150 $decname, length $$rdata, scalar @$objs;
1103 1151
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 aio_fsync $fh if $cf::USE_FSYNC; 1155 aio_fsync $fh if $cf::USE_FSYNC;
1108 close $fh; 1156 aio_close $fh;
1109 1157
1110 if (@$objs) { 1158 if (@$objs) {
1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1112 chmod SAVE_MODE, $fh; 1160 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1162 aio_write $fh, 0, (length $data), $data, 0;
1115 aio_fsync $fh if $cf::USE_FSYNC; 1163 aio_fsync $fh if $cf::USE_FSYNC;
1116 close $fh; 1164 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1165 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1166 }
1119 } else { 1167 } else {
1120 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1121 } 1169 }
… …
1290 1338
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1341
1294 $ext{source} = 1342 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1296 . "#line 1 \"$path\"\n{\n" 1344 . "#line 1 \"$path\"\n{\n"
1297 . $source 1345 . $source
1298 . "\n};\n1"; 1346 . "\n};\n1";
1299 1347
1300 $todo{$base} = \%ext; 1348 $todo{$base} = \%ext;
… …
1415 my $f = new_from_file cf::object::thawer path $login 1463 my $f = new_from_file cf::object::thawer path $login
1416 or return; 1464 or return;
1417 1465
1418 my $pl = cf::player::load_pl $f 1466 my $pl = cf::player::load_pl $f
1419 or return; 1467 or return;
1468
1420 local $cf::PLAYER_LOADING{$login} = $pl; 1469 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs; 1470 $f->resolve_delayed_derefs;
1422 $cf::PLAYER{$login} = $pl 1471 $cf::PLAYER{$login} = $pl
1423 } 1472 }
1424 } 1473 }
… …
1434 1483
1435 return if $pl->{deny_save}; 1484 return if $pl->{deny_save};
1436 1485
1437 aio_mkdir playerdir $pl, 0770; 1486 aio_mkdir playerdir $pl, 0770;
1438 $pl->{last_save} = $cf::RUNTIME; 1487 $pl->{last_save} = $cf::RUNTIME;
1488
1489 cf::get_slot 0.01;
1439 1490
1440 $pl->save_pl ($path); 1491 $pl->save_pl ($path);
1441 cf::cede_to_tick; 1492 cf::cede_to_tick;
1442} 1493}
1443 1494
… …
1475 my ($pl) = @_; 1526 my ($pl) = @_;
1476 1527
1477 my $name = $pl->ob->name; 1528 my $name = $pl->ob->name;
1478 1529
1479 $pl->{deny_save} = 1; 1530 $pl->{deny_save} = 1;
1480 $pl->password ("*"); # this should lock out the player until we nuked the dir 1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1481 1532
1482 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1483 $pl->deactivate; 1534 $pl->deactivate;
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1484 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1537 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1485 $pl->ns->destroy if $pl->ns; 1538 $pl->ns->destroy if $pl->ns;
1486 1539
1487 my $path = playerdir $pl; 1540 my $path = playerdir $pl;
1488 my $temp = "$path~$cf::RUNTIME~deleting~"; 1541 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1527 1580
1528 for my $login (@$dirs) { 1581 for my $login (@$dirs) {
1529 my $path = path $login; 1582 my $path = path $login;
1530 1583
1531 # a .pst is a dead give-away for a valid player 1584 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") { 1585 # if no pst file found, open and chekc for blocked users
1586 if (aio_stat "$path.pst") {
1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1587 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1534 aio_read $fh, 0, 512, my $buf, 0 or next; 1588 aio_read $fh, 0, 512, my $buf, 0 or next;
1535 $buf !~ /^password -------------$/m or next; # official not-valid tag 1589 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 } 1590 }
1537 1591
… …
1572 1626
1573=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1574 1628
1575Expand crossfire pod fragments into protocol xml. 1629Expand crossfire pod fragments into protocol xml.
1576 1630
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) 1631=item $player->ext_reply ($msgid, @msg)
1667 1632
1668Sends an ext reply to the player. 1633Sends an ext reply to the player.
1669 1634
1670=cut 1635=cut
… …
1736our $MAX_RESET = 3600; 1701our $MAX_RESET = 3600;
1737our $DEFAULT_RESET = 3000; 1702our $DEFAULT_RESET = 3000;
1738 1703
1739sub generate_random_map { 1704sub generate_random_map {
1740 my ($self, $rmp) = @_; 1705 my ($self, $rmp) = @_;
1706
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708
1741 # mit "rum" bekleckern, nicht 1709 # mit "rum" bekleckern, nicht
1742 $self->_create_random_map ( 1710 $self->_create_random_map (
1743 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1744 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1745 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1867 1835
1868# the temporary/swap location 1836# the temporary/swap location
1869sub save_path { 1837sub save_path {
1870 my ($self) = @_; 1838 my ($self) = @_;
1871 1839
1872 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1840 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1873 "$TMPDIR/$path.map" 1841 "$TMPDIR/$path.map"
1874} 1842}
1875 1843
1876# the unique path, undef == no special unique path 1844# the unique path, undef == no special unique path
1877sub uniq_path { 1845sub uniq_path {
1878 my ($self) = @_; 1846 my ($self) = @_;
1879 1847
1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1881 "$UNIQUEDIR/$path" 1849 "$UNIQUEDIR/$path"
1882} 1850}
1883 1851
1884# and all this just because we cannot iterate over 1852# and all this just because we cannot iterate over
1885# all maps in C++... 1853# all maps in C++...
… …
1983 1951
1984 cf::lock_wait "map_data:$path";#d#remove 1952 cf::lock_wait "map_data:$path";#d#remove
1985 cf::lock_wait "map_find:$path"; 1953 cf::lock_wait "map_find:$path";
1986 1954
1987 $cf::MAP{$path} || do { 1955 $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 1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1990 1958
1991 my $map = new_from_path cf::map $path 1959 my $map = new_from_path cf::map $path
1992 or return; 1960 or return;
1993 1961
1994 $map->{last_save} = $cf::RUNTIME; 1962 $map->{last_save} = $cf::RUNTIME;
… …
1997 or return; 1965 or return;
1998 1966
1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1967 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2000 # doing this can freeze the server in a sync job, obviously 1968 # doing this can freeze the server in a sync job, obviously
2001 #$cf::WAIT_FOR_TICK->wait; 1969 #$cf::WAIT_FOR_TICK->wait;
1970 undef $guard2;
2002 undef $guard1; 1971 undef $guard1;
2003 undef $guard2;
2004 $map->reset; 1972 $map->reset;
2005 return find $path; 1973 return find $path;
2006 } 1974 }
2007 1975
2008 $cf::MAP{$path} = $map 1976 $cf::MAP{$path} = $map
… …
2035 my $f = new_from_file cf::object::thawer $self->{load_path}; 2003 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block; 2004 $f->skip_block;
2037 $self->_load_objects ($f) 2005 $self->_load_objects ($f)
2038 or return; 2006 or return;
2039 2007
2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2008 $self->post_load_original
2041 if delete $self->{load_original}; 2009 if delete $self->{load_original};
2042 2010
2043 if (my $uniq = $self->uniq_path) { 2011 if (my $uniq = $self->uniq_path) {
2044 utf8::encode $uniq; 2012 utf8::encode $uniq;
2045 unless (aio_stat $uniq) { 2013 unless (aio_stat $uniq) {
… …
2071 } 2039 }
2072 2040
2073 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2042 $self->last_access ($cf::RUNTIME);
2075 2043
2076 $self->in_memory (cf::MAP_IN_MEMORY); 2044 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2045 }
2078 2046
2079 $self->post_load; 2047 $self->post_load;
2080} 2048}
2081 2049
… …
2139 my ($path, $origin, $load) = @_; 2107 my ($path, $origin, $load) = @_;
2140 2108
2141 $path = normalise $path, $origin && $origin->{path}; 2109 $path = normalise $path, $origin && $origin->{path};
2142 2110
2143 if (my $map = $cf::MAP{$path}) { 2111 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2145 } 2113 }
2146 2114
2147 $MAP_PREFETCH{$path} |= $load; 2115 $MAP_PREFETCH{$path} |= $load;
2148 2116
2149 $MAP_PREFETCHER ||= cf::async { 2117 $MAP_PREFETCHER ||= cf::async {
… …
2186 cf::async { 2154 cf::async {
2187 $Coro::current->{desc} = "map player save"; 2155 $Coro::current->{desc} = "map player save";
2188 $_->contr->save for $self->players; 2156 $_->contr->save for $self->players;
2189 }; 2157 };
2190 2158
2159 cf::get_slot 0.02;
2160
2191 if ($uniq) { 2161 if ($uniq) {
2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2193 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2163 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2194 } else { 2164 } else {
2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2203 $self->save; 2173 $self->save;
2204 2174
2205 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2175 my $lock = cf::lock_acquire "map_data:$self->{path}";
2206 2176
2207 return if $self->players; 2177 return if $self->players;
2208 return if $self->in_memory != cf::MAP_IN_MEMORY; 2178 return if $self->in_memory != cf::MAP_ACTIVE;
2209 return if $self->{deny_save}; 2179 return if $self->{deny_save};
2210 2180
2211 $self->in_memory (cf::MAP_SWAPPED); 2181 $self->in_memory (cf::MAP_SWAPPED);
2212 2182
2213 $self->deactivate; 2183 $self->deactivate;
… …
2331 2301
2332sub unique_maps() { 2302sub unique_maps() {
2333 [ 2303 [
2334 map { 2304 map {
2335 utf8::decode $_; 2305 utf8::decode $_;
2336 /\.map$/ 2306 s/\.map$//; # TODO future compatibility hack
2307 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2308 ? ()
2337 ? normalise $_ 2309 : normalise $_
2338 : ()
2339 } @{ aio_readdir $UNIQUEDIR or [] } 2310 } @{ aio_readdir $UNIQUEDIR or [] }
2340 ] 2311 ]
2341} 2312}
2342 2313
2343package cf;
2344
2345=back 2314=back
2346 2315
2347=head3 cf::object 2316=head3 cf::object
2348 2317
2349=cut 2318=cut
… …
2352 2321
2353=over 4 2322=over 4
2354 2323
2355=item $ob->inv_recursive 2324=item $ob->inv_recursive
2356 2325
2357Returns the inventory of the object _and_ their inventories, recursively. 2326Returns the inventory of the object I<and> their inventories, recursively,
2327but I<not> the object itself.
2358 2328
2359=cut 2329=cut
2360 2330
2361sub inv_recursive_; 2331sub inv_recursive_;
2362sub inv_recursive_ { 2332sub inv_recursive_ {
… …
2367 inv_recursive_ inv $_[0] 2337 inv_recursive_ inv $_[0]
2368} 2338}
2369 2339
2370=item $ref = $ob->ref 2340=item $ref = $ob->ref
2371 2341
2372creates and returns a persistent reference to an objetc that can be stored as a string. 2342Creates and returns a persistent reference to an object that can be stored as a string.
2373 2343
2374=item $ob = cf::object::deref ($refstring) 2344=item $ob = cf::object::deref ($refstring)
2375 2345
2376returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2346returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2377even if the object actually exists. May block. 2347even if the object actually exists. May block.
… …
2409can be C<undef>. Does the right thing when the player is currently in a 2379can be C<undef>. Does the right thing when the player is currently in a
2410dialogue with the given NPC character. 2380dialogue with the given NPC character.
2411 2381
2412=cut 2382=cut
2413 2383
2384our $SAY_CHANNEL = {
2385 id => "say",
2386 title => "Map",
2387 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2389};
2390
2391our $CHAT_CHANNEL = {
2392 id => "chat",
2393 title => "Chat",
2394 reply => "chat ",
2395 tooltip => "Player chat and shouts, global to the server.",
2396};
2397
2414# rough implementation of a future "reply" method that works 2398# rough implementation of a future "reply" method that works
2415# with dialog boxes. 2399# with dialog boxes.
2416#TODO: the first argument must go, split into a $npc->reply_to ( method 2400#TODO: the first argument must go, split into a $npc->reply_to ( method
2417sub cf::object::player::reply($$$;$) { 2401sub cf::object::player::reply($$$;$) {
2418 my ($self, $npc, $msg, $flags) = @_; 2402 my ($self, $npc, $msg, $flags) = @_;
… …
2429 my $dialog = $pl->{npc_dialog}; 2413 my $dialog = $pl->{npc_dialog};
2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2414 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2431 2415
2432 } else { 2416 } else {
2433 $msg = $npc->name . " says: $msg" if $npc; 2417 $msg = $npc->name . " says: $msg" if $npc;
2434 $self->message ($msg, $flags); 2418 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2435 } 2419 }
2436 } 2420 }
2437} 2421}
2438 2422
2439=item $object->send_msg ($channel, $msg, $color, [extra...]) 2423=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2464 2448
2465=item $player_object->enter_link 2449=item $player_object->enter_link
2466 2450
2467Freezes the player and moves him/her to a special map (C<{link}>). 2451Freezes the player and moves him/her to a special map (C<{link}>).
2468 2452
2469The player should be reasonably safe there for short amounts of time. You 2453The player should be reasonably safe there for short amounts of time (e.g.
2470I<MUST> call C<leave_link> as soon as possible, though. 2454for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2455though, as the palyer cannot control the character while it is on the link
2456map.
2471 2457
2472Will never block. 2458Will never block.
2473 2459
2474=item $player_object->leave_link ($map, $x, $y) 2460=item $player_object->leave_link ($map, $x, $y)
2475 2461
… …
2533 2519
2534 $map->load; 2520 $map->load;
2535 $map->load_neighbours; 2521 $map->load_neighbours;
2536 2522
2537 return unless $self->contr->active; 2523 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2538 $self->activate_recursive; 2525 $self->activate_recursive;
2539 2526
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541 $self->enter_map ($map, $x, $y); 2528 $self->enter_map ($map, $x, $y);
2542} 2529}
… …
2546Moves the player to the given map-path and coordinates by first freezing 2533Moves the player to the given map-path and coordinates by first freezing
2547her, loading and preparing them map, calling the provided $check callback 2534her, loading and preparing them map, calling the provided $check callback
2548that has to return the map if sucecssful, and then unfreezes the player on 2535that 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 2536the new (success) or old (failed) map position. In either case, $done will
2550be called at the end of this process. 2537be called at the end of this process.
2538
2539Note that $check will be called with a potentially non-loaded map, so if
2540it needs a loaded map it has to call C<< ->load >>.
2551 2541
2552=cut 2542=cut
2553 2543
2554our $GOTOGEN; 2544our $GOTOGEN;
2555 2545
… …
2634} 2624}
2635 2625
2636sub prepare_random_map { 2626sub prepare_random_map {
2637 my ($exit) = @_; 2627 my ($exit) = @_;
2638 2628
2639 my $guard = cf::lock_acquire "exit_prepare:$exit";
2640
2641 # all this does is basically replace the /! path by 2629 # all this does is basically replace the /! path by
2642 # a new random map path (?random/...) with a seed 2630 # a new random map path (?random/...) with a seed
2643 # that depends on the exit object 2631 # that depends on the exit object
2644 2632
2645 my $rmp = parse_random_map_params $exit->msg; 2633 my $rmp = parse_random_map_params $exit->msg;
… …
2647 if ($exit->map) { 2635 if ($exit->map) {
2648 $rmp->{region} = $exit->region->name; 2636 $rmp->{region} = $exit->region->name;
2649 $rmp->{origin_map} = $exit->map->path; 2637 $rmp->{origin_map} = $exit->map->path;
2650 $rmp->{origin_x} = $exit->x; 2638 $rmp->{origin_x} = $exit->x;
2651 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2640
2641 $exit->map->touch;
2652 } 2642 }
2653 2643
2654 $rmp->{random_seed} ||= $exit->random_seed; 2644 $rmp->{random_seed} ||= $exit->random_seed;
2655 2645
2656 my $data = cf::encode_json $rmp; 2646 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2657 my $md5 = Digest::MD5::md5_hex $data; 2647 my $md5 = Digest::MD5::md5_hex $data;
2658 my $meta = "$RANDOMDIR/$md5.meta"; 2648 my $meta = "$RANDOMDIR/$md5.meta";
2659 2649
2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2650 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2661 aio_write $fh, 0, (length $data), $data, 0; 2651 aio_write $fh, 0, (length $data), $data, 0;
2662 undef $fh; 2652 undef $fh;
2663 aio_rename "$meta~", $meta; 2653 aio_rename "$meta~", $meta;
2664 2654
2655 my $slaying = "?random/$md5";
2656
2657 if ($exit->valid) {
2665 $exit->slaying ("?random/$md5"); 2658 $exit->slaying ("?random/$md5");
2666 $exit->msg (undef); 2659 $exit->msg (undef);
2660 }
2667 } 2661 }
2668} 2662}
2669 2663
2670sub cf::object::player::enter_exit { 2664sub cf::object::player::enter_exit {
2671 my ($self, $exit) = @_; 2665 my ($self, $exit) = @_;
2672 2666
2673 return unless $self->type == cf::PLAYER; 2667 return unless $self->type == cf::PLAYER;
2674 2668
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; 2669 $self->enter_link;
2687 2670
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 { 2671 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2672 $Coro::current->{desc} = "enter_exit";
2694 2673
2695 $self->deactivate_recursive; # just to be sure
2696 unless (eval { 2674 unless (eval {
2675 $self->deactivate_recursive; # just to be sure
2676
2677 # random map handling
2678 {
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 prepare_random_map $exit
2682 if $exit->slaying eq "/!";
2683 }
2684
2685 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2686 my $x = $exit->stats->hp;
2687 my $y = $exit->stats->sp;
2688
2697 $self->goto ($slaying, $hp, $sp); 2689 $self->goto ($map, $x, $y);
2698 2690
2691 # if exit is damned, update players death & WoR home-position
2692 $self->contr->savebed ($map, $x, $y)
2693 if $exit->flag (cf::FLAG_DAMNED);
2694
2699 1; 2695 1
2700 }) { 2696 }) {
2701 $self->message ("Something went wrong deep within the crossfire server. " 2697 $self->message ("Something went wrong deep within the crossfire server. "
2702 . "I'll try to bring you back to the map you were before. " 2698 . "I'll try to bring you back to the map you were before. "
2703 . "Please report this to the dungeon master!", 2699 . "Please report this to the dungeon master!",
2704 cf::NDI_UNIQUE | cf::NDI_RED); 2700 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2784 id => "infobox", 2780 id => "infobox",
2785 title => "Map Info", 2781 title => "Map Info",
2786 reply => undef, 2782 reply => undef,
2787 tooltip => "Information related to the maps", 2783 tooltip => "Information related to the maps",
2788 }, 2784 },
2785 "c/party" => {
2786 id => "party",
2787 title => "Party",
2788 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party",
2790 },
2789); 2791);
2790 2792
2791sub cf::client::send_msg { 2793sub cf::client::send_msg {
2792 my ($self, $channel, $msg, $color, @extra) = @_; 2794 my ($self, $channel, $msg, $color, @extra) = @_;
2793 2795
… …
2820 if ($self->can_msg) { 2822 if ($self->can_msg) {
2821 # default colour, mask it out 2823 # default colour, mask it out
2822 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2824 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2823 if $color & cf::NDI_DEF; 2825 if $color & cf::NDI_DEF;
2824 2826
2825 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2827 my $pkt = "msg "
2828 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2829 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2830 );
2831
2832 # try lzf for large packets
2833 $pkt = "lzf " . Compress::LZF::compress $pkt
2834 if 1024 <= length $pkt and $self->{can_lzf};
2835
2836 # split very large packets
2837 if (8192 < length $pkt and $self->{can_lzf}) {
2838 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2839 $pkt = "frag";
2840 }
2841
2842 $self->send_packet ($pkt);
2827 } else { 2843 } else {
2828 if ($color >= 0) { 2844 if ($color >= 0) {
2829 # replace some tags by gcfclient-compatible ones 2845 # replace some tags by gcfclient-compatible ones
2830 for ($msg) { 2846 for ($msg) {
2831 1 while 2847 1 while
… …
3030 3046
3031The following functions and methods are available within a safe environment: 3047The following functions and methods are available within a safe environment:
3032 3048
3033 cf::object 3049 cf::object
3034 contr pay_amount pay_player map x y force_find force_add destroy 3050 contr pay_amount pay_player map x y force_find force_add destroy
3035 insert remove name archname title slaying race decrease_ob_nr 3051 insert remove name archname title slaying race decrease split
3036 3052
3037 cf::object::player 3053 cf::object::player
3038 player 3054 player
3039 3055
3040 cf::player 3056 cf::player
… …
3045 3061
3046=cut 3062=cut
3047 3063
3048for ( 3064for (
3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3065 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race 3066 insert remove inv nrof name archname title slaying race
3051 decrease_ob_nr destroy)], 3067 decrease split destroy change_exp)],
3052 ["cf::object::player" => qw(player)], 3068 ["cf::object::player" => qw(player)],
3053 ["cf::player" => qw(peaceful)], 3069 ["cf::player" => qw(peaceful)],
3054 ["cf::map" => qw(trigger)], 3070 ["cf::map" => qw(trigger)],
3055) { 3071) {
3056 no strict 'refs'; 3072 no strict 'refs';
… …
3264 while (my ($k, $v) = each %$want) { 3280 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v); 3281 $ns->fx_want ($k, $v);
3266 } 3282 }
3267}; 3283};
3268 3284
3285sub load_resource_file($) {
3286 my $guard = lock_acquire "load_resource_file";
3287
3288 my $status = load_resource_file_ $_[0];
3289 get_slot 0.1, 100;
3290 cf::arch::commit_load;
3291
3292 $status
3293}
3294
3269sub reload_regions { 3295sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework 3296 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?) 3297 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3298 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3299
… …
3286} 3312}
3287 3313
3288sub reload_archetypes { 3314sub reload_archetypes {
3289 load_resource_file "$DATADIR/archetypes" 3315 load_resource_file "$DATADIR/archetypes"
3290 or die "unable to load archetypes\n"; 3316 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} 3317}
3297 3318
3298sub reload_treasures { 3319sub reload_treasures {
3299 load_resource_file "$DATADIR/treasures" 3320 load_resource_file "$DATADIR/treasures"
3300 or die "unable to load treasurelists\n"; 3321 or die "unable to load treasurelists\n";
3301} 3322}
3302 3323
3303sub reload_resources { 3324sub reload_resources {
3304 warn "reloading resource files...\n"; 3325 warn "reloading resource files...\n";
3305 3326
3327 reload_facedata;
3328 reload_archetypes;
3306 reload_regions; 3329 reload_regions;
3307 reload_facedata;
3308 #reload_archetypes;#d#
3309 reload_archetypes;
3310 reload_treasures; 3330 reload_treasures;
3311 3331
3312 warn "finished reloading resource files\n"; 3332 warn "finished reloading resource files\n";
3313} 3333}
3314 3334
3315sub init { 3335sub init {
3336 my $guard = freeze_mainloop;
3337
3338 evthread_start IO::AIO::poll_fileno;
3339
3316 reload_resources; 3340 reload_resources;
3317} 3341}
3318 3342
3319sub reload_config { 3343sub reload_config {
3320 open my $fh, "<:utf8", "$CONFDIR/config" 3344 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3335 }; 3359 };
3336 warn $@ if $@; 3360 warn $@ if $@;
3337 } 3361 }
3338} 3362}
3339 3363
3364sub pidfile() {
3365 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3366 or die "$PIDFILE: $!";
3367 flock $fh, &Fcntl::LOCK_EX
3368 or die "$PIDFILE: flock: $!";
3369 $fh
3370}
3371
3372# make sure only one server instance is running at any one time
3373sub atomic {
3374 my $fh = pidfile;
3375
3376 my $pid = <$fh>;
3377 kill 9, $pid if $pid > 0;
3378
3379 seek $fh, 0, 0;
3380 print $fh $$;
3381}
3382
3340sub main { 3383sub main {
3384 atomic;
3385
3341 # we must not ever block the main coroutine 3386 # we must not ever block the main coroutine
3342 local $Coro::idle = sub { 3387 local $Coro::idle = sub {
3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3388 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3344 (async { 3389 (async {
3345 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3390 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT; 3391 EV::loop EV::LOOP_ONESHOT;
3347 })->prio (Coro::PRIO_MAX); 3392 })->prio (Coro::PRIO_MAX);
3348 }; 3393 };
3349 3394
3395 {
3396 my $guard = freeze_mainloop;
3350 reload_config; 3397 reload_config;
3351 db_init; 3398 db_init;
3352 load_extensions; 3399 load_extensions;
3353 3400
3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3401 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 }
3403
3404 utime time, time, $RUNTIMEFILE;
3405
3406 # no (long-running) fork's whatsoever before this point(!)
3407 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3408
3356 EV::loop; 3409 EV::loop;
3357} 3410}
3358 3411
3359############################################################################# 3412#############################################################################
3360# initialisation and cleanup 3413# initialisation and cleanup
… …
3367 cf::cleanup "SIG$signal"; 3420 cf::cleanup "SIG$signal";
3368 }; 3421 };
3369 } 3422 }
3370} 3423}
3371 3424
3372sub write_runtime { 3425sub write_runtime_sync {
3373 my $runtime = "$LOCALDIR/runtime";
3374
3375 # first touch the runtime file to show we are still running: 3426 # first touch the runtime file to show we are still running:
3376 # the fsync below can take a very very long time. 3427 # the fsync below can take a very very long time.
3377 3428
3378 IO::AIO::aio_utime $runtime, undef, undef; 3429 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3379 3430
3380 my $guard = cf::lock_acquire "write_runtime"; 3431 my $guard = cf::lock_acquire "write_runtime";
3381 3432
3382 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3433 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3383 or return; 3434 or return;
3384 3435
3385 my $value = $cf::RUNTIME + 90 + 10; 3436 my $value = $cf::RUNTIME + 90 + 10;
3386 # 10 is the runtime save interval, for a monotonic clock 3437 # 10 is the runtime save interval, for a monotonic clock
3387 # 60 allows for the watchdog to kill the server. 3438 # 60 allows for the watchdog to kill the server.
… …
3397 aio_utime $fh, undef, undef; 3448 aio_utime $fh, undef, undef;
3398 3449
3399 close $fh 3450 close $fh
3400 or return; 3451 or return;
3401 3452
3402 aio_rename "$runtime~", $runtime 3453 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3403 and return; 3454 and return;
3404 3455
3405 warn "runtime file written.\n"; 3456 warn "runtime file written.\n";
3406 3457
3407 1 3458 1
3459}
3460
3461our $uuid_lock;
3462our $uuid_skip;
3463
3464sub write_uuid_sync($) {
3465 $uuid_skip ||= $_[0];
3466
3467 return if $uuid_lock;
3468 local $uuid_lock = 1;
3469
3470 my $uuid = "$LOCALDIR/uuid";
3471
3472 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3473 or return;
3474
3475 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3476 $uuid_skip = 0;
3477
3478 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3479 and return;
3480
3481 # always fsync - this file is important
3482 aio_fsync $fh
3483 and return;
3484
3485 close $fh
3486 or return;
3487
3488 aio_rename "$uuid~", $uuid
3489 and return;
3490
3491 warn "uuid file written ($value).\n";
3492
3493 1
3494
3495}
3496
3497sub write_uuid($$) {
3498 my ($skip, $sync) = @_;
3499
3500 $sync ? write_uuid_sync $skip
3501 : async { write_uuid_sync $skip };
3408} 3502}
3409 3503
3410sub emergency_save() { 3504sub emergency_save() {
3411 my $freeze_guard = cf::freeze_mainloop; 3505 my $freeze_guard = cf::freeze_mainloop;
3412 3506
… …
3434 warn "end emergency map save\n"; 3528 warn "end emergency map save\n";
3435 3529
3436 warn "begin emergency database checkpoint\n"; 3530 warn "begin emergency database checkpoint\n";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3531 BDB::db_env_txn_checkpoint $DB_ENV;
3438 warn "end emergency database checkpoint\n"; 3532 warn "end emergency database checkpoint\n";
3533
3534 warn "begin write uuid\n";
3535 write_uuid_sync 1;
3536 warn "end write uuid\n";
3439 }; 3537 };
3440 3538
3441 warn "leave emergency perl save\n"; 3539 warn "leave emergency perl save\n";
3442} 3540}
3443 3541
3444sub post_cleanup { 3542sub post_cleanup {
3445 my ($make_core) = @_; 3543 my ($make_core) = @_;
3446 3544
3447 warn Carp::longmess "post_cleanup backtrace" 3545 warn Carp::longmess "post_cleanup backtrace"
3448 if $make_core; 3546 if $make_core;
3547
3548 my $fh = pidfile;
3549 unlink $PIDFILE if <$fh> == $$;
3449} 3550}
3551
3552# a safer delete_package, copied from Symbol
3553sub clear_package($) {
3554 my $pkg = shift;
3555
3556 # expand to full symbol table name if needed
3557 unless ($pkg =~ /^main::.*::$/) {
3558 $pkg = "main$pkg" if $pkg =~ /^::/;
3559 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3560 $pkg .= '::' unless $pkg =~ /::$/;
3561 }
3562
3563 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3564 my $stem_symtab = *{$stem}{HASH};
3565
3566 defined $stem_symtab and exists $stem_symtab->{$leaf}
3567 or return;
3568
3569 # clear all symbols
3570 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3571 for my $name (keys %$leaf_symtab) {
3572 _gv_clear *{"$pkg$name"};
3573# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3574 }
3575 warn "cleared package #$pkg\n";#d#
3576}
3577
3578our $RELOAD; # how many times to reload
3450 3579
3451sub do_reload_perl() { 3580sub do_reload_perl() {
3452 # can/must only be called in main 3581 # can/must only be called in main
3453 if ($Coro::current != $Coro::main) { 3582 if ($Coro::current != $Coro::main) {
3454 warn "can only reload from main coroutine"; 3583 warn "can only reload from main coroutine";
3455 return; 3584 return;
3456 } 3585 }
3457 3586
3587 return if $RELOAD++;
3588
3589 while ($RELOAD) {
3458 warn "reloading..."; 3590 warn "reloading...";
3459 3591
3460 warn "entering sync_job"; 3592 warn "entering sync_job";
3461 3593
3462 cf::sync_job { 3594 cf::sync_job {
3463 cf::write_runtime; # external watchdog should not bark 3595 cf::write_runtime_sync; # external watchdog should not bark
3464 cf::emergency_save; 3596 cf::emergency_save;
3465 cf::write_runtime; # external watchdog should not bark 3597 cf::write_runtime_sync; # external watchdog should not bark
3466 3598
3467 warn "syncing database to disk"; 3599 warn "syncing database to disk";
3468 BDB::db_env_txn_checkpoint $DB_ENV; 3600 BDB::db_env_txn_checkpoint $DB_ENV;
3469 3601
3470 # if anything goes wrong in here, we should simply crash as we already saved 3602 # if anything goes wrong in here, we should simply crash as we already saved
3471 3603
3472 warn "flushing outstanding aio requests"; 3604 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; 3605 while (IO::AIO::nreqs || BDB::nreqs) {
3478 warn "iterate..."; 3606 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 } 3607 }
3504 3608
3505 warn "... nuking $pkg"; 3609 warn "cancelling all extension coros";
3506 Symbol::delete_package $pkg; 3610 $_->cancel for values %EXT_CORO;
3507 } 3611 %EXT_CORO = ();
3508 3612
3509 warn "unloading all perl modules loaded from $LIBDIR"; 3613 warn "removing commands";
3510 while (my ($k, $v) = each %INC) { 3614 %COMMAND = ();
3511 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3512 3615
3616 warn "removing ext/exti commands";
3617 %EXTCMD = ();
3618 %EXTICMD = ();
3619
3620 warn "unloading/nuking all extensions";
3621 for my $pkg (@EXTS) {
3513 warn "... unloading $k"; 3622 warn "... unloading $pkg";
3514 delete $INC{$k};
3515 3623
3516 $k =~ s/\.pm$//;
3517 $k =~ s/\//::/g;
3518
3519 if (my $cb = $k->can ("unload_module")) { 3624 if (my $cb = $pkg->can ("unload")) {
3625 eval {
3520 $cb->(); 3626 $cb->($pkg);
3627 1
3628 } or warn "$pkg unloaded, but with errors: $@";
3629 }
3630
3631 warn "... clearing $pkg";
3632 clear_package $pkg;
3521 } 3633 }
3522 3634
3523 Symbol::delete_package $k; 3635 warn "unloading all perl modules loaded from $LIBDIR";
3636 while (my ($k, $v) = each %INC) {
3637 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3638
3639 warn "... unloading $k";
3640 delete $INC{$k};
3641
3642 $k =~ s/\.pm$//;
3643 $k =~ s/\//::/g;
3644
3645 if (my $cb = $k->can ("unload_module")) {
3646 $cb->();
3647 }
3648
3649 clear_package $k;
3524 } 3650 }
3525 3651
3526 warn "getting rid of safe::, as good as possible"; 3652 warn "getting rid of safe::, as good as possible";
3527 Symbol::delete_package "safe::$_" 3653 clear_package "safe::$_"
3528 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3654 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3529 3655
3530 warn "unloading cf.pm \"a bit\""; 3656 warn "unloading cf.pm \"a bit\"";
3531 delete $INC{"cf.pm"}; 3657 delete $INC{"cf.pm"};
3532 delete $INC{"cf/pod.pm"}; 3658 delete $INC{"cf/pod.pm"};
3533 3659
3534 # don't, removes xs symbols, too, 3660 # don't, removes xs symbols, too,
3535 # and global variables created in xs 3661 # and global variables created in xs
3536 #Symbol::delete_package __PACKAGE__; 3662 #clear_package __PACKAGE__;
3537 3663
3538 warn "unload completed, starting to reload now"; 3664 warn "unload completed, starting to reload now";
3539 3665
3540 warn "reloading cf.pm"; 3666 warn "reloading cf.pm";
3541 require cf; 3667 require cf;
3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3668 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3543 3669
3544 warn "loading config and database again"; 3670 warn "loading config and database again";
3545 cf::reload_config; 3671 cf::reload_config;
3546 3672
3547 warn "loading extensions"; 3673 warn "loading extensions";
3548 cf::load_extensions; 3674 cf::load_extensions;
3549 3675
3550 warn "reattaching attachments to objects/players"; 3676 warn "reattaching attachments to objects/players";
3551 _global_reattach; # objects, sockets 3677 _global_reattach; # objects, sockets
3552 warn "reattaching attachments to maps"; 3678 warn "reattaching attachments to maps";
3553 reattach $_ for values %MAP; 3679 reattach $_ for values %MAP;
3554 warn "reattaching attachments to players"; 3680 warn "reattaching attachments to players";
3555 reattach $_ for values %PLAYER; 3681 reattach $_ for values %PLAYER;
3556 3682
3557 warn "leaving sync_job"; 3683 warn "leaving sync_job";
3558 3684
3559 1 3685 1
3560 } or do { 3686 } or do {
3561 warn $@; 3687 warn $@;
3562 cf::cleanup "error while reloading, exiting."; 3688 cf::cleanup "error while reloading, exiting.";
3563 }; 3689 };
3564 3690
3565 warn "reloaded"; 3691 warn "reloaded";
3692 --$RELOAD;
3693 }
3566}; 3694};
3567 3695
3568our $RELOAD_WATCHER; # used only during reload 3696our $RELOAD_WATCHER; # used only during reload
3569 3697
3570sub reload_perl() { 3698sub reload_perl() {
… …
3595 3723
3596our @WAIT_FOR_TICK; 3724our @WAIT_FOR_TICK;
3597our @WAIT_FOR_TICK_BEGIN; 3725our @WAIT_FOR_TICK_BEGIN;
3598 3726
3599sub wait_for_tick { 3727sub wait_for_tick {
3600 return unless $TICK_WATCHER->is_active;
3601 return if $Coro::current == $Coro::main; 3728 return if tick_inhibit || $Coro::current == $Coro::main;
3602 3729
3603 my $signal = new Coro::Signal; 3730 my $signal = new Coro::Signal;
3604 push @WAIT_FOR_TICK, $signal; 3731 push @WAIT_FOR_TICK, $signal;
3605 $signal->wait; 3732 $signal->wait;
3606} 3733}
3607 3734
3608sub wait_for_tick_begin { 3735sub wait_for_tick_begin {
3609 return unless $TICK_WATCHER->is_active;
3610 return if $Coro::current == $Coro::main; 3736 return if tick_inhibit || $Coro::current == $Coro::main;
3611 3737
3612 my $signal = new Coro::Signal; 3738 my $signal = new Coro::Signal;
3613 push @WAIT_FOR_TICK_BEGIN, $signal; 3739 push @WAIT_FOR_TICK_BEGIN, $signal;
3614 $signal->wait; 3740 $signal->wait;
3615} 3741}
3616 3742
3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3743sub tick {
3618 if ($Coro::current != $Coro::main) { 3744 if ($Coro::current != $Coro::main) {
3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3745 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3620 unless ++$bug_warning > 10; 3746 unless ++$bug_warning > 10;
3621 return; 3747 return;
3622 } 3748 }
3623 3749
3624 $NOW = $tick_start = EV::now;
3625
3626 cf::server_tick; # one server iteration 3750 cf::server_tick; # one server iteration
3627
3628 $RUNTIME += $TICK;
3629 $NEXT_TICK = $_[0]->at;
3630 3751
3631 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3752 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3753 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3633 Coro::async_pool { 3754 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver"; 3755 $Coro::current->{desc} = "runtime saver";
3635 write_runtime 3756 write_runtime_sync
3636 or warn "ERROR: unable to write runtime file: $!"; 3757 or warn "ERROR: unable to write runtime file: $!";
3637 }; 3758 };
3638 } 3759 }
3639 3760
3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3761 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3642 } 3763 }
3643 while (my $sig = shift @WAIT_FOR_TICK) { 3764 while (my $sig = shift @WAIT_FOR_TICK) {
3644 $sig->send; 3765 $sig->send;
3645 } 3766 }
3646 3767
3647 $LOAD = ($NOW - $tick_start) / $TICK; 3768 $LOAD = ($NOW - $TICK_START) / $TICK;
3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3769 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3649 3770
3650 _post_tick; 3771 if (0) {
3651}; 3772 if ($NEXT_TICK) {
3652$TICK_WATCHER->priority (EV::MAXPRI); 3773 my $jitter = $TICK_START - $NEXT_TICK;
3774 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3775 warn "jitter $JITTER\n";#d#
3776 }
3777 }
3778}
3653 3779
3654{ 3780{
3655 # configure BDB 3781 # configure BDB
3656 3782
3657 BDB::min_parallel 8; 3783 BDB::min_parallel 8;
3658 BDB::max_poll_reqs $TICK * 0.1; 3784 BDB::max_poll_reqs $TICK * 0.1;
3659 $Coro::BDB::WATCHER->priority (1); 3785 $AnyEvent::BDB::WATCHER->priority (1);
3660 3786
3661 unless ($DB_ENV) { 3787 unless ($DB_ENV) {
3662 $DB_ENV = BDB::db_env_create; 3788 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3789 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3664 | BDB::LOG_AUTOREMOVE, 1); 3790 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3791 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3792 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3793 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3667 3794
3668 cf::sync_job { 3795 cf::sync_job {
3669 eval { 3796 eval {
… …
3695{ 3822{
3696 # configure IO::AIO 3823 # configure IO::AIO
3697 3824
3698 IO::AIO::min_parallel 8; 3825 IO::AIO::min_parallel 8;
3699 IO::AIO::max_poll_time $TICK * 0.1; 3826 IO::AIO::max_poll_time $TICK * 0.1;
3700 $Coro::AIO::WATCHER->priority (1); 3827 undef $AnyEvent::AIO::WATCHER;
3701} 3828}
3702 3829
3703my $_log_backtrace; 3830my $_log_backtrace;
3704 3831
3705sub _log_backtrace { 3832sub _log_backtrace {
… …
3708 $msg =~ s/\n//; 3835 $msg =~ s/\n//;
3709 3836
3710 # limit the # of concurrent backtraces 3837 # limit the # of concurrent backtraces
3711 if ($_log_backtrace < 2) { 3838 if ($_log_backtrace < 2) {
3712 ++$_log_backtrace; 3839 ++$_log_backtrace;
3840 my $perl_bt = Carp::longmess $msg;
3713 async { 3841 async {
3714 $Coro::current->{desc} = "abt $msg"; 3842 $Coro::current->{desc} = "abt $msg";
3715 3843
3716 my @bt = fork_call { 3844 my @bt = fork_call {
3717 @addr = map { sprintf "%x", $_ } @addr; 3845 @addr = map { sprintf "%x", $_ } @addr;
… …
3728 } 3856 }
3729 3857
3730 @funcs 3858 @funcs
3731 }; 3859 };
3732 3860
3733 LOG llevInfo, "[ABT] $msg\n"; 3861 LOG llevInfo, "[ABT] $perl_bt\n";
3862 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3734 LOG llevInfo, "[ABT] $_\n" for @bt; 3863 LOG llevInfo, "[ABT] $_\n" for @bt;
3735 --$_log_backtrace; 3864 --$_log_backtrace;
3736 }; 3865 };
3737 } else { 3866 } else {
3738 LOG llevInfo, "[ABT] $msg\n"; 3867 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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