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.408 by root, Mon Jan 14 10:12:12 2008 UTC vs.
Revision 1.445 by root, Wed Sep 10 18:18:10 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use EV 1.86; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
15use Coro 4.32 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
18use Coro::EV; 40use Coro::EV;
41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
23use Coro::BDB; 47use Coro::BDB 1.6;
24use Coro::Storable; 48use Coro::Storable;
25use Coro::Util (); 49use Coro::Util ();
26 50
27use JSON::XS 2.01 (); 51use JSON::XS 2.01 ();
28use BDB (); 52use BDB ();
29use Data::Dumper; 53use Data::Dumper;
30use Digest::MD5; 54use Digest::MD5;
31use Fcntl; 55use Fcntl;
32use YAML (); 56use YAML ();
33use IO::AIO 2.51 (); 57use IO::AIO ();
34use Time::HiRes; 58use Time::HiRes;
35use Compress::LZF; 59use Compress::LZF;
36use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
37 63
38# configure various modules to our taste 64# configure various modules to our taste
39# 65#
40$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
55our %EXT_MAP = (); # pluggable maps 81our %EXT_MAP = (); # pluggable maps
56 82
57our $RELOAD; # number of reloads so far 83our $RELOAD; # number of reloads so far
58our @EVENT; 84our @EVENT;
59 85
60our $CONFDIR = confdir; 86our $CONFDIR = confdir;
61our $DATADIR = datadir; 87our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 88our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 89our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 90our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 91our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime";
99
71our %RESOURCE; 100our %RESOURCE;
72 101
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 104our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 105our $USE_FSYNC = 1; # use fsync to write maps - default off
79 106
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 107our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 108our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 109our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 110our $DB_ENV;
85 111
… …
96# used to convert map paths into valid unix filenames by replacing / by ∕ 122# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 123our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 124
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 125our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 126our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 128our $TICK_START; # for load detecting purposes
102 129
103binmode STDOUT; 130binmode STDOUT;
104binmode STDERR; 131binmode STDERR;
105 132
106# read virtual server time, if available 133# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 134unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 135 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 136 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 137 $RUNTIME = <$fh> + 0.;
111} 138}
112 139
113mkdir $_ 140mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
192 LOG llevError, $msg; 219 LOG llevError, $msg;
193 }; 220 };
194} 221}
195 222
196$Coro::State::DIEHOOK = sub { 223$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "=="
225
226 if ($Coro::current == $Coro::main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d#
229 }#d#
230
231 # kill coroutine otherwise
197 warn Carp::longmess $_[0]; 232 warn Carp::longmess $_[0];
198 Coro::terminate; 233 Coro::terminate
199}; 234};
235
236$SIG{__DIE__} = sub { }; #d#?
200 237
201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
211for my $pkg (qw( 248for my $pkg (qw(
212 cf::global cf::attachable 249 cf::global cf::attachable
213 cf::object cf::object::player 250 cf::object cf::object::player
214 cf::client cf::player 251 cf::client cf::player
215 cf::arch cf::living 252 cf::arch cf::living
253 cf::map cf::mapspace
216 cf::map cf::party cf::region 254 cf::party cf::region
217)) { 255)) {
218 no strict 'refs';
219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
220} 257}
221 258
222$EV::DIED = sub { 259$EV::DIED = sub {
223 warn "error in event callback: @_"; 260 warn "error in event callback: @_";
… …
329 366
330 ! ! $LOCK{$key} 367 ! ! $LOCK{$key}
331} 368}
332 369
333sub freeze_mainloop { 370sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 371 tick_inhibit_inc;
335 372
336 my $guard = Coro::guard { 373 Coro::guard \&tick_inhibit_dec;
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 374}
342 375
343=item cf::periodic $interval, $cb 376=item cf::periodic $interval, $cb
344 377
345Like EV::periodic, but randomly selects a starting point so that the actions 378Like EV::periodic, but randomly selects a starting point so that the actions
… …
400 } 433 }
401 } 434 }
402}; 435};
403 436
404sub get_slot($;$$) { 437sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main;
439
405 my ($time, $pri, $name) = @_; 440 my ($time, $pri, $name) = @_;
406 441
407 $time = $TICK * .6 if $time > $TICK * .6; 442 $time = $TICK * .6 if $time > $TICK * .6;
408 my $sig = new Coro::Signal; 443 my $sig = new Coro::Signal;
409 444
… …
446 # this is the main coro, too bad, we have to block 481 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 482 # till the operation succeeds, freezing the server :/
448 483
449 LOG llevError, Carp::longmess "sync job";#d# 484 LOG llevError, Carp::longmess "sync job";#d#
450 485
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 486 my $freeze_guard = freeze_mainloop;
454 487
455 my $busy = 1; 488 my $busy = 1;
456 my @res; 489 my @res;
457 490
… …
468 } else { 501 } else {
469 EV::loop EV::LOOP_ONESHOT; 502 EV::loop EV::LOOP_ONESHOT;
470 } 503 }
471 } 504 }
472 505
473 $time = EV::time - $time; 506 my $time = EV::time - $time;
474 507
475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
477
478 $tick_start += $time; # do not account sync jobs to server load 508 $TICK_START += $time; # do not account sync jobs to server load
479 509
480 wantarray ? @res : $res[0] 510 wantarray ? @res : $res[0]
481 } else { 511 } else {
482 # we are in another coroutine, how wonderful, everything just works 512 # we are in another coroutine, how wonderful, everything just works
483 513
… …
525 reset_signals; 555 reset_signals;
526 &$cb 556 &$cb
527 }, @args; 557 }, @args;
528 558
529 wantarray ? @res : $res[-1] 559 wantarray ? @res : $res[-1]
560}
561
562=item $coin = coin_from_name $name
563
564=cut
565
566our %coin_alias = (
567 "silver" => "silvercoin",
568 "silvercoin" => "silvercoin",
569 "silvercoins" => "silvercoin",
570 "gold" => "goldcoin",
571 "goldcoin" => "goldcoin",
572 "goldcoins" => "goldcoin",
573 "platinum" => "platinacoin",
574 "platinumcoin" => "platinacoin",
575 "platinumcoins" => "platinacoin",
576 "platina" => "platinacoin",
577 "platinacoin" => "platinacoin",
578 "platinacoins" => "platinacoin",
579 "royalty" => "royalty",
580 "royalties" => "royalty",
581);
582
583sub coin_from_name($) {
584 $coin_alias{$_[0]}
585 ? cf::arch::find $coin_alias{$_[0]}
586 : undef
530} 587}
531 588
532=item $value = cf::db_get $family => $key 589=item $value = cf::db_get $family => $key
533 590
534Returns a single value from the environment database. 591Returns a single value from the environment database.
… …
1034 1091
1035sub reattach { 1092sub reattach {
1036 # basically do the same as instantiate, without calling instantiate 1093 # basically do the same as instantiate, without calling instantiate
1037 my ($obj) = @_; 1094 my ($obj) = @_;
1038 1095
1096 # no longer needed after getting rid of delete_package?
1039 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1097 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1040 1098
1041 my $registry = $obj->registry; 1099 my $registry = $obj->registry;
1042 1100
1043 @$registry = (); 1101 @$registry = ();
1044 1102
… …
1090 utf8::decode (my $decname = $filename); 1148 utf8::decode (my $decname = $filename);
1091 warn sprintf "saving %s (%d,%d)\n", 1149 warn sprintf "saving %s (%d,%d)\n",
1092 $decname, length $$rdata, scalar @$objs; 1150 $decname, length $$rdata, scalar @$objs;
1093 1151
1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097 aio_fsync $fh if $cf::USE_FSYNC; 1155 aio_fsync $fh if $cf::USE_FSYNC;
1098 close $fh; 1156 aio_close $fh;
1099 1157
1100 if (@$objs) { 1158 if (@$objs) {
1101 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1102 chmod SAVE_MODE, $fh; 1160 aio_chmod $fh, SAVE_MODE;
1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104 aio_write $fh, 0, (length $data), $data, 0; 1162 aio_write $fh, 0, (length $data), $data, 0;
1105 aio_fsync $fh if $cf::USE_FSYNC; 1163 aio_fsync $fh if $cf::USE_FSYNC;
1106 close $fh; 1164 aio_close $fh;
1107 aio_rename "$filename.pst~", "$filename.pst"; 1165 aio_rename "$filename.pst~", "$filename.pst";
1108 } 1166 }
1109 } else { 1167 } else {
1110 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1111 } 1169 }
… …
1280 1338
1281 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1282 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1283 1341
1284 $ext{source} = 1342 $ext{source} =
1285 "package $pkg; use strict; use utf8;\n" 1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1286 . "#line 1 \"$path\"\n{\n" 1344 . "#line 1 \"$path\"\n{\n"
1287 . $source 1345 . $source
1288 . "\n};\n1"; 1346 . "\n};\n1";
1289 1347
1290 $todo{$base} = \%ext; 1348 $todo{$base} = \%ext;
… …
1306 my $msg = $@ ? "$v->{path}: $@\n" 1364 my $msg = $@ ? "$v->{path}: $@\n"
1307 : "$v->{base}: extension inactive.\n"; 1365 : "$v->{base}: extension inactive.\n";
1308 1366
1309 if (exists $v->{meta}{mandatory}) { 1367 if (exists $v->{meta}{mandatory}) {
1310 warn $msg; 1368 warn $msg;
1311 warn "mandatory extension failed to load, exiting.\n"; 1369 cf::cleanup "mandatory extension failed to load, exiting.";
1312 exit 1;
1313 } 1370 }
1314 1371
1315 warn $msg; 1372 warn $msg;
1316 } 1373 }
1317 1374
… …
1406 my $f = new_from_file cf::object::thawer path $login 1463 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1464 or return;
1408 1465
1409 my $pl = cf::player::load_pl $f 1466 my $pl = cf::player::load_pl $f
1410 or return; 1467 or return;
1468
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1469 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1470 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1471 $cf::PLAYER{$login} = $pl
1414 } 1472 }
1415 } 1473 }
… …
1425 1483
1426 return if $pl->{deny_save}; 1484 return if $pl->{deny_save};
1427 1485
1428 aio_mkdir playerdir $pl, 0770; 1486 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1487 $pl->{last_save} = $cf::RUNTIME;
1488
1489 cf::get_slot 0.01;
1430 1490
1431 $pl->save_pl ($path); 1491 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1492 cf::cede_to_tick;
1433} 1493}
1434 1494
… …
1466 my ($pl) = @_; 1526 my ($pl) = @_;
1467 1527
1468 my $name = $pl->ob->name; 1528 my $name = $pl->ob->name;
1469 1529
1470 $pl->{deny_save} = 1; 1530 $pl->{deny_save} = 1;
1471 $pl->password ("*"); # this should lock out the player until we nuked the dir 1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1472 1532
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1474 $pl->deactivate; 1534 $pl->deactivate;
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1537 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1476 $pl->ns->destroy if $pl->ns; 1538 $pl->ns->destroy if $pl->ns;
1477 1539
1478 my $path = playerdir $pl; 1540 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1541 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1518 1580
1519 for my $login (@$dirs) { 1581 for my $login (@$dirs) {
1520 my $path = path $login; 1582 my $path = path $login;
1521 1583
1522 # a .pst is a dead give-away for a valid player 1584 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1585 # if no pst file found, open and chekc for blocked users
1586 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1587 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1588 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1589 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1590 }
1528 1591
… …
1563 1626
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1565 1628
1566Expand crossfire pod fragments into protocol xml. 1629Expand crossfire pod fragments into protocol xml.
1567 1630
1568=cut
1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1581sub expand_cfpod {
1582 my ($self, $pod) = @_;
1583
1584 my $xml;
1585
1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1589
1590 $group =~ s/&/&amp;/g;
1591 $group =~ s/</&lt;/g;
1592
1593 $xml .= $group;
1594 } elsif ($pod =~ m%\G
1595 ([BCGHITU])
1596 <
1597 (?:
1598 ([^<>]*) (?{ $group = $^N })
1599 | < $interior >
1600 )
1601 >
1602 %gcsx
1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1623 "")
1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1635
1636 for ($xml) {
1637 # create single paragraphs (very hackish)
1638 s/(?<=\S)\n(?=\w)/ /g;
1639
1640 # compress some whitespace
1641 s/\s+\n/\n/g; # ws line-ends
1642 s/\n\n+/\n/g; # double lines
1643 s/^\n+//; # beginning lines
1644 s/\n+$//; # ending lines
1645 }
1646
1647 $xml
1648}
1649
1650no re 'eval';
1651
1652sub hintmode {
1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1654 $_[0]{hintmode}
1655}
1656
1657=item $player->ext_reply ($msgid, @msg) 1631=item $player->ext_reply ($msgid, @msg)
1658 1632
1659Sends an ext reply to the player. 1633Sends an ext reply to the player.
1660 1634
1661=cut 1635=cut
… …
1727our $MAX_RESET = 3600; 1701our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1702our $DEFAULT_RESET = 3000;
1729 1703
1730sub generate_random_map { 1704sub generate_random_map {
1731 my ($self, $rmp) = @_; 1705 my ($self, $rmp) = @_;
1706
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708
1732 # mit "rum" bekleckern, nicht 1709 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1710 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1858 1835
1859# the temporary/swap location 1836# the temporary/swap location
1860sub save_path { 1837sub save_path {
1861 my ($self) = @_; 1838 my ($self) = @_;
1862 1839
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1840 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1841 "$TMPDIR/$path.map"
1865} 1842}
1866 1843
1867# the unique path, undef == no special unique path 1844# the unique path, undef == no special unique path
1868sub uniq_path { 1845sub uniq_path {
1869 my ($self) = @_; 1846 my ($self) = @_;
1870 1847
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1849 "$UNIQUEDIR/$path"
1873} 1850}
1874 1851
1875# and all this just because we cannot iterate over 1852# and all this just because we cannot iterate over
1876# all maps in C++... 1853# all maps in C++...
… …
1974 1951
1975 cf::lock_wait "map_data:$path";#d#remove 1952 cf::lock_wait "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 1953 cf::lock_wait "map_find:$path";
1977 1954
1978 $cf::MAP{$path} || do { 1955 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1981 1958
1982 my $map = new_from_path cf::map $path 1959 my $map = new_from_path cf::map $path
1983 or return; 1960 or return;
1984 1961
1985 $map->{last_save} = $cf::RUNTIME; 1962 $map->{last_save} = $cf::RUNTIME;
… …
1988 or return; 1965 or return;
1989 1966
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1967 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 1968 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 1969 #$cf::WAIT_FOR_TICK->wait;
1970 undef $guard2;
1993 undef $guard1; 1971 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 1972 $map->reset;
1996 return find $path; 1973 return find $path;
1997 } 1974 }
1998 1975
1999 $cf::MAP{$path} = $map 1976 $cf::MAP{$path} = $map
… …
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2003 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2004 $f->skip_block;
2028 $self->_load_objects ($f) 2005 $self->_load_objects ($f)
2029 or return; 2006 or return;
2030 2007
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2008 $self->post_load_original
2032 if delete $self->{load_original}; 2009 if delete $self->{load_original};
2033 2010
2034 if (my $uniq = $self->uniq_path) { 2011 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2012 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2013 unless (aio_stat $uniq) {
… …
2062 } 2039 }
2063 2040
2064 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2042 $self->last_access ($cf::RUNTIME);
2066 2043
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2044 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2045 }
2069 2046
2070 $self->post_load; 2047 $self->post_load;
2071} 2048}
2072 2049
… …
2130 my ($path, $origin, $load) = @_; 2107 my ($path, $origin, $load) = @_;
2131 2108
2132 $path = normalise $path, $origin && $origin->{path}; 2109 $path = normalise $path, $origin && $origin->{path};
2133 2110
2134 if (my $map = $cf::MAP{$path}) { 2111 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2113 }
2137 2114
2138 $MAP_PREFETCH{$path} |= $load; 2115 $MAP_PREFETCH{$path} |= $load;
2139 2116
2140 $MAP_PREFETCHER ||= cf::async { 2117 $MAP_PREFETCHER ||= cf::async {
… …
2177 cf::async { 2154 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2155 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2156 $_->contr->save for $self->players;
2180 }; 2157 };
2181 2158
2159 cf::get_slot 0.02;
2160
2182 if ($uniq) { 2161 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2163 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2164 } else {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2194 $self->save; 2173 $self->save;
2195 2174
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2175 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2176
2198 return if $self->players; 2177 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY; 2178 return if $self->in_memory != cf::MAP_ACTIVE;
2200 return if $self->{deny_save}; 2179 return if $self->{deny_save};
2201 2180
2202 $self->in_memory (cf::MAP_SWAPPED); 2181 $self->in_memory (cf::MAP_SWAPPED);
2203 2182
2204 $self->deactivate; 2183 $self->deactivate;
… …
2322 2301
2323sub unique_maps() { 2302sub unique_maps() {
2324 [ 2303 [
2325 map { 2304 map {
2326 utf8::decode $_; 2305 utf8::decode $_;
2327 /\.map$/ 2306 s/\.map$//; # TODO future compatibility hack
2307 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2308 ? ()
2328 ? normalise $_ 2309 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2310 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2311 ]
2332} 2312}
2333 2313
2334package cf;
2335
2336=back 2314=back
2337 2315
2338=head3 cf::object 2316=head3 cf::object
2339 2317
2340=cut 2318=cut
… …
2343 2321
2344=over 4 2322=over 4
2345 2323
2346=item $ob->inv_recursive 2324=item $ob->inv_recursive
2347 2325
2348Returns the inventory of the object _and_ their inventories, recursively. 2326Returns the inventory of the object I<and> their inventories, recursively,
2327but I<not> the object itself.
2349 2328
2350=cut 2329=cut
2351 2330
2352sub inv_recursive_; 2331sub inv_recursive_;
2353sub inv_recursive_ { 2332sub inv_recursive_ {
… …
2358 inv_recursive_ inv $_[0] 2337 inv_recursive_ inv $_[0]
2359} 2338}
2360 2339
2361=item $ref = $ob->ref 2340=item $ref = $ob->ref
2362 2341
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2342Creates and returns a persistent reference to an object that can be stored as a string.
2364 2343
2365=item $ob = cf::object::deref ($refstring) 2344=item $ob = cf::object::deref ($refstring)
2366 2345
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2346returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block. 2347even if the object actually exists. May block.
… …
2400can be C<undef>. Does the right thing when the player is currently in a 2379can be C<undef>. Does the right thing when the player is currently in a
2401dialogue with the given NPC character. 2380dialogue with the given NPC character.
2402 2381
2403=cut 2382=cut
2404 2383
2384our $SAY_CHANNEL = {
2385 id => "say",
2386 title => "Map",
2387 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2389};
2390
2391our $CHAT_CHANNEL = {
2392 id => "chat",
2393 title => "Chat",
2394 reply => "chat ",
2395 tooltip => "Player chat and shouts, global to the server.",
2396};
2397
2405# rough implementation of a future "reply" method that works 2398# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2399# with dialog boxes.
2407#TODO: the first argument must go, split into a $npc->reply_to ( method 2400#TODO: the first argument must go, split into a $npc->reply_to ( method
2408sub cf::object::player::reply($$$;$) { 2401sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2402 my ($self, $npc, $msg, $flags) = @_;
… …
2420 my $dialog = $pl->{npc_dialog}; 2413 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2414 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422 2415
2423 } else { 2416 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2417 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2418 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2419 }
2427 } 2420 }
2428} 2421}
2429 2422
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2423=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2537Moves the player to the given map-path and coordinates by first freezing 2530Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2531her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2532that has to return the map if sucecssful, and then unfreezes the player on
2540the new (success) or old (failed) map position. In either case, $done will 2533the new (success) or old (failed) map position. In either case, $done will
2541be called at the end of this process. 2534be called at the end of this process.
2535
2536Note that $check will be called with a potentially non-loaded map, so if
2537it needs a loaded map it has to call C<< ->load >>.
2542 2538
2543=cut 2539=cut
2544 2540
2545our $GOTOGEN; 2541our $GOTOGEN;
2546 2542
… …
2625} 2621}
2626 2622
2627sub prepare_random_map { 2623sub prepare_random_map {
2628 my ($exit) = @_; 2624 my ($exit) = @_;
2629 2625
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2626 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2627 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2628 # that depends on the exit object
2635 2629
2636 my $rmp = parse_random_map_params $exit->msg; 2630 my $rmp = parse_random_map_params $exit->msg;
… …
2638 if ($exit->map) { 2632 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2633 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2634 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2635 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2636 $rmp->{origin_y} = $exit->y;
2637
2638 $exit->map->touch;
2643 } 2639 }
2644 2640
2645 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2646 2642
2647 my $data = cf::encode_json $rmp; 2643 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2650 2646
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2649 undef $fh;
2654 aio_rename "$meta~", $meta; 2650 aio_rename "$meta~", $meta;
2655 2651
2652 my $slaying = "?random/$md5";
2653
2654 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2655 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2656 $exit->msg (undef);
2657 }
2658 } 2658 }
2659} 2659}
2660 2660
2661sub cf::object::player::enter_exit { 2661sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2662 my ($self, $exit) = @_;
2663 2663
2664 return unless $self->type == cf::PLAYER; 2664 return unless $self->type == cf::PLAYER;
2665 2665
2666 if ($exit->slaying eq "/!") {
2667 #TODO: this should de-fi-ni-te-ly not be a sync-job
2668 # the problem is that $exit might not survive long enough
2669 # so it needs to be done right now, right here
2670 cf::sync_job { prepare_random_map $exit };
2671 }
2672
2673 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2674 my $hp = $exit->stats->hp;
2675 my $sp = $exit->stats->sp;
2676
2677 $self->enter_link; 2666 $self->enter_link;
2678 2667
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
2683 (async { 2668 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2669 $Coro::current->{desc} = "enter_exit";
2685 2670
2686 $self->deactivate_recursive; # just to be sure
2687 unless (eval { 2671 unless (eval {
2672 $self->deactivate_recursive; # just to be sure
2673
2674 # random map handling
2675 {
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 prepare_random_map $exit
2679 if $exit->slaying eq "/!";
2680 }
2681
2682 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2683 my $x = $exit->stats->hp;
2684 my $y = $exit->stats->sp;
2685
2688 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($map, $x, $y);
2689 2687
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED);
2691
2690 1; 2692 1
2691 }) { 2693 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2694 $self->message ("Something went wrong deep within the crossfire server. "
2693 . "I'll try to bring you back to the map you were before. " 2695 . "I'll try to bring you back to the map you were before. "
2694 . "Please report this to the dungeon master!", 2696 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2697 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2775 id => "infobox", 2777 id => "infobox",
2776 title => "Map Info", 2778 title => "Map Info",
2777 reply => undef, 2779 reply => undef,
2778 tooltip => "Information related to the maps", 2780 tooltip => "Information related to the maps",
2779 }, 2781 },
2782 "c/party" => {
2783 id => "party",
2784 title => "Party",
2785 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party",
2787 },
2780); 2788);
2781 2789
2782sub cf::client::send_msg { 2790sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 2791 my ($self, $channel, $msg, $color, @extra) = @_;
2784 2792
… …
2811 if ($self->can_msg) { 2819 if ($self->can_msg) {
2812 # default colour, mask it out 2820 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF; 2822 if $color & cf::NDI_DEF;
2815 2823
2816 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2824 my $pkt = "msg "
2825 . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 );
2828
2829 # try lzf for large packets
2830 $pkt = "lzf " . Compress::LZF::compress $pkt
2831 if 1024 <= length $pkt and $self->{can_lzf};
2832
2833 # split very large packets
2834 if (8192 < length $pkt and $self->{can_lzf}) {
2835 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2836 $pkt = "frag";
2837 }
2838
2839 $self->send_packet ($pkt);
2818 } else { 2840 } else {
2819 if ($color >= 0) { 2841 if ($color >= 0) {
2820 # replace some tags by gcfclient-compatible ones 2842 # replace some tags by gcfclient-compatible ones
2821 for ($msg) { 2843 for ($msg) {
2822 1 while 2844 1 while
… …
3021 3043
3022The following functions and methods are available within a safe environment: 3044The following functions and methods are available within a safe environment:
3023 3045
3024 cf::object 3046 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy 3047 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr 3048 insert remove name archname title slaying race decrease split
3027 3049
3028 cf::object::player 3050 cf::object::player
3029 player 3051 player
3030 3052
3031 cf::player 3053 cf::player
… …
3036 3058
3037=cut 3059=cut
3038 3060
3039for ( 3061for (
3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3062 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race 3063 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3064 decrease split destroy change_exp)],
3043 ["cf::object::player" => qw(player)], 3065 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3066 ["cf::player" => qw(peaceful)],
3045 ["cf::map" => qw(trigger)], 3067 ["cf::map" => qw(trigger)],
3046) { 3068) {
3047 no strict 'refs'; 3069 no strict 'refs';
… …
3255 while (my ($k, $v) = each %$want) { 3277 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3278 $ns->fx_want ($k, $v);
3257 } 3279 }
3258}; 3280};
3259 3281
3282sub load_resource_file($) {
3283 my $guard = lock_acquire "load_resource_file";
3284
3285 my $status = load_resource_file_ $_[0];
3286 get_slot 0.1, 100;
3287 cf::arch::commit_load;
3288
3289 $status
3290}
3291
3260sub reload_regions { 3292sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework 3293 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?) 3294 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3295 %ext::player_env::MUSIC_FACE_CACHE = ();
3264 3296
… …
3277} 3309}
3278 3310
3279sub reload_archetypes { 3311sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3312 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3313 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
3285 load_resource_file "$DATADIR/archetypes"
3286 or die "unable to load archetypes\n";
3287} 3314}
3288 3315
3289sub reload_treasures { 3316sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3317 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3318 or die "unable to load treasurelists\n";
3292} 3319}
3293 3320
3294sub reload_resources { 3321sub reload_resources {
3295 warn "reloading resource files...\n"; 3322 warn "reloading resource files...\n";
3296 3323
3324 reload_facedata;
3325 reload_archetypes;
3297 reload_regions; 3326 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3327 reload_treasures;
3302 3328
3303 warn "finished reloading resource files\n"; 3329 warn "finished reloading resource files\n";
3304} 3330}
3305 3331
3306sub init { 3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3307 reload_resources; 3337 reload_resources;
3308} 3338}
3309 3339
3310sub reload_config { 3340sub reload_config {
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3326 }; 3356 };
3327 warn $@ if $@; 3357 warn $@ if $@;
3328 } 3358 }
3329} 3359}
3330 3360
3361sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!";
3364 flock $fh, &Fcntl::LOCK_EX
3365 or die "$PIDFILE: flock: $!";
3366 $fh
3367}
3368
3369# make sure only one server instance is running at any one time
3370sub atomic {
3371 my $fh = pidfile;
3372
3373 my $pid = <$fh>;
3374 kill 9, $pid if $pid > 0;
3375
3376 seek $fh, 0, 0;
3377 print $fh $$;
3378}
3379
3331sub main { 3380sub main {
3381 atomic;
3382
3332 # we must not ever block the main coroutine 3383 # we must not ever block the main coroutine
3333 local $Coro::idle = sub { 3384 local $Coro::idle = sub {
3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3335 (async { 3386 (async {
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3387 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3388 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3389 })->prio (Coro::PRIO_MAX);
3339 }; 3390 };
3340 3391
3392 {
3393 my $guard = freeze_mainloop;
3341 reload_config; 3394 reload_config;
3342 db_init; 3395 db_init;
3343 load_extensions; 3396 load_extensions;
3344 3397
3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 }
3400
3401 utime time, time, $RUNTIMEFILE;
3402
3403 # no (long-running) fork's whatsoever before this point(!)
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3405
3347 EV::loop; 3406 EV::loop;
3348} 3407}
3349 3408
3350############################################################################# 3409#############################################################################
3351# initialisation and cleanup 3410# initialisation and cleanup
… …
3358 cf::cleanup "SIG$signal"; 3417 cf::cleanup "SIG$signal";
3359 }; 3418 };
3360 } 3419 }
3361} 3420}
3362 3421
3363sub write_runtime { 3422sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime";
3365
3366 # first touch the runtime file to show we are still running: 3423 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3424 # the fsync below can take a very very long time.
3368 3425
3369 IO::AIO::aio_utime $runtime, undef, undef; 3426 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3370 3427
3371 my $guard = cf::lock_acquire "write_runtime"; 3428 my $guard = cf::lock_acquire "write_runtime";
3372 3429
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3430 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3374 or return; 3431 or return;
3375 3432
3376 my $value = $cf::RUNTIME + 90 + 10; 3433 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock 3434 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server. 3435 # 60 allows for the watchdog to kill the server.
… …
3388 aio_utime $fh, undef, undef; 3445 aio_utime $fh, undef, undef;
3389 3446
3390 close $fh 3447 close $fh
3391 or return; 3448 or return;
3392 3449
3393 aio_rename "$runtime~", $runtime 3450 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3394 and return; 3451 and return;
3395 3452
3396 warn "runtime file written.\n"; 3453 warn "runtime file written.\n";
3397 3454
3398 1 3455 1
3456}
3457
3458our $uuid_lock;
3459our $uuid_skip;
3460
3461sub write_uuid_sync($) {
3462 $uuid_skip ||= $_[0];
3463
3464 return if $uuid_lock;
3465 local $uuid_lock = 1;
3466
3467 my $uuid = "$LOCALDIR/uuid";
3468
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return;
3471
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3473 $uuid_skip = 0;
3474
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return;
3477
3478 # always fsync - this file is important
3479 aio_fsync $fh
3480 and return;
3481
3482 close $fh
3483 or return;
3484
3485 aio_rename "$uuid~", $uuid
3486 and return;
3487
3488 warn "uuid file written ($value).\n";
3489
3490 1
3491
3492}
3493
3494sub write_uuid($$) {
3495 my ($skip, $sync) = @_;
3496
3497 $sync ? write_uuid_sync $skip
3498 : async { write_uuid_sync $skip };
3399} 3499}
3400 3500
3401sub emergency_save() { 3501sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3502 my $freeze_guard = cf::freeze_mainloop;
3403 3503
… …
3425 warn "end emergency map save\n"; 3525 warn "end emergency map save\n";
3426 3526
3427 warn "begin emergency database checkpoint\n"; 3527 warn "begin emergency database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3528 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 3529 warn "end emergency database checkpoint\n";
3530
3531 warn "begin write uuid\n";
3532 write_uuid_sync 1;
3533 warn "end write uuid\n";
3430 }; 3534 };
3431 3535
3432 warn "leave emergency perl save\n"; 3536 warn "leave emergency perl save\n";
3433} 3537}
3434 3538
3435sub post_cleanup { 3539sub post_cleanup {
3436 my ($make_core) = @_; 3540 my ($make_core) = @_;
3437 3541
3438 warn Carp::longmess "post_cleanup backtrace" 3542 warn Carp::longmess "post_cleanup backtrace"
3439 if $make_core; 3543 if $make_core;
3544
3545 my $fh = pidfile;
3546 unlink $PIDFILE if <$fh> == $$;
3440} 3547}
3548
3549# a safer delete_package, copied from Symbol
3550sub clear_package($) {
3551 my $pkg = shift;
3552
3553 # expand to full symbol table name if needed
3554 unless ($pkg =~ /^main::.*::$/) {
3555 $pkg = "main$pkg" if $pkg =~ /^::/;
3556 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3557 $pkg .= '::' unless $pkg =~ /::$/;
3558 }
3559
3560 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3561 my $stem_symtab = *{$stem}{HASH};
3562
3563 defined $stem_symtab and exists $stem_symtab->{$leaf}
3564 or return;
3565
3566 # clear all symbols
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 }
3572 warn "cleared package #$pkg\n";#d#
3573}
3574
3575our $RELOAD; # how many times to reload
3441 3576
3442sub do_reload_perl() { 3577sub do_reload_perl() {
3443 # can/must only be called in main 3578 # can/must only be called in main
3444 if ($Coro::current != $Coro::main) { 3579 if ($Coro::current != $Coro::main) {
3445 warn "can only reload from main coroutine"; 3580 warn "can only reload from main coroutine";
3446 return; 3581 return;
3447 } 3582 }
3448 3583
3584 return if $RELOAD++;
3585
3586 while ($RELOAD) {
3449 warn "reloading..."; 3587 warn "reloading...";
3450 3588
3451 warn "entering sync_job"; 3589 warn "entering sync_job";
3452 3590
3453 cf::sync_job { 3591 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark 3592 cf::write_runtime_sync; # external watchdog should not bark
3455 cf::emergency_save; 3593 cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark 3594 cf::write_runtime_sync; # external watchdog should not bark
3457 3595
3458 warn "syncing database to disk"; 3596 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV; 3597 BDB::db_env_txn_checkpoint $DB_ENV;
3460 3598
3461 # if anything goes wrong in here, we should simply crash as we already saved 3599 # if anything goes wrong in here, we should simply crash as we already saved
3462 3600
3463 warn "flushing outstanding aio requests"; 3601 warn "flushing outstanding aio requests";
3464 for (;;) {
3465 BDB::flush;
3466 IO::AIO::flush;
3467 Coro::cede_notself;
3468 last unless IO::AIO::nreqs || BDB::nreqs; 3602 while (IO::AIO::nreqs || BDB::nreqs) {
3469 warn "iterate..."; 3603 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3470 }
3471
3472 ++$RELOAD;
3473
3474 warn "cancelling all extension coros";
3475 $_->cancel for values %EXT_CORO;
3476 %EXT_CORO = ();
3477
3478 warn "removing commands";
3479 %COMMAND = ();
3480
3481 warn "removing ext/exti commands";
3482 %EXTCMD = ();
3483 %EXTICMD = ();
3484
3485 warn "unloading/nuking all extensions";
3486 for my $pkg (@EXTS) {
3487 warn "... unloading $pkg";
3488
3489 if (my $cb = $pkg->can ("unload")) {
3490 eval {
3491 $cb->($pkg);
3492 1
3493 } or warn "$pkg unloaded, but with errors: $@";
3494 } 3604 }
3495 3605
3496 warn "... nuking $pkg"; 3606 warn "cancelling all extension coros";
3497 Symbol::delete_package $pkg; 3607 $_->cancel for values %EXT_CORO;
3498 } 3608 %EXT_CORO = ();
3499 3609
3500 warn "unloading all perl modules loaded from $LIBDIR"; 3610 warn "removing commands";
3501 while (my ($k, $v) = each %INC) { 3611 %COMMAND = ();
3502 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503 3612
3613 warn "removing ext/exti commands";
3614 %EXTCMD = ();
3615 %EXTICMD = ();
3616
3617 warn "unloading/nuking all extensions";
3618 for my $pkg (@EXTS) {
3504 warn "... unloading $k"; 3619 warn "... unloading $pkg";
3505 delete $INC{$k};
3506 3620
3507 $k =~ s/\.pm$//;
3508 $k =~ s/\//::/g;
3509
3510 if (my $cb = $k->can ("unload_module")) { 3621 if (my $cb = $pkg->can ("unload")) {
3622 eval {
3511 $cb->(); 3623 $cb->($pkg);
3624 1
3625 } or warn "$pkg unloaded, but with errors: $@";
3626 }
3627
3628 warn "... clearing $pkg";
3629 clear_package $pkg;
3512 } 3630 }
3513 3631
3514 Symbol::delete_package $k; 3632 warn "unloading all perl modules loaded from $LIBDIR";
3633 while (my ($k, $v) = each %INC) {
3634 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3635
3636 warn "... unloading $k";
3637 delete $INC{$k};
3638
3639 $k =~ s/\.pm$//;
3640 $k =~ s/\//::/g;
3641
3642 if (my $cb = $k->can ("unload_module")) {
3643 $cb->();
3644 }
3645
3646 clear_package $k;
3515 } 3647 }
3516 3648
3517 warn "getting rid of safe::, as good as possible"; 3649 warn "getting rid of safe::, as good as possible";
3518 Symbol::delete_package "safe::$_" 3650 clear_package "safe::$_"
3519 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3520 3652
3521 warn "unloading cf.pm \"a bit\""; 3653 warn "unloading cf.pm \"a bit\"";
3522 delete $INC{"cf.pm"}; 3654 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"}; 3655 delete $INC{"cf/pod.pm"};
3524 3656
3525 # don't, removes xs symbols, too, 3657 # don't, removes xs symbols, too,
3526 # and global variables created in xs 3658 # and global variables created in xs
3527 #Symbol::delete_package __PACKAGE__; 3659 #clear_package __PACKAGE__;
3528 3660
3529 warn "unload completed, starting to reload now"; 3661 warn "unload completed, starting to reload now";
3530 3662
3531 warn "reloading cf.pm"; 3663 warn "reloading cf.pm";
3532 require cf; 3664 require cf;
3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3665 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3534 3666
3535 warn "loading config and database again"; 3667 warn "loading config and database again";
3536 cf::reload_config; 3668 cf::reload_config;
3537 3669
3538 warn "loading extensions"; 3670 warn "loading extensions";
3539 cf::load_extensions; 3671 cf::load_extensions;
3540 3672
3541 warn "reattaching attachments to objects/players"; 3673 warn "reattaching attachments to objects/players";
3542 _global_reattach; # objects, sockets 3674 _global_reattach; # objects, sockets
3543 warn "reattaching attachments to maps"; 3675 warn "reattaching attachments to maps";
3544 reattach $_ for values %MAP; 3676 reattach $_ for values %MAP;
3545 warn "reattaching attachments to players"; 3677 warn "reattaching attachments to players";
3546 reattach $_ for values %PLAYER; 3678 reattach $_ for values %PLAYER;
3547 3679
3548 warn "leaving sync_job"; 3680 warn "leaving sync_job";
3549 3681
3550 1 3682 1
3551 } or do { 3683 } or do {
3552 warn $@; 3684 warn $@;
3553 warn "error while reloading, exiting."; 3685 cf::cleanup "error while reloading, exiting.";
3554 exit 1;
3555 }; 3686 };
3556 3687
3557 warn "reloaded"; 3688 warn "reloaded";
3689 --$RELOAD;
3690 }
3558}; 3691};
3559 3692
3560our $RELOAD_WATCHER; # used only during reload 3693our $RELOAD_WATCHER; # used only during reload
3561 3694
3562sub reload_perl() { 3695sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 3696 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 3697 # coro crashes during coro_state_free->destroy here.
3565 3698
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3699 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3700 do_reload_perl;
3567 undef $RELOAD_WATCHER; 3701 undef $RELOAD_WATCHER;
3568 do_reload_perl;
3569 }; 3702 };
3570} 3703}
3571 3704
3572register_command "reload" => sub { 3705register_command "reload" => sub {
3573 my ($who, $arg) = @_; 3706 my ($who, $arg) = @_;
… …
3587 3720
3588our @WAIT_FOR_TICK; 3721our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 3722our @WAIT_FOR_TICK_BEGIN;
3590 3723
3591sub wait_for_tick { 3724sub wait_for_tick {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 3725 return if tick_inhibit || $Coro::current == $Coro::main;
3594 3726
3595 my $signal = new Coro::Signal; 3727 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 3728 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 3729 $signal->wait;
3598} 3730}
3599 3731
3600sub wait_for_tick_begin { 3732sub wait_for_tick_begin {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 3733 return if tick_inhibit || $Coro::current == $Coro::main;
3603 3734
3604 my $signal = new Coro::Signal; 3735 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 3736 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 3737 $signal->wait;
3607} 3738}
3608 3739
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3740sub tick {
3610 if ($Coro::current != $Coro::main) { 3741 if ($Coro::current != $Coro::main) {
3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3742 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612 unless ++$bug_warning > 10; 3743 unless ++$bug_warning > 10;
3613 return; 3744 return;
3614 } 3745 }
3615 3746
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 3747 cf::server_tick; # one server iteration
3619
3620 $RUNTIME += $TICK;
3621 $NEXT_TICK = $_[0]->at;
3622 3748
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3749 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3750 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 3751 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 3752 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 3753 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 3754 or warn "ERROR: unable to write runtime file: $!";
3629 }; 3755 };
3630 } 3756 }
3631 3757
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3758 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3634 } 3760 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 3761 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 3762 $sig->send;
3637 } 3763 }
3638 3764
3639 $LOAD = ($NOW - $tick_start) / $TICK; 3765 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3766 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 3767
3642 _post_tick; 3768 if (0) {
3643}; 3769 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 3770 my $jitter = $TICK_START - $NEXT_TICK;
3771 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3772 warn "jitter $JITTER\n";#d#
3773 }
3774 }
3775}
3645 3776
3646{ 3777{
3647 # configure BDB 3778 # configure BDB
3648 3779
3649 BDB::min_parallel 8; 3780 BDB::min_parallel 8;
3650 BDB::max_poll_reqs $TICK * 0.1; 3781 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 3782 $AnyEvent::BDB::WATCHER->priority (1);
3652 3783
3653 unless ($DB_ENV) { 3784 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 3785 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3786 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 3787 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3788 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3789 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3790 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 3791
3660 cf::sync_job { 3792 cf::sync_job {
3661 eval { 3793 eval {
… …
3687{ 3819{
3688 # configure IO::AIO 3820 # configure IO::AIO
3689 3821
3690 IO::AIO::min_parallel 8; 3822 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3823 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 3824 undef $AnyEvent::AIO::WATCHER;
3693} 3825}
3694 3826
3695my $_log_backtrace; 3827my $_log_backtrace;
3696 3828
3697sub _log_backtrace { 3829sub _log_backtrace {

Diff Legend

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