ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

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