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.407 by root, Sun Jan 13 09:53:53 2008 UTC vs.
Revision 1.443 by root, Sun Aug 31 10:05:26 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use EV 1.86; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
15use Coro 4.32 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
18use Coro::EV; 40use Coro::EV;
41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
23use Coro::BDB; 47use Coro::BDB 1.6;
24use Coro::Storable; 48use Coro::Storable;
25use Coro::Util (); 49use Coro::Util ();
26 50
27use JSON::XS 2.01 (); 51use JSON::XS 2.01 ();
28use BDB (); 52use BDB ();
29use Data::Dumper; 53use Data::Dumper;
30use Digest::MD5; 54use Digest::MD5;
31use Fcntl; 55use Fcntl;
32use YAML::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
… …
195 LOG llevError, $msg; 216 LOG llevError, $msg;
196 }; 217 };
197} 218}
198 219
199$Coro::State::DIEHOOK = sub { 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
200 warn Carp::longmess $_[0]; 229 warn Carp::longmess $_[0];
201 Coro::terminate; 230 Coro::terminate
202}; 231};
232
233$SIG{__DIE__} = sub { }; #d#?
203 234
204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
207@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
214for my $pkg (qw( 245for my $pkg (qw(
215 cf::global cf::attachable 246 cf::global cf::attachable
216 cf::object cf::object::player 247 cf::object cf::object::player
217 cf::client cf::player 248 cf::client cf::player
218 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
219 cf::map cf::party cf::region 251 cf::party cf::region
220)) { 252)) {
221 no strict 'refs';
222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
223} 254}
224 255
225$EV::DIED = sub { 256$EV::DIED = sub {
226 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
… …
332 363
333 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
334} 365}
335 366
336sub freeze_mainloop { 367sub freeze_mainloop {
337 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
338 369
339 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
340 $TICK_WATCHER->start;
341 };
342 $TICK_WATCHER->stop;
343 $guard
344} 371}
345 372
346=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
347 374
348Like 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
… …
403 } 430 }
404 } 431 }
405}; 432};
406 433
407sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
408 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
409 438
410 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
411 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
412 441
… …
449 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
450 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
451 480
452 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
453 482
454 # TODO: use suspend/resume instead
455 # (but this is cancel-safe)
456 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
457 484
458 my $busy = 1; 485 my $busy = 1;
459 my @res; 486 my @res;
460 487
… …
471 } else { 498 } else {
472 EV::loop EV::LOOP_ONESHOT; 499 EV::loop EV::LOOP_ONESHOT;
473 } 500 }
474 } 501 }
475 502
476 $time = EV::time - $time; 503 my $time = EV::time - $time;
477 504
478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
480
481 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
482 506
483 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
484 } else { 508 } else {
485 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
486 510
… …
528 reset_signals; 552 reset_signals;
529 &$cb 553 &$cb
530 }, @args; 554 }, @args;
531 555
532 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
533} 584}
534 585
535=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
536 587
537Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
1037 1088
1038sub reattach { 1089sub reattach {
1039 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1040 my ($obj) = @_; 1091 my ($obj) = @_;
1041 1092
1093 # no longer needed after getting rid of delete_package?
1042 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
1043 1095
1044 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1045 1097
1046 @$registry = (); 1098 @$registry = ();
1047 1099
… …
1093 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1094 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1095 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1096 1148
1097 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1099 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1100 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1101 close $fh; 1153 aio_close $fh;
1102 1154
1103 if (@$objs) { 1155 if (@$objs) {
1104 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) {
1105 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1107 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1108 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1109 close $fh; 1161 aio_close $fh;
1110 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1111 } 1163 }
1112 } else { 1164 } else {
1113 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1114 } 1166 }
… …
1283 1335
1284 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1285 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1286 1338
1287 $ext{source} = 1339 $ext{source} =
1288 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1289 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1290 . $source 1342 . $source
1291 . "\n};\n1"; 1343 . "\n};\n1";
1292 1344
1293 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1309 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1310 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1311 1363
1312 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1313 warn $msg; 1365 warn $msg;
1314 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1315 exit 1;
1316 } 1367 }
1317 1368
1318 warn $msg; 1369 warn $msg;
1319 } 1370 }
1320 1371
… …
1409 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1410 or return; 1461 or return;
1411 1462
1412 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1413 or return; 1464 or return;
1465
1414 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1415 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1416 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1417 } 1469 }
1418 } 1470 }
… …
1428 1480
1429 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1430 1482
1431 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1432 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1433 1487
1434 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1435 cf::cede_to_tick; 1489 cf::cede_to_tick;
1436} 1490}
1437 1491
… …
1469 my ($pl) = @_; 1523 my ($pl) = @_;
1470 1524
1471 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1472 1526
1473 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1474 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1475 1529
1476 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1477 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1478 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1479 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1480 1536
1481 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1482 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1521 1577
1522 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1523 my $path = path $login; 1579 my $path = path $login;
1524 1580
1525 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1526 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1527 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1528 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1529 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1530 } 1587 }
1531 1588
… …
1568 1625
1569Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1570 1627
1571=cut 1628=cut
1572 1629
1573use re 'eval';
1574
1575my $group;
1576my $interior; $interior = qr{
1577 # match a pod interior sequence sans C<< >>
1578 (?:
1579 \ (.*?)\ (?{ $group = $^N })
1580 | < (??{$interior}) >
1581 )
1582}x;
1583
1584sub expand_cfpod { 1630sub expand_cfpod {
1585 my ($self, $pod) = @_; 1631 my ($self, $pod) = @_;
1586 1632
1633 my @nest = [qr<\G$>, undef, ""];
1587 my $xml; 1634 my $xml;
1588 1635
1636 for ($pod) {
1589 while () { 1637 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) { 1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1591 $group = $1;
1592
1593 $group =~ s/&/&amp;/g;
1594 $group =~ s/</&lt;/g;
1595
1596 $xml .= $group; 1639 $xml .= $1;
1597 } elsif ($pod =~ m%\G 1640 } elsif (/\G\n(?=\S)/xgcs) {
1598 ([BCGHITU]) 1641 $xml .= " ";
1599 < 1642 } elsif (/\G\n/xgcs) {
1600 (?: 1643 $xml .= "\n";
1601 ([^<>]*) (?{ $group = $^N }) 1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1602 | < $interior > 1645 my ($code, $delim) = ($1, scalar reverse $2);
1603 ) 1646 $delim =~ y/</>/; # delim now contains the stop sequence
1604 > 1647 $delim = qr{\G\Q$delim};
1605 %gcsx
1606 ) {
1607 my ($code, $data) = ($1, $group);
1608 1648
1649 my $cb;
1650
1609 if ($code eq "B") { 1651 if ($code eq "B") {
1610 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>"; 1652 $cb = sub { "<b>$_[0]</b>" };
1611 } elsif ($code eq "I") {
1612 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1613 } elsif ($code eq "U") {
1614 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1615 } elsif ($code eq "C") { 1653 } elsif ($code eq "C") {
1616 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>"; 1654 $cb = sub { "<tt>$_[0]</tt>" };
1617 } elsif ($code eq "T") { 1655 } elsif ($code eq "E") {
1618 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>"; 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1619 } elsif ($code eq "G") { 1657 } elsif ($code eq "G") {
1658 $cb = sub {
1620 my ($male, $female) = split /\|/, $data; 1659 my ($male, $female) = split /\|/, $_[0];
1621 $data = $self->gender ? $female : $male; 1660 $self->gender ? $female : $male
1622 $xml .= expand_cfpod ($self, $data); 1661 };
1623 } elsif ($code eq "H") { 1662 } elsif ($code eq "H") {
1624 $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>",
1625 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1626 "") 1667 "",
1627 [$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 .= ">";
1628 } else { 1699 } else {
1629 $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 }
1630 } 1707 }
1631 } else {
1632 if ($pod =~ /\G(.+)/) {
1633 warn "parse error while expanding $pod (at $1)";
1634 } 1708 }
1635 last;
1636 }
1637 }
1638
1639 for ($xml) {
1640 # create single paragraphs (very hackish)
1641 s/(?<=\S)\n(?=\w)/ /g;
1642
1643 # compress some whitespace
1644 s/\s+\n/\n/g; # ws line-ends
1645 s/\n\n+/\n/g; # double lines
1646 s/^\n+//; # beginning lines
1647 s/\n+$//; # ending lines
1648 } 1709 }
1649 1710
1650 $xml 1711 $xml
1651} 1712}
1652
1653no re 'eval';
1654 1713
1655sub hintmode { 1714sub hintmode {
1656 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1657 $_[0]{hintmode} 1716 $_[0]{hintmode}
1658} 1717}
… …
1730our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1731our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1732 1791
1733sub generate_random_map { 1792sub generate_random_map {
1734 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
1735 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1798 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1861 1923
1862# the temporary/swap location 1924# the temporary/swap location
1863sub save_path { 1925sub save_path {
1864 my ($self) = @_; 1926 my ($self) = @_;
1865 1927
1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1867 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1868} 1930}
1869 1931
1870# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1871sub uniq_path { 1933sub uniq_path {
1872 my ($self) = @_; 1934 my ($self) = @_;
1873 1935
1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1875 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1876} 1938}
1877 1939
1878# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1879# all maps in C++... 1941# all maps in C++...
… …
1977 2039
1978 cf::lock_wait "map_data:$path";#d#remove 2040 cf::lock_wait "map_data:$path";#d#remove
1979 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
1980 2042
1981 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
1982 my $guard1 = cf::lock_acquire "map_find:$path";
1983 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";
1984 2046
1985 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
1986 or return; 2048 or return;
1987 2049
1988 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
… …
1991 or return; 2053 or return;
1992 2054
1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1994 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
1995 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
1996 undef $guard1; 2059 undef $guard1;
1997 undef $guard2;
1998 $map->reset; 2060 $map->reset;
1999 return find $path; 2061 return find $path;
2000 } 2062 }
2001 2063
2002 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
… …
2029 my $f = new_from_file cf::object::thawer $self->{load_path}; 2091 my $f = new_from_file cf::object::thawer $self->{load_path};
2030 $f->skip_block; 2092 $f->skip_block;
2031 $self->_load_objects ($f) 2093 $self->_load_objects ($f)
2032 or return; 2094 or return;
2033 2095
2034 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
2035 if delete $self->{load_original}; 2097 if delete $self->{load_original};
2036 2098
2037 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
2038 utf8::encode $uniq; 2100 utf8::encode $uniq;
2039 unless (aio_stat $uniq) { 2101 unless (aio_stat $uniq) {
… …
2065 } 2127 }
2066 2128
2067 $self->{last_save} = $cf::RUNTIME; 2129 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME); 2130 $self->last_access ($cf::RUNTIME);
2069 2131
2070 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
2071 } 2133 }
2072 2134
2073 $self->post_load; 2135 $self->post_load;
2074} 2136}
2075 2137
… …
2133 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
2134 2196
2135 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
2136 2198
2137 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2139 } 2201 }
2140 2202
2141 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
2142 2204
2143 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
… …
2180 cf::async { 2242 cf::async {
2181 $Coro::current->{desc} = "map player save"; 2243 $Coro::current->{desc} = "map player save";
2182 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2183 }; 2245 };
2184 2246
2247 cf::get_slot 0.02;
2248
2185 if ($uniq) { 2249 if ($uniq) {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2187 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2188 } else { 2252 } else {
2189 $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);
… …
2197 $self->save; 2261 $self->save;
2198 2262
2199 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2200 2264
2201 return if $self->players; 2265 return if $self->players;
2202 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2203 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2204 2268
2205 $self->in_memory (cf::MAP_SWAPPED); 2269 $self->in_memory (cf::MAP_SWAPPED);
2206 2270
2207 $self->deactivate; 2271 $self->deactivate;
… …
2325 2389
2326sub unique_maps() { 2390sub unique_maps() {
2327 [ 2391 [
2328 map { 2392 map {
2329 utf8::decode $_; 2393 utf8::decode $_;
2330 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2331 ? normalise $_ 2397 : normalise $_
2332 : ()
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2399 ]
2335} 2400}
2336 2401
2337package cf;
2338
2339=back 2402=back
2340 2403
2341=head3 cf::object 2404=head3 cf::object
2342 2405
2343=cut 2406=cut
… …
2346 2409
2347=over 4 2410=over 4
2348 2411
2349=item $ob->inv_recursive 2412=item $ob->inv_recursive
2350 2413
2351Returns 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.
2352 2416
2353=cut 2417=cut
2354 2418
2355sub inv_recursive_; 2419sub inv_recursive_;
2356sub inv_recursive_ { 2420sub inv_recursive_ {
… …
2361 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2362} 2426}
2363 2427
2364=item $ref = $ob->ref 2428=item $ref = $ob->ref
2365 2429
2366creates 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.
2367 2431
2368=item $ob = cf::object::deref ($refstring) 2432=item $ob = cf::object::deref ($refstring)
2369 2433
2370returns 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,
2371even if the object actually exists. May block. 2435even if the object actually exists. May block.
… …
2403can 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
2404dialogue with the given NPC character. 2468dialogue with the given NPC character.
2405 2469
2406=cut 2470=cut
2407 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
2408# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2409# with dialog boxes. 2487# with dialog boxes.
2410#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
2411sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2412 my ($self, $npc, $msg, $flags) = @_; 2490 my ($self, $npc, $msg, $flags) = @_;
… …
2423 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2424 $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));
2425 2503
2426 } else { 2504 } else {
2427 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2428 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2429 } 2507 }
2430 } 2508 }
2431} 2509}
2432 2510
2433=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2540Moves 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
2541her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2542that 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
2543the 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
2544be 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 >>.
2545 2626
2546=cut 2627=cut
2547 2628
2548our $GOTOGEN; 2629our $GOTOGEN;
2549 2630
… …
2628} 2709}
2629 2710
2630sub prepare_random_map { 2711sub prepare_random_map {
2631 my ($exit) = @_; 2712 my ($exit) = @_;
2632 2713
2633 my $guard = cf::lock_acquire "exit_prepare:$exit";
2634
2635 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2636 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2637 # that depends on the exit object 2716 # that depends on the exit object
2638 2717
2639 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
… …
2641 if ($exit->map) { 2720 if ($exit->map) {
2642 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2643 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2644 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2645 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2646 } 2727 }
2647 2728
2648 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2649 2730
2650 my $data = cf::encode_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2651 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2652 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2653 2734
2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2655 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2656 undef $fh; 2737 undef $fh;
2657 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2658 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2659 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2660 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2661 } 2746 }
2662} 2747}
2663 2748
2664sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2665 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2666 2751
2667 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2668 2753
2669 if ($exit->slaying eq "/!") {
2670 #TODO: this should de-fi-ni-te-ly not be a sync-job
2671 # the problem is that $exit might not survive long enough
2672 # so it needs to be done right now, right here
2673 cf::sync_job { prepare_random_map $exit };
2674 }
2675
2676 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2677 my $hp = $exit->stats->hp;
2678 my $sp = $exit->stats->sp;
2679
2680 $self->enter_link; 2754 $self->enter_link;
2681 2755
2682 # if exit is damned, update players death & WoR home-position
2683 $self->contr->savebed ($slaying, $hp, $sp)
2684 if $exit->flag (FLAG_DAMNED);
2685
2686 (async { 2756 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2757 $Coro::current->{desc} = "enter_exit";
2688 2758
2689 $self->deactivate_recursive; # just to be sure
2690 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
2691 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2692 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
2693 1; 2780 1
2694 }) { 2781 }) {
2695 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2696 . "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. "
2697 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2698 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2778 id => "infobox", 2865 id => "infobox",
2779 title => "Map Info", 2866 title => "Map Info",
2780 reply => undef, 2867 reply => undef,
2781 tooltip => "Information related to the maps", 2868 tooltip => "Information related to the maps",
2782 }, 2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2875 },
2783); 2876);
2784 2877
2785sub cf::client::send_msg { 2878sub cf::client::send_msg {
2786 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2787 2880
… …
2814 if ($self->can_msg) { 2907 if ($self->can_msg) {
2815 # default colour, mask it out 2908 # default colour, mask it out
2816 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2817 if $color & cf::NDI_DEF; 2910 if $color & cf::NDI_DEF;
2818 2911
2819 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2912 my $pkt = "msg "
2913 . $self->{json_coder}->encode (
2820 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2914 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2915 );
2916
2917 # try lzf for large packets
2918 $pkt = "lzf " . Compress::LZF::compress $pkt
2919 if 1024 <= length $pkt and $self->{can_lzf};
2920
2921 # split very large packets
2922 if (8192 < length $pkt and $self->{can_lzf}) {
2923 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2924 $pkt = "frag";
2925 }
2926
2927 $self->send_packet ($pkt);
2821 } else { 2928 } else {
2822 if ($color >= 0) { 2929 if ($color >= 0) {
2823 # replace some tags by gcfclient-compatible ones 2930 # replace some tags by gcfclient-compatible ones
2824 for ($msg) { 2931 for ($msg) {
2825 1 while 2932 1 while
… …
3024 3131
3025The following functions and methods are available within a safe environment: 3132The following functions and methods are available within a safe environment:
3026 3133
3027 cf::object 3134 cf::object
3028 contr pay_amount pay_player map x y force_find force_add destroy 3135 contr pay_amount pay_player map x y force_find force_add destroy
3029 insert remove name archname title slaying race decrease_ob_nr 3136 insert remove name archname title slaying race decrease split
3030 3137
3031 cf::object::player 3138 cf::object::player
3032 player 3139 player
3033 3140
3034 cf::player 3141 cf::player
… …
3039 3146
3040=cut 3147=cut
3041 3148
3042for ( 3149for (
3043 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3150 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3044 insert remove inv name archname title slaying race 3151 insert remove inv nrof name archname title slaying race
3045 decrease_ob_nr destroy)], 3152 decrease split destroy change_exp)],
3046 ["cf::object::player" => qw(player)], 3153 ["cf::object::player" => qw(player)],
3047 ["cf::player" => qw(peaceful)], 3154 ["cf::player" => qw(peaceful)],
3048 ["cf::map" => qw(trigger)], 3155 ["cf::map" => qw(trigger)],
3049) { 3156) {
3050 no strict 'refs'; 3157 no strict 'refs';
… …
3258 while (my ($k, $v) = each %$want) { 3365 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v); 3366 $ns->fx_want ($k, $v);
3260 } 3367 }
3261}; 3368};
3262 3369
3370sub load_resource_file($) {
3371 my $guard = lock_acquire "load_resource_file";
3372
3373 my $status = load_resource_file_ $_[0];
3374 get_slot 0.1, 100;
3375 cf::arch::commit_load;
3376
3377 $status
3378}
3379
3263sub reload_regions { 3380sub reload_regions {
3264 # HACK to clear player env face cache, we need some signal framework 3381 # HACK to clear player env face cache, we need some signal framework
3265 # for this (global event?) 3382 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3383 %ext::player_env::MUSIC_FACE_CACHE = ();
3267 3384
… …
3280} 3397}
3281 3398
3282sub reload_archetypes { 3399sub reload_archetypes {
3283 load_resource_file "$DATADIR/archetypes" 3400 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n"; 3401 or die "unable to load archetypes\n";
3285 #d# NEED to laod twice to resolve forward references
3286 # this really needs to be done in an extra post-pass
3287 # (which needs to be synchronous, so solve it differently)
3288 load_resource_file "$DATADIR/archetypes"
3289 or die "unable to load archetypes\n";
3290} 3402}
3291 3403
3292sub reload_treasures { 3404sub reload_treasures {
3293 load_resource_file "$DATADIR/treasures" 3405 load_resource_file "$DATADIR/treasures"
3294 or die "unable to load treasurelists\n"; 3406 or die "unable to load treasurelists\n";
3295} 3407}
3296 3408
3297sub reload_resources { 3409sub reload_resources {
3298 warn "reloading resource files...\n"; 3410 warn "reloading resource files...\n";
3299 3411
3412 reload_facedata;
3413 reload_archetypes;
3300 reload_regions; 3414 reload_regions;
3301 reload_facedata;
3302 #reload_archetypes;#d#
3303 reload_archetypes;
3304 reload_treasures; 3415 reload_treasures;
3305 3416
3306 warn "finished reloading resource files\n"; 3417 warn "finished reloading resource files\n";
3307} 3418}
3308 3419
3309sub init { 3420sub init {
3421 my $guard = freeze_mainloop;
3422
3423 evthread_start IO::AIO::poll_fileno;
3424
3310 reload_resources; 3425 reload_resources;
3311} 3426}
3312 3427
3313sub reload_config { 3428sub reload_config {
3314 open my $fh, "<:utf8", "$CONFDIR/config" 3429 open my $fh, "<:utf8", "$CONFDIR/config"
3315 or return; 3430 or return;
3316 3431
3317 local $/; 3432 local $/;
3318 *CFG = YAML::Syck::Load <$fh>; 3433 *CFG = YAML::Load <$fh>;
3319 3434
3320 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3435 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3321 3436
3322 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3437 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3323 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3438 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3339 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT; 3455 EV::loop EV::LOOP_ONESHOT;
3341 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3342 }; 3457 };
3343 3458
3459 {
3460 my $guard = freeze_mainloop;
3344 reload_config; 3461 reload_config;
3345 db_init; 3462 db_init;
3346 load_extensions; 3463 load_extensions;
3347 3464
3348 $TICK_WATCHER->start;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3466 }
3467
3350 EV::loop; 3468 EV::loop;
3351} 3469}
3352 3470
3353############################################################################# 3471#############################################################################
3354# initialisation and cleanup 3472# initialisation and cleanup
… …
3361 cf::cleanup "SIG$signal"; 3479 cf::cleanup "SIG$signal";
3362 }; 3480 };
3363 } 3481 }
3364} 3482}
3365 3483
3366sub write_runtime { 3484sub write_runtime_sync {
3367 my $runtime = "$LOCALDIR/runtime"; 3485 my $runtime = "$LOCALDIR/runtime";
3368 3486
3369 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
3370 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
3371 3489
… …
3397 and return; 3515 and return;
3398 3516
3399 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
3400 3518
3401 1 3519 1
3520}
3521
3522our $uuid_lock;
3523our $uuid_skip;
3524
3525sub write_uuid_sync($) {
3526 $uuid_skip ||= $_[0];
3527
3528 return if $uuid_lock;
3529 local $uuid_lock = 1;
3530
3531 my $uuid = "$LOCALDIR/uuid";
3532
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return;
3535
3536 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3537 $uuid_skip = 0;
3538
3539 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3540 and return;
3541
3542 # always fsync - this file is important
3543 aio_fsync $fh
3544 and return;
3545
3546 close $fh
3547 or return;
3548
3549 aio_rename "$uuid~", $uuid
3550 and return;
3551
3552 warn "uuid file written ($value).\n";
3553
3554 1
3555
3556}
3557
3558sub write_uuid($$) {
3559 my ($skip, $sync) = @_;
3560
3561 $sync ? write_uuid_sync $skip
3562 : async { write_uuid_sync $skip };
3402} 3563}
3403 3564
3404sub emergency_save() { 3565sub emergency_save() {
3405 my $freeze_guard = cf::freeze_mainloop; 3566 my $freeze_guard = cf::freeze_mainloop;
3406 3567
… …
3428 warn "end emergency map save\n"; 3589 warn "end emergency map save\n";
3429 3590
3430 warn "begin emergency database checkpoint\n"; 3591 warn "begin emergency database checkpoint\n";
3431 BDB::db_env_txn_checkpoint $DB_ENV; 3592 BDB::db_env_txn_checkpoint $DB_ENV;
3432 warn "end emergency database checkpoint\n"; 3593 warn "end emergency database checkpoint\n";
3594
3595 warn "begin write uuid\n";
3596 write_uuid_sync 1;
3597 warn "end write uuid\n";
3433 }; 3598 };
3434 3599
3435 warn "leave emergency perl save\n"; 3600 warn "leave emergency perl save\n";
3436} 3601}
3437 3602
… …
3439 my ($make_core) = @_; 3604 my ($make_core) = @_;
3440 3605
3441 warn Carp::longmess "post_cleanup backtrace" 3606 warn Carp::longmess "post_cleanup backtrace"
3442 if $make_core; 3607 if $make_core;
3443} 3608}
3609
3610# a safer delete_package, copied from Symbol
3611sub clear_package($) {
3612 my $pkg = shift;
3613
3614 # expand to full symbol table name if needed
3615 unless ($pkg =~ /^main::.*::$/) {
3616 $pkg = "main$pkg" if $pkg =~ /^::/;
3617 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3618 $pkg .= '::' unless $pkg =~ /::$/;
3619 }
3620
3621 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3622 my $stem_symtab = *{$stem}{HASH};
3623
3624 defined $stem_symtab and exists $stem_symtab->{$leaf}
3625 or return;
3626
3627 # clear all symbols
3628 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3629 for my $name (keys %$leaf_symtab) {
3630 _gv_clear *{"$pkg$name"};
3631# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3632 }
3633 warn "cleared package #$pkg\n";#d#
3634}
3635
3636our $RELOAD; # how many times to reload
3444 3637
3445sub do_reload_perl() { 3638sub do_reload_perl() {
3446 # can/must only be called in main 3639 # can/must only be called in main
3447 if ($Coro::current != $Coro::main) { 3640 if ($Coro::current != $Coro::main) {
3448 warn "can only reload from main coroutine"; 3641 warn "can only reload from main coroutine";
3449 return; 3642 return;
3450 } 3643 }
3451 3644
3645 return if $RELOAD++;
3646
3647 while ($RELOAD) {
3452 warn "reloading..."; 3648 warn "reloading...";
3453 3649
3454 warn "entering sync_job"; 3650 warn "entering sync_job";
3455 3651
3456 cf::sync_job { 3652 cf::sync_job {
3457 cf::write_runtime; # external watchdog should not bark 3653 cf::write_runtime_sync; # external watchdog should not bark
3458 cf::emergency_save; 3654 cf::emergency_save;
3459 cf::write_runtime; # external watchdog should not bark 3655 cf::write_runtime_sync; # external watchdog should not bark
3460 3656
3461 warn "syncing database to disk"; 3657 warn "syncing database to disk";
3462 BDB::db_env_txn_checkpoint $DB_ENV; 3658 BDB::db_env_txn_checkpoint $DB_ENV;
3463 3659
3464 # if anything goes wrong in here, we should simply crash as we already saved 3660 # if anything goes wrong in here, we should simply crash as we already saved
3465 3661
3466 warn "flushing outstanding aio requests"; 3662 warn "flushing outstanding aio requests";
3467 for (;;) {
3468 BDB::flush;
3469 IO::AIO::flush;
3470 Coro::cede_notself;
3471 last unless IO::AIO::nreqs || BDB::nreqs; 3663 while (IO::AIO::nreqs || BDB::nreqs) {
3472 warn "iterate..."; 3664 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3473 }
3474
3475 ++$RELOAD;
3476
3477 warn "cancelling all extension coros";
3478 $_->cancel for values %EXT_CORO;
3479 %EXT_CORO = ();
3480
3481 warn "removing commands";
3482 %COMMAND = ();
3483
3484 warn "removing ext/exti commands";
3485 %EXTCMD = ();
3486 %EXTICMD = ();
3487
3488 warn "unloading/nuking all extensions";
3489 for my $pkg (@EXTS) {
3490 warn "... unloading $pkg";
3491
3492 if (my $cb = $pkg->can ("unload")) {
3493 eval {
3494 $cb->($pkg);
3495 1
3496 } or warn "$pkg unloaded, but with errors: $@";
3497 } 3665 }
3498 3666
3499 warn "... nuking $pkg"; 3667 warn "cancelling all extension coros";
3500 Symbol::delete_package $pkg; 3668 $_->cancel for values %EXT_CORO;
3501 } 3669 %EXT_CORO = ();
3502 3670
3503 warn "unloading all perl modules loaded from $LIBDIR"; 3671 warn "removing commands";
3504 while (my ($k, $v) = each %INC) { 3672 %COMMAND = ();
3505 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3506 3673
3674 warn "removing ext/exti commands";
3675 %EXTCMD = ();
3676 %EXTICMD = ();
3677
3678 warn "unloading/nuking all extensions";
3679 for my $pkg (@EXTS) {
3507 warn "... unloading $k"; 3680 warn "... unloading $pkg";
3508 delete $INC{$k};
3509 3681
3510 $k =~ s/\.pm$//;
3511 $k =~ s/\//::/g;
3512
3513 if (my $cb = $k->can ("unload_module")) { 3682 if (my $cb = $pkg->can ("unload")) {
3683 eval {
3514 $cb->(); 3684 $cb->($pkg);
3685 1
3686 } or warn "$pkg unloaded, but with errors: $@";
3687 }
3688
3689 warn "... clearing $pkg";
3690 clear_package $pkg;
3515 } 3691 }
3516 3692
3517 Symbol::delete_package $k; 3693 warn "unloading all perl modules loaded from $LIBDIR";
3694 while (my ($k, $v) = each %INC) {
3695 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3696
3697 warn "... unloading $k";
3698 delete $INC{$k};
3699
3700 $k =~ s/\.pm$//;
3701 $k =~ s/\//::/g;
3702
3703 if (my $cb = $k->can ("unload_module")) {
3704 $cb->();
3705 }
3706
3707 clear_package $k;
3518 } 3708 }
3519 3709
3520 warn "getting rid of safe::, as good as possible"; 3710 warn "getting rid of safe::, as good as possible";
3521 Symbol::delete_package "safe::$_" 3711 clear_package "safe::$_"
3522 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3712 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3523 3713
3524 warn "unloading cf.pm \"a bit\""; 3714 warn "unloading cf.pm \"a bit\"";
3525 delete $INC{"cf.pm"}; 3715 delete $INC{"cf.pm"};
3526 delete $INC{"cf/pod.pm"}; 3716 delete $INC{"cf/pod.pm"};
3527 3717
3528 # don't, removes xs symbols, too, 3718 # don't, removes xs symbols, too,
3529 # and global variables created in xs 3719 # and global variables created in xs
3530 #Symbol::delete_package __PACKAGE__; 3720 #clear_package __PACKAGE__;
3531 3721
3532 warn "unload completed, starting to reload now"; 3722 warn "unload completed, starting to reload now";
3533 3723
3534 warn "reloading cf.pm"; 3724 warn "reloading cf.pm";
3535 require cf; 3725 require cf;
3536 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3726 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3537 3727
3538 warn "loading config and database again"; 3728 warn "loading config and database again";
3539 cf::reload_config; 3729 cf::reload_config;
3540 3730
3541 warn "loading extensions"; 3731 warn "loading extensions";
3542 cf::load_extensions; 3732 cf::load_extensions;
3543 3733
3544 warn "reattaching attachments to objects/players"; 3734 warn "reattaching attachments to objects/players";
3545 _global_reattach; # objects, sockets 3735 _global_reattach; # objects, sockets
3546 warn "reattaching attachments to maps"; 3736 warn "reattaching attachments to maps";
3547 reattach $_ for values %MAP; 3737 reattach $_ for values %MAP;
3548 warn "reattaching attachments to players"; 3738 warn "reattaching attachments to players";
3549 reattach $_ for values %PLAYER; 3739 reattach $_ for values %PLAYER;
3550 3740
3551 warn "leaving sync_job"; 3741 warn "leaving sync_job";
3552 3742
3553 1 3743 1
3554 } or do { 3744 } or do {
3555 warn $@; 3745 warn $@;
3556 warn "error while reloading, exiting."; 3746 cf::cleanup "error while reloading, exiting.";
3557 exit 1;
3558 }; 3747 };
3559 3748
3560 warn "reloaded"; 3749 warn "reloaded";
3750 --$RELOAD;
3751 }
3561}; 3752};
3562 3753
3563our $RELOAD_WATCHER; # used only during reload 3754our $RELOAD_WATCHER; # used only during reload
3564 3755
3565sub reload_perl() { 3756sub reload_perl() {
3566 # doing reload synchronously and two reloads happen back-to-back, 3757 # doing reload synchronously and two reloads happen back-to-back,
3567 # coro crashes during coro_state_free->destroy here. 3758 # coro crashes during coro_state_free->destroy here.
3568 3759
3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3760 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3761 do_reload_perl;
3570 undef $RELOAD_WATCHER; 3762 undef $RELOAD_WATCHER;
3571 do_reload_perl;
3572 }; 3763 };
3573} 3764}
3574 3765
3575register_command "reload" => sub { 3766register_command "reload" => sub {
3576 my ($who, $arg) = @_; 3767 my ($who, $arg) = @_;
… …
3590 3781
3591our @WAIT_FOR_TICK; 3782our @WAIT_FOR_TICK;
3592our @WAIT_FOR_TICK_BEGIN; 3783our @WAIT_FOR_TICK_BEGIN;
3593 3784
3594sub wait_for_tick { 3785sub wait_for_tick {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 3786 return if tick_inhibit || $Coro::current == $Coro::main;
3597 3787
3598 my $signal = new Coro::Signal; 3788 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK, $signal; 3789 push @WAIT_FOR_TICK, $signal;
3600 $signal->wait; 3790 $signal->wait;
3601} 3791}
3602 3792
3603sub wait_for_tick_begin { 3793sub wait_for_tick_begin {
3604 return unless $TICK_WATCHER->is_active;
3605 return if $Coro::current == $Coro::main; 3794 return if tick_inhibit || $Coro::current == $Coro::main;
3606 3795
3607 my $signal = new Coro::Signal; 3796 my $signal = new Coro::Signal;
3608 push @WAIT_FOR_TICK_BEGIN, $signal; 3797 push @WAIT_FOR_TICK_BEGIN, $signal;
3609 $signal->wait; 3798 $signal->wait;
3610} 3799}
3611 3800
3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3801sub tick {
3613 if ($Coro::current != $Coro::main) { 3802 if ($Coro::current != $Coro::main) {
3614 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3803 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3615 unless ++$bug_warning > 10; 3804 unless ++$bug_warning > 10;
3616 return; 3805 return;
3617 } 3806 }
3618 3807
3619 $NOW = $tick_start = EV::now;
3620
3621 cf::server_tick; # one server iteration 3808 cf::server_tick; # one server iteration
3622
3623 $RUNTIME += $TICK;
3624 $NEXT_TICK = $_[0]->at;
3625 3809
3626 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3810 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3811 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3628 Coro::async_pool { 3812 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver"; 3813 $Coro::current->{desc} = "runtime saver";
3630 write_runtime 3814 write_runtime_sync
3631 or warn "ERROR: unable to write runtime file: $!"; 3815 or warn "ERROR: unable to write runtime file: $!";
3632 }; 3816 };
3633 } 3817 }
3634 3818
3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3819 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3637 } 3821 }
3638 while (my $sig = shift @WAIT_FOR_TICK) { 3822 while (my $sig = shift @WAIT_FOR_TICK) {
3639 $sig->send; 3823 $sig->send;
3640 } 3824 }
3641 3825
3642 $LOAD = ($NOW - $tick_start) / $TICK; 3826 $LOAD = ($NOW - $TICK_START) / $TICK;
3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3827 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3644 3828
3645 _post_tick; 3829 if (0) {
3646}; 3830 if ($NEXT_TICK) {
3647$TICK_WATCHER->priority (EV::MAXPRI); 3831 my $jitter = $TICK_START - $NEXT_TICK;
3832 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3833 warn "jitter $JITTER\n";#d#
3834 }
3835 }
3836}
3648 3837
3649{ 3838{
3650 # configure BDB 3839 # configure BDB
3651 3840
3652 BDB::min_parallel 8; 3841 BDB::min_parallel 8;
3653 BDB::max_poll_reqs $TICK * 0.1; 3842 BDB::max_poll_reqs $TICK * 0.1;
3654 $Coro::BDB::WATCHER->priority (1); 3843 $AnyEvent::BDB::WATCHER->priority (1);
3655 3844
3656 unless ($DB_ENV) { 3845 unless ($DB_ENV) {
3657 $DB_ENV = BDB::db_env_create; 3846 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3847 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3659 | BDB::LOG_AUTOREMOVE, 1); 3848 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3849 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3851 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3662 3852
3663 cf::sync_job { 3853 cf::sync_job {
3664 eval { 3854 eval {
… …
3690{ 3880{
3691 # configure IO::AIO 3881 # configure IO::AIO
3692 3882
3693 IO::AIO::min_parallel 8; 3883 IO::AIO::min_parallel 8;
3694 IO::AIO::max_poll_time $TICK * 0.1; 3884 IO::AIO::max_poll_time $TICK * 0.1;
3695 $Coro::AIO::WATCHER->priority (1); 3885 undef $AnyEvent::AIO::WATCHER;
3696} 3886}
3697 3887
3698my $_log_backtrace; 3888my $_log_backtrace;
3699 3889
3700sub _log_backtrace { 3890sub _log_backtrace {

Diff Legend

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