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.406 by root, Mon Dec 17 08:27:44 2007 UTC vs.
Revision 1.442 by root, Sun Aug 31 09:03:31 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::Syck (); 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
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 69
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 71
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 73
… …
72our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE; 97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
82 103
83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 107our $DB_ENV;
88 108
… …
99# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 121
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
105 126
106binmode STDOUT; 127binmode STDOUT;
107binmode STDERR; 128binmode STDERR;
108 129
109# read virtual server time, if available 130# read virtual server time, if available
… …
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 215
195 LOG llevError, $msg; 216 LOG llevError, $msg;
196 }; 217 };
197} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
198 234
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
209for my $pkg (qw( 245for my $pkg (qw(
210 cf::global cf::attachable 246 cf::global cf::attachable
211 cf::object cf::object::player 247 cf::object cf::object::player
212 cf::client cf::player 248 cf::client cf::player
213 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
214 cf::map cf::party cf::region 251 cf::party cf::region
215)) { 252)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 254}
219 255
220$EV::DIED = sub { 256$EV::DIED = sub {
221 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
… …
327 363
328 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
329} 365}
330 366
331sub freeze_mainloop { 367sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
333 369
334 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start;
336 };
337 $TICK_WATCHER->stop;
338 $guard
339} 371}
340 372
341=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
342 374
343Like EV::periodic, but randomly selects a starting point so that the actions 375Like EV::periodic, but randomly selects a starting point so that the actions
… …
398 } 430 }
399 } 431 }
400}; 432};
401 433
402sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
403 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
404 438
405 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
406 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
407 441
… …
444 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
445 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
446 480
447 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
448 482
449 # TODO: use suspend/resume instead
450 # (but this is cancel-safe)
451 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
452 484
453 my $busy = 1; 485 my $busy = 1;
454 my @res; 486 my @res;
455 487
… …
466 } else { 498 } else {
467 EV::loop EV::LOOP_ONESHOT; 499 EV::loop EV::LOOP_ONESHOT;
468 } 500 }
469 } 501 }
470 502
471 $time = EV::time - $time; 503 my $time = EV::time - $time;
472 504
473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
475
476 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
477 506
478 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
479 } else { 508 } else {
480 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
481 510
… …
523 reset_signals; 552 reset_signals;
524 &$cb 553 &$cb
525 }, @args; 554 }, @args;
526 555
527 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
528} 584}
529 585
530=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
531 587
532Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
1032 1088
1033sub reattach { 1089sub reattach {
1034 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1035 my ($obj) = @_; 1091 my ($obj) = @_;
1036 1092
1093 # no longer needed after getting rid of delete_package?
1037 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1038 1095
1039 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1040 1097
1041 @$registry = (); 1098 @$registry = ();
1042 1099
… …
1088 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1089 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1090 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1091 1148
1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1093 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1095 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1096 close $fh; 1153 aio_close $fh;
1097 1154
1098 if (@$objs) { 1155 if (@$objs) {
1099 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1100 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1102 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1103 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1104 close $fh; 1161 aio_close $fh;
1105 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1106 } 1163 }
1107 } else { 1164 } else {
1108 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1109 } 1166 }
… …
1278 1335
1279 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1280 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1281 1338
1282 $ext{source} = 1339 $ext{source} =
1283 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1284 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1285 . $source 1342 . $source
1286 . "\n};\n1"; 1343 . "\n};\n1";
1287 1344
1288 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1304 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1305 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1306 1363
1307 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1308 warn $msg; 1365 warn $msg;
1309 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1310 exit 1;
1311 } 1367 }
1312 1368
1313 warn $msg; 1369 warn $msg;
1314 } 1370 }
1315 1371
… …
1404 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1405 or return; 1461 or return;
1406 1462
1407 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1408 or return; 1464 or return;
1465
1409 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1410 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1411 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1412 } 1469 }
1413 } 1470 }
… …
1423 1480
1424 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1425 1482
1426 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1427 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1428 1487
1429 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1430 cf::cede_to_tick; 1489 cf::cede_to_tick;
1431} 1490}
1432 1491
… …
1468 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1469 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1470 1529
1471 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1472 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1473 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1474 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1475 1536
1476 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1477 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1516 1577
1517 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1518 my $path = path $login; 1579 my $path = path $login;
1519 1580
1520 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1521 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1523 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1524 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 } 1587 }
1526 1588
… …
1563 1625
1564Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1565 1627
1566=cut 1628=cut
1567 1629
1568use re 'eval';
1569
1570my $group;
1571my $interior; $interior = qr{
1572 # match a pod interior sequence sans C<< >>
1573 (?:
1574 \ (.*?)\ (?{ $group = $^N })
1575 | < (??{$interior}) >
1576 )
1577}x;
1578
1579sub expand_cfpod { 1630sub expand_cfpod {
1580 my ($self, $pod) = @_; 1631 my ($self, $pod) = @_;
1581 1632
1633 my @nest = [qr<\G$>, undef, ""];
1582 my $xml; 1634 my $xml;
1583 1635
1636 for ($pod) {
1584 while () { 1637 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) { 1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1586 $group = $1;
1587
1588 $group =~ s/&/&amp;/g;
1589 $group =~ s/</&lt;/g;
1590
1591 $xml .= $group; 1639 $xml .= $1;
1592 } elsif ($pod =~ m%\G 1640 } elsif (/\G\n(?=\S)/xgcs) {
1593 ([BCGHITU]) 1641 $xml .= " ";
1594 < 1642 } elsif (/\G\n/xgcs) {
1595 (?: 1643 $xml .= "\n";
1596 ([^<>]*) (?{ $group = $^N }) 1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1597 | < $interior > 1645 my ($code, $delim) = ($1, scalar reverse $2);
1598 ) 1646 $delim =~ y/</>/; # delim now contains the stop sequence
1599 > 1647 $delim = qr{\G\Q$delim};
1600 %gcsx
1601 ) {
1602 my ($code, $data) = ($1, $group);
1603 1648
1649 my $cb;
1650
1604 if ($code eq "B") { 1651 if ($code eq "B") {
1605 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>"; 1652 $cb = sub { "<b>$_[0]</b>" };
1606 } elsif ($code eq "I") {
1607 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1608 } elsif ($code eq "U") {
1609 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1610 } elsif ($code eq "C") { 1653 } elsif ($code eq "C") {
1611 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>"; 1654 $cb = sub { "<tt>$_[0]</tt>" };
1612 } elsif ($code eq "T") { 1655 } elsif ($code eq "E") {
1613 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>"; 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1614 } elsif ($code eq "G") { 1657 } elsif ($code eq "G") {
1658 $cb = sub {
1615 my ($male, $female) = split /\|/, $data; 1659 my ($male, $female) = split /\|/, $_[0];
1616 $data = $self->gender ? $female : $male; 1660 $self->gender ? $female : $male
1617 $xml .= expand_cfpod ($self, $data); 1661 };
1618 } elsif ($code eq "H") { 1662 } elsif ($code eq "H") {
1619 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>", 1663 $cb = sub {
1664 (
1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1621 "") 1667 "",
1622 [$self->{hintmode}]; 1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1623 } else { 1699 } else {
1624 $xml .= "error processing '$code($data)' directive"; 1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1625 } 1707 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 } 1708 }
1630 last;
1631 }
1632 }
1633
1634 for ($xml) {
1635 # create single paragraphs (very hackish)
1636 s/(?<=\S)\n(?=\w)/ /g;
1637
1638 # compress some whitespace
1639 s/\s+\n/\n/g; # ws line-ends
1640 s/\n\n+/\n/g; # double lines
1641 s/^\n+//; # beginning lines
1642 s/\n+$//; # ending lines
1643 } 1709 }
1644 1710
1645 $xml 1711 $xml
1646} 1712}
1647
1648no re 'eval';
1649 1713
1650sub hintmode { 1714sub hintmode {
1651 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1652 $_[0]{hintmode} 1716 $_[0]{hintmode}
1653} 1717}
… …
1725our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1726our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1727 1791
1728sub generate_random_map { 1792sub generate_random_map {
1729 my ($self, $rmp) = @_; 1793 my ($self, $rmp) = @_;
1794
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796
1730 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1731 $self->_create_random_map ( 1798 $self->_create_random_map (
1732 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1733 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1734 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1856 1923
1857# the temporary/swap location 1924# the temporary/swap location
1858sub save_path { 1925sub save_path {
1859 my ($self) = @_; 1926 my ($self) = @_;
1860 1927
1861 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1862 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1863} 1930}
1864 1931
1865# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1866sub uniq_path { 1933sub uniq_path {
1867 my ($self) = @_; 1934 my ($self) = @_;
1868 1935
1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1870 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1871} 1938}
1872 1939
1873# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1874# all maps in C++... 1941# all maps in C++...
… …
1972 2039
1973 cf::lock_wait "map_data:$path";#d#remove 2040 cf::lock_wait "map_data:$path";#d#remove
1974 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
1975 2042
1976 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
1977 my $guard1 = cf::lock_acquire "map_find:$path";
1978 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
1979 2046
1980 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
1981 or return; 2048 or return;
1982 2049
1983 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
… …
1986 or return; 2053 or return;
1987 2054
1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1989 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
1990 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
1991 undef $guard1; 2059 undef $guard1;
1992 undef $guard2;
1993 $map->reset; 2060 $map->reset;
1994 return find $path; 2061 return find $path;
1995 } 2062 }
1996 2063
1997 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
… …
2024 my $f = new_from_file cf::object::thawer $self->{load_path}; 2091 my $f = new_from_file cf::object::thawer $self->{load_path};
2025 $f->skip_block; 2092 $f->skip_block;
2026 $self->_load_objects ($f) 2093 $self->_load_objects ($f)
2027 or return; 2094 or return;
2028 2095
2029 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
2030 if delete $self->{load_original}; 2097 if delete $self->{load_original};
2031 2098
2032 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
2033 utf8::encode $uniq; 2100 utf8::encode $uniq;
2034 unless (aio_stat $uniq) { 2101 unless (aio_stat $uniq) {
… …
2060 } 2127 }
2061 2128
2062 $self->{last_save} = $cf::RUNTIME; 2129 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME); 2130 $self->last_access ($cf::RUNTIME);
2064 2131
2065 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
2066 } 2133 }
2067 2134
2068 $self->post_load; 2135 $self->post_load;
2069} 2136}
2070 2137
… …
2128 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
2129 2196
2130 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
2131 2198
2132 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2134 } 2201 }
2135 2202
2136 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
2137 2204
2138 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
… …
2175 cf::async { 2242 cf::async {
2176 $Coro::current->{desc} = "map player save"; 2243 $Coro::current->{desc} = "map player save";
2177 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2178 }; 2245 };
2179 2246
2247 cf::get_slot 0.02;
2248
2180 if ($uniq) { 2249 if ($uniq) {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2182 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2183 } else { 2252 } else {
2184 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2192 $self->save; 2261 $self->save;
2193 2262
2194 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2195 2264
2196 return if $self->players; 2265 return if $self->players;
2197 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2198 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2199 2268
2200 $self->in_memory (cf::MAP_SWAPPED); 2269 $self->in_memory (cf::MAP_SWAPPED);
2201 2270
2202 $self->deactivate; 2271 $self->deactivate;
… …
2320 2389
2321sub unique_maps() { 2390sub unique_maps() {
2322 [ 2391 [
2323 map { 2392 map {
2324 utf8::decode $_; 2393 utf8::decode $_;
2325 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2326 ? normalise $_ 2397 : normalise $_
2327 : ()
2328 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2329 ] 2399 ]
2330} 2400}
2331 2401
2332package cf;
2333
2334=back 2402=back
2335 2403
2336=head3 cf::object 2404=head3 cf::object
2337 2405
2338=cut 2406=cut
… …
2341 2409
2342=over 4 2410=over 4
2343 2411
2344=item $ob->inv_recursive 2412=item $ob->inv_recursive
2345 2413
2346Returns the inventory of the object _and_ their inventories, recursively. 2414Returns the inventory of the object I<and> their inventories, recursively,
2415but I<not> the object itself.
2347 2416
2348=cut 2417=cut
2349 2418
2350sub inv_recursive_; 2419sub inv_recursive_;
2351sub inv_recursive_ { 2420sub inv_recursive_ {
… …
2356 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2357} 2426}
2358 2427
2359=item $ref = $ob->ref 2428=item $ref = $ob->ref
2360 2429
2361creates and returns a persistent reference to an objetc that can be stored as a string. 2430Creates and returns a persistent reference to an object that can be stored as a string.
2362 2431
2363=item $ob = cf::object::deref ($refstring) 2432=item $ob = cf::object::deref ($refstring)
2364 2433
2365returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2434returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2366even if the object actually exists. May block. 2435even if the object actually exists. May block.
… …
2398can be C<undef>. Does the right thing when the player is currently in a 2467can be C<undef>. Does the right thing when the player is currently in a
2399dialogue with the given NPC character. 2468dialogue with the given NPC character.
2400 2469
2401=cut 2470=cut
2402 2471
2472our $SAY_CHANNEL = {
2473 id => "say",
2474 title => "Map",
2475 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2477};
2478
2479our $CHAT_CHANNEL = {
2480 id => "chat",
2481 title => "Chat",
2482 reply => "chat ",
2483 tooltip => "Player chat and shouts, global to the server.",
2484};
2485
2403# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2404# with dialog boxes. 2487# with dialog boxes.
2405#TODO: the first argument must go, split into a $npc->reply_to ( method 2488#TODO: the first argument must go, split into a $npc->reply_to ( method
2406sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2407 my ($self, $npc, $msg, $flags) = @_; 2490 my ($self, $npc, $msg, $flags) = @_;
… …
2418 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2502 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2420 2503
2421 } else { 2504 } else {
2422 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2423 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2424 } 2507 }
2425 } 2508 }
2426} 2509}
2427 2510
2428=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2535Moves the player to the given map-path and coordinates by first freezing 2618Moves the player to the given map-path and coordinates by first freezing
2536her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2537that has to return the map if sucecssful, and then unfreezes the player on 2620that has to return the map if sucecssful, and then unfreezes the player on
2538the new (success) or old (failed) map position. In either case, $done will 2621the new (success) or old (failed) map position. In either case, $done will
2539be called at the end of this process. 2622be called at the end of this process.
2623
2624Note that $check will be called with a potentially non-loaded map, so if
2625it needs a loaded map it has to call C<< ->load >>.
2540 2626
2541=cut 2627=cut
2542 2628
2543our $GOTOGEN; 2629our $GOTOGEN;
2544 2630
… …
2623} 2709}
2624 2710
2625sub prepare_random_map { 2711sub prepare_random_map {
2626 my ($exit) = @_; 2712 my ($exit) = @_;
2627 2713
2628 my $guard = cf::lock_acquire "exit_prepare:$exit";
2629
2630 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2631 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2632 # that depends on the exit object 2716 # that depends on the exit object
2633 2717
2634 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
… …
2636 if ($exit->map) { 2720 if ($exit->map) {
2637 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2638 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2639 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2640 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2641 } 2727 }
2642 2728
2643 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2644 2730
2645 my $data = cf::encode_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2646 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2647 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2648 2734
2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2650 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2651 undef $fh; 2737 undef $fh;
2652 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2653 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2654 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2655 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2656 } 2746 }
2657} 2747}
2658 2748
2659sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2660 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2661 2751
2662 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2663 2753
2664 if ($exit->slaying eq "/!") {
2665 #TODO: this should de-fi-ni-te-ly not be a sync-job
2666 # the problem is that $exit might not survive long enough
2667 # so it needs to be done right now, right here
2668 cf::sync_job { prepare_random_map $exit };
2669 }
2670
2671 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2672 my $hp = $exit->stats->hp;
2673 my $sp = $exit->stats->sp;
2674
2675 $self->enter_link; 2754 $self->enter_link;
2676 2755
2677 # if exit is damned, update players death & WoR home-position
2678 $self->contr->savebed ($slaying, $hp, $sp)
2679 if $exit->flag (FLAG_DAMNED);
2680
2681 (async { 2756 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2757 $Coro::current->{desc} = "enter_exit";
2683 2758
2684 $self->deactivate_recursive; # just to be sure
2685 unless (eval { 2759 unless (eval {
2760 $self->deactivate_recursive; # just to be sure
2761
2762 # random map handling
2763 {
2764 my $guard = cf::lock_acquire "exit_prepare:$exit";
2765
2766 prepare_random_map $exit
2767 if $exit->slaying eq "/!";
2768 }
2769
2770 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2771 my $x = $exit->stats->hp;
2772 my $y = $exit->stats->sp;
2773
2686 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2687 2775
2776 # if exit is damned, update players death & WoR home-position
2777 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED);
2779
2688 1; 2780 1
2689 }) { 2781 }) {
2690 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2691 . "I'll try to bring you back to the map you were before. " 2783 . "I'll try to bring you back to the map you were before. "
2692 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2693 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2773 id => "infobox", 2865 id => "infobox",
2774 title => "Map Info", 2866 title => "Map Info",
2775 reply => undef, 2867 reply => undef,
2776 tooltip => "Information related to the maps", 2868 tooltip => "Information related to the maps",
2777 }, 2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2875 },
2778); 2876);
2779 2877
2780sub cf::client::send_msg { 2878sub cf::client::send_msg {
2781 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2782 2880
… …
3019 3117
3020The following functions and methods are available within a safe environment: 3118The following functions and methods are available within a safe environment:
3021 3119
3022 cf::object 3120 cf::object
3023 contr pay_amount pay_player map x y force_find force_add destroy 3121 contr pay_amount pay_player map x y force_find force_add destroy
3024 insert remove name archname title slaying race decrease_ob_nr 3122 insert remove name archname title slaying race decrease split
3025 3123
3026 cf::object::player 3124 cf::object::player
3027 player 3125 player
3028 3126
3029 cf::player 3127 cf::player
… …
3034 3132
3035=cut 3133=cut
3036 3134
3037for ( 3135for (
3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3136 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3039 insert remove inv name archname title slaying race 3137 insert remove inv nrof name archname title slaying race
3040 decrease_ob_nr destroy)], 3138 decrease split destroy change_exp)],
3041 ["cf::object::player" => qw(player)], 3139 ["cf::object::player" => qw(player)],
3042 ["cf::player" => qw(peaceful)], 3140 ["cf::player" => qw(peaceful)],
3043 ["cf::map" => qw(trigger)], 3141 ["cf::map" => qw(trigger)],
3044) { 3142) {
3045 no strict 'refs'; 3143 no strict 'refs';
… …
3253 while (my ($k, $v) = each %$want) { 3351 while (my ($k, $v) = each %$want) {
3254 $ns->fx_want ($k, $v); 3352 $ns->fx_want ($k, $v);
3255 } 3353 }
3256}; 3354};
3257 3355
3356sub load_resource_file($) {
3357 my $guard = lock_acquire "load_resource_file";
3358
3359 my $status = load_resource_file_ $_[0];
3360 get_slot 0.1, 100;
3361 cf::arch::commit_load;
3362
3363 $status
3364}
3365
3258sub reload_regions { 3366sub reload_regions {
3259 # HACK to clear player env face cache, we need some signal framework 3367 # HACK to clear player env face cache, we need some signal framework
3260 # for this (global event?) 3368 # for this (global event?)
3261 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3262 3370
… …
3275} 3383}
3276 3384
3277sub reload_archetypes { 3385sub reload_archetypes {
3278 load_resource_file "$DATADIR/archetypes" 3386 load_resource_file "$DATADIR/archetypes"
3279 or die "unable to load archetypes\n"; 3387 or die "unable to load archetypes\n";
3280 #d# NEED to laod twice to resolve forward references
3281 # this really needs to be done in an extra post-pass
3282 # (which needs to be synchronous, so solve it differently)
3283 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n";
3285} 3388}
3286 3389
3287sub reload_treasures { 3390sub reload_treasures {
3288 load_resource_file "$DATADIR/treasures" 3391 load_resource_file "$DATADIR/treasures"
3289 or die "unable to load treasurelists\n"; 3392 or die "unable to load treasurelists\n";
3290} 3393}
3291 3394
3292sub reload_resources { 3395sub reload_resources {
3293 warn "reloading resource files...\n"; 3396 warn "reloading resource files...\n";
3294 3397
3398 reload_facedata;
3399 reload_archetypes;
3295 reload_regions; 3400 reload_regions;
3296 reload_facedata;
3297 #reload_archetypes;#d#
3298 reload_archetypes;
3299 reload_treasures; 3401 reload_treasures;
3300 3402
3301 warn "finished reloading resource files\n"; 3403 warn "finished reloading resource files\n";
3302} 3404}
3303 3405
3304sub init { 3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3305 reload_resources; 3411 reload_resources;
3306} 3412}
3307 3413
3308sub reload_config { 3414sub reload_config {
3309 open my $fh, "<:utf8", "$CONFDIR/config" 3415 open my $fh, "<:utf8", "$CONFDIR/config"
3310 or return; 3416 or return;
3311 3417
3312 local $/; 3418 local $/;
3313 *CFG = YAML::Syck::Load <$fh>; 3419 *CFG = YAML::Load <$fh>;
3314 3420
3315 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3421 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3316 3422
3317 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3423 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3318 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3424 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3334 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3440 $Coro::current->{desc} = "IDLE BUG HANDLER";
3335 EV::loop EV::LOOP_ONESHOT; 3441 EV::loop EV::LOOP_ONESHOT;
3336 })->prio (Coro::PRIO_MAX); 3442 })->prio (Coro::PRIO_MAX);
3337 }; 3443 };
3338 3444
3445 {
3446 my $guard = freeze_mainloop;
3339 reload_config; 3447 reload_config;
3340 db_init; 3448 db_init;
3341 load_extensions; 3449 load_extensions;
3342 3450
3343 $TICK_WATCHER->start;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3452 }
3453
3345 EV::loop; 3454 EV::loop;
3346} 3455}
3347 3456
3348############################################################################# 3457#############################################################################
3349# initialisation and cleanup 3458# initialisation and cleanup
… …
3356 cf::cleanup "SIG$signal"; 3465 cf::cleanup "SIG$signal";
3357 }; 3466 };
3358 } 3467 }
3359} 3468}
3360 3469
3361sub write_runtime { 3470sub write_runtime_sync {
3362 my $runtime = "$LOCALDIR/runtime"; 3471 my $runtime = "$LOCALDIR/runtime";
3363 3472
3364 # first touch the runtime file to show we are still running: 3473 # first touch the runtime file to show we are still running:
3365 # the fsync below can take a very very long time. 3474 # the fsync below can take a very very long time.
3366 3475
… …
3392 and return; 3501 and return;
3393 3502
3394 warn "runtime file written.\n"; 3503 warn "runtime file written.\n";
3395 3504
3396 1 3505 1
3506}
3507
3508our $uuid_lock;
3509our $uuid_skip;
3510
3511sub write_uuid_sync($) {
3512 $uuid_skip ||= $_[0];
3513
3514 return if $uuid_lock;
3515 local $uuid_lock = 1;
3516
3517 my $uuid = "$LOCALDIR/uuid";
3518
3519 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3520 or return;
3521
3522 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3523 $uuid_skip = 0;
3524
3525 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3526 and return;
3527
3528 # always fsync - this file is important
3529 aio_fsync $fh
3530 and return;
3531
3532 close $fh
3533 or return;
3534
3535 aio_rename "$uuid~", $uuid
3536 and return;
3537
3538 warn "uuid file written ($value).\n";
3539
3540 1
3541
3542}
3543
3544sub write_uuid($$) {
3545 my ($skip, $sync) = @_;
3546
3547 $sync ? write_uuid_sync $skip
3548 : async { write_uuid_sync $skip };
3397} 3549}
3398 3550
3399sub emergency_save() { 3551sub emergency_save() {
3400 my $freeze_guard = cf::freeze_mainloop; 3552 my $freeze_guard = cf::freeze_mainloop;
3401 3553
… …
3423 warn "end emergency map save\n"; 3575 warn "end emergency map save\n";
3424 3576
3425 warn "begin emergency database checkpoint\n"; 3577 warn "begin emergency database checkpoint\n";
3426 BDB::db_env_txn_checkpoint $DB_ENV; 3578 BDB::db_env_txn_checkpoint $DB_ENV;
3427 warn "end emergency database checkpoint\n"; 3579 warn "end emergency database checkpoint\n";
3580
3581 warn "begin write uuid\n";
3582 write_uuid_sync 1;
3583 warn "end write uuid\n";
3428 }; 3584 };
3429 3585
3430 warn "leave emergency perl save\n"; 3586 warn "leave emergency perl save\n";
3431} 3587}
3432 3588
… …
3434 my ($make_core) = @_; 3590 my ($make_core) = @_;
3435 3591
3436 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
3437 if $make_core; 3593 if $make_core;
3438} 3594}
3595
3596# a safer delete_package, copied from Symbol
3597sub clear_package($) {
3598 my $pkg = shift;
3599
3600 # expand to full symbol table name if needed
3601 unless ($pkg =~ /^main::.*::$/) {
3602 $pkg = "main$pkg" if $pkg =~ /^::/;
3603 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3604 $pkg .= '::' unless $pkg =~ /::$/;
3605 }
3606
3607 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3608 my $stem_symtab = *{$stem}{HASH};
3609
3610 defined $stem_symtab and exists $stem_symtab->{$leaf}
3611 or return;
3612
3613 # clear all symbols
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 }
3619 warn "cleared package #$pkg\n";#d#
3620}
3621
3622our $RELOAD; # how many times to reload
3439 3623
3440sub do_reload_perl() { 3624sub do_reload_perl() {
3441 # can/must only be called in main 3625 # can/must only be called in main
3442 if ($Coro::current != $Coro::main) { 3626 if ($Coro::current != $Coro::main) {
3443 warn "can only reload from main coroutine"; 3627 warn "can only reload from main coroutine";
3444 return; 3628 return;
3445 } 3629 }
3446 3630
3631 return if $RELOAD++;
3632
3633 while ($RELOAD) {
3447 warn "reloading..."; 3634 warn "reloading...";
3448 3635
3449 warn "entering sync_job"; 3636 warn "entering sync_job";
3450 3637
3451 cf::sync_job { 3638 cf::sync_job {
3452 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3453 cf::emergency_save; 3640 cf::emergency_save;
3454 cf::write_runtime; # external watchdog should not bark 3641 cf::write_runtime_sync; # external watchdog should not bark
3455 3642
3456 warn "syncing database to disk"; 3643 warn "syncing database to disk";
3457 BDB::db_env_txn_checkpoint $DB_ENV; 3644 BDB::db_env_txn_checkpoint $DB_ENV;
3458 3645
3459 # if anything goes wrong in here, we should simply crash as we already saved 3646 # if anything goes wrong in here, we should simply crash as we already saved
3460 3647
3461 warn "flushing outstanding aio requests"; 3648 warn "flushing outstanding aio requests";
3462 for (;;) {
3463 BDB::flush;
3464 IO::AIO::flush;
3465 Coro::cede_notself;
3466 last unless IO::AIO::nreqs || BDB::nreqs; 3649 while (IO::AIO::nreqs || BDB::nreqs) {
3467 warn "iterate..."; 3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3468 }
3469
3470 ++$RELOAD;
3471
3472 warn "cancelling all extension coros";
3473 $_->cancel for values %EXT_CORO;
3474 %EXT_CORO = ();
3475
3476 warn "removing commands";
3477 %COMMAND = ();
3478
3479 warn "removing ext/exti commands";
3480 %EXTCMD = ();
3481 %EXTICMD = ();
3482
3483 warn "unloading/nuking all extensions";
3484 for my $pkg (@EXTS) {
3485 warn "... unloading $pkg";
3486
3487 if (my $cb = $pkg->can ("unload")) {
3488 eval {
3489 $cb->($pkg);
3490 1
3491 } or warn "$pkg unloaded, but with errors: $@";
3492 } 3651 }
3493 3652
3494 warn "... nuking $pkg"; 3653 warn "cancelling all extension coros";
3495 Symbol::delete_package $pkg; 3654 $_->cancel for values %EXT_CORO;
3496 } 3655 %EXT_CORO = ();
3497 3656
3498 warn "unloading all perl modules loaded from $LIBDIR"; 3657 warn "removing commands";
3499 while (my ($k, $v) = each %INC) { 3658 %COMMAND = ();
3500 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3501 3659
3660 warn "removing ext/exti commands";
3661 %EXTCMD = ();
3662 %EXTICMD = ();
3663
3664 warn "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) {
3502 warn "... unloading $k"; 3666 warn "... unloading $pkg";
3503 delete $INC{$k};
3504 3667
3505 $k =~ s/\.pm$//;
3506 $k =~ s/\//::/g;
3507
3508 if (my $cb = $k->can ("unload_module")) { 3668 if (my $cb = $pkg->can ("unload")) {
3669 eval {
3509 $cb->(); 3670 $cb->($pkg);
3671 1
3672 } or warn "$pkg unloaded, but with errors: $@";
3673 }
3674
3675 warn "... clearing $pkg";
3676 clear_package $pkg;
3510 } 3677 }
3511 3678
3512 Symbol::delete_package $k; 3679 warn "unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682
3683 warn "... unloading $k";
3684 delete $INC{$k};
3685
3686 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g;
3688
3689 if (my $cb = $k->can ("unload_module")) {
3690 $cb->();
3691 }
3692
3693 clear_package $k;
3513 } 3694 }
3514 3695
3515 warn "getting rid of safe::, as good as possible"; 3696 warn "getting rid of safe::, as good as possible";
3516 Symbol::delete_package "safe::$_" 3697 clear_package "safe::$_"
3517 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3518 3699
3519 warn "unloading cf.pm \"a bit\""; 3700 warn "unloading cf.pm \"a bit\"";
3520 delete $INC{"cf.pm"}; 3701 delete $INC{"cf.pm"};
3521 delete $INC{"cf/pod.pm"}; 3702 delete $INC{"cf/pod.pm"};
3522 3703
3523 # don't, removes xs symbols, too, 3704 # don't, removes xs symbols, too,
3524 # and global variables created in xs 3705 # and global variables created in xs
3525 #Symbol::delete_package __PACKAGE__; 3706 #clear_package __PACKAGE__;
3526 3707
3527 warn "unload completed, starting to reload now"; 3708 warn "unload completed, starting to reload now";
3528 3709
3529 warn "reloading cf.pm"; 3710 warn "reloading cf.pm";
3530 require cf; 3711 require cf;
3531 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3532 3713
3533 warn "loading config and database again"; 3714 warn "loading config and database again";
3534 cf::reload_config; 3715 cf::reload_config;
3535 3716
3536 warn "loading extensions"; 3717 warn "loading extensions";
3537 cf::load_extensions; 3718 cf::load_extensions;
3538 3719
3539 warn "reattaching attachments to objects/players"; 3720 warn "reattaching attachments to objects/players";
3540 _global_reattach; # objects, sockets 3721 _global_reattach; # objects, sockets
3541 warn "reattaching attachments to maps"; 3722 warn "reattaching attachments to maps";
3542 reattach $_ for values %MAP; 3723 reattach $_ for values %MAP;
3543 warn "reattaching attachments to players"; 3724 warn "reattaching attachments to players";
3544 reattach $_ for values %PLAYER; 3725 reattach $_ for values %PLAYER;
3545 3726
3546 warn "leaving sync_job"; 3727 warn "leaving sync_job";
3547 3728
3548 1 3729 1
3549 } or do { 3730 } or do {
3550 warn $@; 3731 warn $@;
3551 warn "error while reloading, exiting."; 3732 cf::cleanup "error while reloading, exiting.";
3552 exit 1;
3553 }; 3733 };
3554 3734
3555 warn "reloaded"; 3735 warn "reloaded";
3736 --$RELOAD;
3737 }
3556}; 3738};
3557 3739
3558our $RELOAD_WATCHER; # used only during reload 3740our $RELOAD_WATCHER; # used only during reload
3559 3741
3560sub reload_perl() { 3742sub reload_perl() {
3561 # doing reload synchronously and two reloads happen back-to-back, 3743 # doing reload synchronously and two reloads happen back-to-back,
3562 # coro crashes during coro_state_free->destroy here. 3744 # coro crashes during coro_state_free->destroy here.
3563 3745
3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3747 do_reload_perl;
3565 undef $RELOAD_WATCHER; 3748 undef $RELOAD_WATCHER;
3566 do_reload_perl;
3567 }; 3749 };
3568} 3750}
3569 3751
3570register_command "reload" => sub { 3752register_command "reload" => sub {
3571 my ($who, $arg) = @_; 3753 my ($who, $arg) = @_;
… …
3585 3767
3586our @WAIT_FOR_TICK; 3768our @WAIT_FOR_TICK;
3587our @WAIT_FOR_TICK_BEGIN; 3769our @WAIT_FOR_TICK_BEGIN;
3588 3770
3589sub wait_for_tick { 3771sub wait_for_tick {
3590 return unless $TICK_WATCHER->is_active;
3591 return if $Coro::current == $Coro::main; 3772 return if tick_inhibit || $Coro::current == $Coro::main;
3592 3773
3593 my $signal = new Coro::Signal; 3774 my $signal = new Coro::Signal;
3594 push @WAIT_FOR_TICK, $signal; 3775 push @WAIT_FOR_TICK, $signal;
3595 $signal->wait; 3776 $signal->wait;
3596} 3777}
3597 3778
3598sub wait_for_tick_begin { 3779sub wait_for_tick_begin {
3599 return unless $TICK_WATCHER->is_active;
3600 return if $Coro::current == $Coro::main; 3780 return if tick_inhibit || $Coro::current == $Coro::main;
3601 3781
3602 my $signal = new Coro::Signal; 3782 my $signal = new Coro::Signal;
3603 push @WAIT_FOR_TICK_BEGIN, $signal; 3783 push @WAIT_FOR_TICK_BEGIN, $signal;
3604 $signal->wait; 3784 $signal->wait;
3605} 3785}
3606 3786
3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3787sub tick {
3608 if ($Coro::current != $Coro::main) { 3788 if ($Coro::current != $Coro::main) {
3609 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3789 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3610 unless ++$bug_warning > 10; 3790 unless ++$bug_warning > 10;
3611 return; 3791 return;
3612 } 3792 }
3613 3793
3614 $NOW = $tick_start = EV::now;
3615
3616 cf::server_tick; # one server iteration 3794 cf::server_tick; # one server iteration
3617
3618 $RUNTIME += $TICK;
3619 $NEXT_TICK = $_[0]->at;
3620 3795
3621 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3796 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3797 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3623 Coro::async_pool { 3798 Coro::async_pool {
3624 $Coro::current->{desc} = "runtime saver"; 3799 $Coro::current->{desc} = "runtime saver";
3625 write_runtime 3800 write_runtime_sync
3626 or warn "ERROR: unable to write runtime file: $!"; 3801 or warn "ERROR: unable to write runtime file: $!";
3627 }; 3802 };
3628 } 3803 }
3629 3804
3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3805 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3632 } 3807 }
3633 while (my $sig = shift @WAIT_FOR_TICK) { 3808 while (my $sig = shift @WAIT_FOR_TICK) {
3634 $sig->send; 3809 $sig->send;
3635 } 3810 }
3636 3811
3637 $LOAD = ($NOW - $tick_start) / $TICK; 3812 $LOAD = ($NOW - $TICK_START) / $TICK;
3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3813 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3639 3814
3640 _post_tick; 3815 if (0) {
3641}; 3816 if ($NEXT_TICK) {
3642$TICK_WATCHER->priority (EV::MAXPRI); 3817 my $jitter = $TICK_START - $NEXT_TICK;
3818 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3819 warn "jitter $JITTER\n";#d#
3820 }
3821 }
3822}
3643 3823
3644{ 3824{
3645 # configure BDB 3825 # configure BDB
3646 3826
3647 BDB::min_parallel 8; 3827 BDB::min_parallel 8;
3648 BDB::max_poll_reqs $TICK * 0.1; 3828 BDB::max_poll_reqs $TICK * 0.1;
3649 $Coro::BDB::WATCHER->priority (1); 3829 $AnyEvent::BDB::WATCHER->priority (1);
3650 3830
3651 unless ($DB_ENV) { 3831 unless ($DB_ENV) {
3652 $DB_ENV = BDB::db_env_create; 3832 $DB_ENV = BDB::db_env_create;
3653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3833 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3654 | BDB::LOG_AUTOREMOVE, 1); 3834 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3835 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3655 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3836 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3656 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3837 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3657 3838
3658 cf::sync_job { 3839 cf::sync_job {
3659 eval { 3840 eval {
… …
3685{ 3866{
3686 # configure IO::AIO 3867 # configure IO::AIO
3687 3868
3688 IO::AIO::min_parallel 8; 3869 IO::AIO::min_parallel 8;
3689 IO::AIO::max_poll_time $TICK * 0.1; 3870 IO::AIO::max_poll_time $TICK * 0.1;
3690 $Coro::AIO::WATCHER->priority (1); 3871 undef $AnyEvent::AIO::WATCHER;
3691} 3872}
3692 3873
3693my $_log_backtrace; 3874my $_log_backtrace;
3694 3875
3695sub _log_backtrace { 3876sub _log_backtrace {

Diff Legend

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