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.444 by root, Mon Sep 8 11:27:25 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
… …
69our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE; 97our %RESOURCE;
72 98
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $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 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 101our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
79 103
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 107our $DB_ENV;
85 108
… …
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 121
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
102 126
103binmode STDOUT; 127binmode STDOUT;
104binmode STDERR; 128binmode STDERR;
105 129
106# read virtual server time, if available 130# read virtual server time, if available
… …
192 LOG llevError, $msg; 216 LOG llevError, $msg;
193 }; 217 };
194} 218}
195 219
196$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
197 warn Carp::longmess $_[0]; 229 warn Carp::longmess $_[0];
198 Coro::terminate; 230 Coro::terminate
199}; 231};
232
233$SIG{__DIE__} = sub { }; #d#?
200 234
201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
211for my $pkg (qw( 245for my $pkg (qw(
212 cf::global cf::attachable 246 cf::global cf::attachable
213 cf::object cf::object::player 247 cf::object cf::object::player
214 cf::client cf::player 248 cf::client cf::player
215 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
216 cf::map cf::party cf::region 251 cf::party cf::region
217)) { 252)) {
218 no strict 'refs';
219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
220} 254}
221 255
222$EV::DIED = sub { 256$EV::DIED = sub {
223 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
… …
329 363
330 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
331} 365}
332 366
333sub freeze_mainloop { 367sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
335 369
336 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 371}
342 372
343=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
344 374
345Like 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
… …
400 } 430 }
401 } 431 }
402}; 432};
403 433
404sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
405 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
406 438
407 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
408 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
409 441
… …
446 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
448 480
449 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
450 482
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
454 484
455 my $busy = 1; 485 my $busy = 1;
456 my @res; 486 my @res;
457 487
… …
468 } else { 498 } else {
469 EV::loop EV::LOOP_ONESHOT; 499 EV::loop EV::LOOP_ONESHOT;
470 } 500 }
471 } 501 }
472 502
473 $time = EV::time - $time; 503 my $time = EV::time - $time;
474 504
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 505 $TICK_START += $time; # do not account sync jobs to server load
479 506
480 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
481 } else { 508 } else {
482 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
483 510
… …
525 reset_signals; 552 reset_signals;
526 &$cb 553 &$cb
527 }, @args; 554 }, @args;
528 555
529 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
530} 584}
531 585
532=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
533 587
534Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
1034 1088
1035sub reattach { 1089sub reattach {
1036 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1037 my ($obj) = @_; 1091 my ($obj) = @_;
1038 1092
1093 # no longer needed after getting rid of delete_package?
1039 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
1040 1095
1041 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1042 1097
1043 @$registry = (); 1098 @$registry = ();
1044 1099
… …
1090 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1091 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1092 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1093 1148
1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1098 close $fh; 1153 aio_close $fh;
1099 1154
1100 if (@$objs) { 1155 if (@$objs) {
1101 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) {
1102 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1105 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1106 close $fh; 1161 aio_close $fh;
1107 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1108 } 1163 }
1109 } else { 1164 } else {
1110 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1111 } 1166 }
… …
1280 1335
1281 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1282 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1283 1338
1284 $ext{source} = 1339 $ext{source} =
1285 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1286 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1287 . $source 1342 . $source
1288 . "\n};\n1"; 1343 . "\n};\n1";
1289 1344
1290 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1306 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1307 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1308 1363
1309 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1310 warn $msg; 1365 warn $msg;
1311 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1312 exit 1;
1313 } 1367 }
1314 1368
1315 warn $msg; 1369 warn $msg;
1316 } 1370 }
1317 1371
… …
1406 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1461 or return;
1408 1462
1409 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1410 or return; 1464 or return;
1465
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1414 } 1469 }
1415 } 1470 }
… …
1425 1480
1426 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1427 1482
1428 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1430 1487
1431 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1489 cf::cede_to_tick;
1433} 1490}
1434 1491
… …
1466 my ($pl) = @_; 1523 my ($pl) = @_;
1467 1524
1468 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1469 1526
1470 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1471 $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
1472 1529
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1474 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1476 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1477 1536
1478 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1518 1577
1519 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1520 my $path = path $login; 1579 my $path = path $login;
1521 1580
1522 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1587 }
1528 1588
… …
1563 1623
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1565 1625
1566Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1567 1627
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) 1628=item $player->ext_reply ($msgid, @msg)
1658 1629
1659Sends an ext reply to the player. 1630Sends an ext reply to the player.
1660 1631
1661=cut 1632=cut
… …
1727our $MAX_RESET = 3600; 1698our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1699our $DEFAULT_RESET = 3000;
1729 1700
1730sub generate_random_map { 1701sub generate_random_map {
1731 my ($self, $rmp) = @_; 1702 my ($self, $rmp) = @_;
1703
1704 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1705
1732 # mit "rum" bekleckern, nicht 1706 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1707 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1708 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1709 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1710 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1858 1832
1859# the temporary/swap location 1833# the temporary/swap location
1860sub save_path { 1834sub save_path {
1861 my ($self) = @_; 1835 my ($self) = @_;
1862 1836
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1837 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1838 "$TMPDIR/$path.map"
1865} 1839}
1866 1840
1867# the unique path, undef == no special unique path 1841# the unique path, undef == no special unique path
1868sub uniq_path { 1842sub uniq_path {
1869 my ($self) = @_; 1843 my ($self) = @_;
1870 1844
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1845 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1846 "$UNIQUEDIR/$path"
1873} 1847}
1874 1848
1875# and all this just because we cannot iterate over 1849# and all this just because we cannot iterate over
1876# all maps in C++... 1850# all maps in C++...
… …
1974 1948
1975 cf::lock_wait "map_data:$path";#d#remove 1949 cf::lock_wait "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 1950 cf::lock_wait "map_find:$path";
1977 1951
1978 $cf::MAP{$path} || do { 1952 $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 1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1954 my $guard2 = cf::lock_acquire "map_find:$path";
1981 1955
1982 my $map = new_from_path cf::map $path 1956 my $map = new_from_path cf::map $path
1983 or return; 1957 or return;
1984 1958
1985 $map->{last_save} = $cf::RUNTIME; 1959 $map->{last_save} = $cf::RUNTIME;
… …
1988 or return; 1962 or return;
1989 1963
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1964 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 1965 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 1966 #$cf::WAIT_FOR_TICK->wait;
1967 undef $guard2;
1993 undef $guard1; 1968 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 1969 $map->reset;
1996 return find $path; 1970 return find $path;
1997 } 1971 }
1998 1972
1999 $cf::MAP{$path} = $map 1973 $cf::MAP{$path} = $map
… …
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2000 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2001 $f->skip_block;
2028 $self->_load_objects ($f) 2002 $self->_load_objects ($f)
2029 or return; 2003 or return;
2030 2004
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2005 $self->post_load_original
2032 if delete $self->{load_original}; 2006 if delete $self->{load_original};
2033 2007
2034 if (my $uniq = $self->uniq_path) { 2008 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2009 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2010 unless (aio_stat $uniq) {
… …
2062 } 2036 }
2063 2037
2064 $self->{last_save} = $cf::RUNTIME; 2038 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2039 $self->last_access ($cf::RUNTIME);
2066 2040
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2041 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2042 }
2069 2043
2070 $self->post_load; 2044 $self->post_load;
2071} 2045}
2072 2046
… …
2130 my ($path, $origin, $load) = @_; 2104 my ($path, $origin, $load) = @_;
2131 2105
2132 $path = normalise $path, $origin && $origin->{path}; 2106 $path = normalise $path, $origin && $origin->{path};
2133 2107
2134 if (my $map = $cf::MAP{$path}) { 2108 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2109 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2110 }
2137 2111
2138 $MAP_PREFETCH{$path} |= $load; 2112 $MAP_PREFETCH{$path} |= $load;
2139 2113
2140 $MAP_PREFETCHER ||= cf::async { 2114 $MAP_PREFETCHER ||= cf::async {
… …
2177 cf::async { 2151 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2152 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2153 $_->contr->save for $self->players;
2180 }; 2154 };
2181 2155
2156 cf::get_slot 0.02;
2157
2182 if ($uniq) { 2158 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2159 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2160 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2161 } else {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2194 $self->save; 2170 $self->save;
2195 2171
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2173
2198 return if $self->players; 2174 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY; 2175 return if $self->in_memory != cf::MAP_ACTIVE;
2200 return if $self->{deny_save}; 2176 return if $self->{deny_save};
2201 2177
2202 $self->in_memory (cf::MAP_SWAPPED); 2178 $self->in_memory (cf::MAP_SWAPPED);
2203 2179
2204 $self->deactivate; 2180 $self->deactivate;
… …
2322 2298
2323sub unique_maps() { 2299sub unique_maps() {
2324 [ 2300 [
2325 map { 2301 map {
2326 utf8::decode $_; 2302 utf8::decode $_;
2327 /\.map$/ 2303 s/\.map$//; # TODO future compatibility hack
2304 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2305 ? ()
2328 ? normalise $_ 2306 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2307 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2308 ]
2332} 2309}
2333 2310
2334package cf;
2335
2336=back 2311=back
2337 2312
2338=head3 cf::object 2313=head3 cf::object
2339 2314
2340=cut 2315=cut
… …
2343 2318
2344=over 4 2319=over 4
2345 2320
2346=item $ob->inv_recursive 2321=item $ob->inv_recursive
2347 2322
2348Returns the inventory of the object _and_ their inventories, recursively. 2323Returns the inventory of the object I<and> their inventories, recursively,
2324but I<not> the object itself.
2349 2325
2350=cut 2326=cut
2351 2327
2352sub inv_recursive_; 2328sub inv_recursive_;
2353sub inv_recursive_ { 2329sub inv_recursive_ {
… …
2358 inv_recursive_ inv $_[0] 2334 inv_recursive_ inv $_[0]
2359} 2335}
2360 2336
2361=item $ref = $ob->ref 2337=item $ref = $ob->ref
2362 2338
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2339Creates and returns a persistent reference to an object that can be stored as a string.
2364 2340
2365=item $ob = cf::object::deref ($refstring) 2341=item $ob = cf::object::deref ($refstring)
2366 2342
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2343returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block. 2344even if the object actually exists. May block.
… …
2400can be C<undef>. Does the right thing when the player is currently in a 2376can be C<undef>. Does the right thing when the player is currently in a
2401dialogue with the given NPC character. 2377dialogue with the given NPC character.
2402 2378
2403=cut 2379=cut
2404 2380
2381our $SAY_CHANNEL = {
2382 id => "say",
2383 title => "Map",
2384 reply => "say ",
2385 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2386};
2387
2388our $CHAT_CHANNEL = {
2389 id => "chat",
2390 title => "Chat",
2391 reply => "chat ",
2392 tooltip => "Player chat and shouts, global to the server.",
2393};
2394
2405# rough implementation of a future "reply" method that works 2395# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2396# with dialog boxes.
2407#TODO: the first argument must go, split into a $npc->reply_to ( method 2397#TODO: the first argument must go, split into a $npc->reply_to ( method
2408sub cf::object::player::reply($$$;$) { 2398sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2399 my ($self, $npc, $msg, $flags) = @_;
… …
2420 my $dialog = $pl->{npc_dialog}; 2410 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2411 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422 2412
2423 } else { 2413 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2414 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2415 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2416 }
2427 } 2417 }
2428} 2418}
2429 2419
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2420=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2537Moves the player to the given map-path and coordinates by first freezing 2527Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2528her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2529that 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 2530the new (success) or old (failed) map position. In either case, $done will
2541be called at the end of this process. 2531be called at the end of this process.
2532
2533Note that $check will be called with a potentially non-loaded map, so if
2534it needs a loaded map it has to call C<< ->load >>.
2542 2535
2543=cut 2536=cut
2544 2537
2545our $GOTOGEN; 2538our $GOTOGEN;
2546 2539
… …
2625} 2618}
2626 2619
2627sub prepare_random_map { 2620sub prepare_random_map {
2628 my ($exit) = @_; 2621 my ($exit) = @_;
2629 2622
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2623 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2624 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2625 # that depends on the exit object
2635 2626
2636 my $rmp = parse_random_map_params $exit->msg; 2627 my $rmp = parse_random_map_params $exit->msg;
… …
2638 if ($exit->map) { 2629 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2630 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2631 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2632 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2633 $rmp->{origin_y} = $exit->y;
2634
2635 $exit->map->touch;
2643 } 2636 }
2644 2637
2645 $rmp->{random_seed} ||= $exit->random_seed; 2638 $rmp->{random_seed} ||= $exit->random_seed;
2646 2639
2647 my $data = cf::encode_json $rmp; 2640 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2641 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2642 my $meta = "$RANDOMDIR/$md5.meta";
2650 2643
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2644 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2645 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2646 undef $fh;
2654 aio_rename "$meta~", $meta; 2647 aio_rename "$meta~", $meta;
2655 2648
2649 my $slaying = "?random/$md5";
2650
2651 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2652 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2653 $exit->msg (undef);
2654 }
2658 } 2655 }
2659} 2656}
2660 2657
2661sub cf::object::player::enter_exit { 2658sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2659 my ($self, $exit) = @_;
2663 2660
2664 return unless $self->type == cf::PLAYER; 2661 return unless $self->type == cf::PLAYER;
2665 2662
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; 2663 $self->enter_link;
2678 2664
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 { 2665 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2666 $Coro::current->{desc} = "enter_exit";
2685 2667
2686 $self->deactivate_recursive; # just to be sure
2687 unless (eval { 2668 unless (eval {
2669 $self->deactivate_recursive; # just to be sure
2670
2671 # random map handling
2672 {
2673 my $guard = cf::lock_acquire "exit_prepare:$exit";
2674
2675 prepare_random_map $exit
2676 if $exit->slaying eq "/!";
2677 }
2678
2679 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2680 my $x = $exit->stats->hp;
2681 my $y = $exit->stats->sp;
2682
2688 $self->goto ($slaying, $hp, $sp); 2683 $self->goto ($map, $x, $y);
2689 2684
2685 # if exit is damned, update players death & WoR home-position
2686 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED);
2688
2690 1; 2689 1
2691 }) { 2690 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2691 $self->message ("Something went wrong deep within the crossfire server. "
2693 . "I'll try to bring you back to the map you were before. " 2692 . "I'll try to bring you back to the map you were before. "
2694 . "Please report this to the dungeon master!", 2693 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2694 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2775 id => "infobox", 2774 id => "infobox",
2776 title => "Map Info", 2775 title => "Map Info",
2777 reply => undef, 2776 reply => undef,
2778 tooltip => "Information related to the maps", 2777 tooltip => "Information related to the maps",
2779 }, 2778 },
2779 "c/party" => {
2780 id => "party",
2781 title => "Party",
2782 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party",
2784 },
2780); 2785);
2781 2786
2782sub cf::client::send_msg { 2787sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 2788 my ($self, $channel, $msg, $color, @extra) = @_;
2784 2789
… …
2811 if ($self->can_msg) { 2816 if ($self->can_msg) {
2812 # default colour, mask it out 2817 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF; 2819 if $color & cf::NDI_DEF;
2815 2820
2816 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2821 my $pkt = "msg "
2822 . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 );
2825
2826 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf};
2829
2830 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag";
2834 }
2835
2836 $self->send_packet ($pkt);
2818 } else { 2837 } else {
2819 if ($color >= 0) { 2838 if ($color >= 0) {
2820 # replace some tags by gcfclient-compatible ones 2839 # replace some tags by gcfclient-compatible ones
2821 for ($msg) { 2840 for ($msg) {
2822 1 while 2841 1 while
… …
3021 3040
3022The following functions and methods are available within a safe environment: 3041The following functions and methods are available within a safe environment:
3023 3042
3024 cf::object 3043 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy 3044 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr 3045 insert remove name archname title slaying race decrease split
3027 3046
3028 cf::object::player 3047 cf::object::player
3029 player 3048 player
3030 3049
3031 cf::player 3050 cf::player
… …
3036 3055
3037=cut 3056=cut
3038 3057
3039for ( 3058for (
3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3059 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race 3060 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3061 decrease split destroy change_exp)],
3043 ["cf::object::player" => qw(player)], 3062 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3063 ["cf::player" => qw(peaceful)],
3045 ["cf::map" => qw(trigger)], 3064 ["cf::map" => qw(trigger)],
3046) { 3065) {
3047 no strict 'refs'; 3066 no strict 'refs';
… …
3255 while (my ($k, $v) = each %$want) { 3274 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3275 $ns->fx_want ($k, $v);
3257 } 3276 }
3258}; 3277};
3259 3278
3279sub load_resource_file($) {
3280 my $guard = lock_acquire "load_resource_file";
3281
3282 my $status = load_resource_file_ $_[0];
3283 get_slot 0.1, 100;
3284 cf::arch::commit_load;
3285
3286 $status
3287}
3288
3260sub reload_regions { 3289sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework 3290 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?) 3291 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3292 %ext::player_env::MUSIC_FACE_CACHE = ();
3264 3293
… …
3277} 3306}
3278 3307
3279sub reload_archetypes { 3308sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3309 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3310 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} 3311}
3288 3312
3289sub reload_treasures { 3313sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3314 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3315 or die "unable to load treasurelists\n";
3292} 3316}
3293 3317
3294sub reload_resources { 3318sub reload_resources {
3295 warn "reloading resource files...\n"; 3319 warn "reloading resource files...\n";
3296 3320
3321 reload_facedata;
3322 reload_archetypes;
3297 reload_regions; 3323 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3324 reload_treasures;
3302 3325
3303 warn "finished reloading resource files\n"; 3326 warn "finished reloading resource files\n";
3304} 3327}
3305 3328
3306sub init { 3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
3307 reload_resources; 3334 reload_resources;
3308} 3335}
3309 3336
3310sub reload_config { 3337sub reload_config {
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3338 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3363 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3364 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3365 })->prio (Coro::PRIO_MAX);
3339 }; 3366 };
3340 3367
3368 {
3369 my $guard = freeze_mainloop;
3341 reload_config; 3370 reload_config;
3342 db_init; 3371 db_init;
3343 load_extensions; 3372 load_extensions;
3344 3373
3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3375 }
3376
3347 EV::loop; 3377 EV::loop;
3348} 3378}
3349 3379
3350############################################################################# 3380#############################################################################
3351# initialisation and cleanup 3381# initialisation and cleanup
… …
3358 cf::cleanup "SIG$signal"; 3388 cf::cleanup "SIG$signal";
3359 }; 3389 };
3360 } 3390 }
3361} 3391}
3362 3392
3363sub write_runtime { 3393sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 3394 my $runtime = "$LOCALDIR/runtime";
3365 3395
3366 # first touch the runtime file to show we are still running: 3396 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3397 # the fsync below can take a very very long time.
3368 3398
… …
3394 and return; 3424 and return;
3395 3425
3396 warn "runtime file written.\n"; 3426 warn "runtime file written.\n";
3397 3427
3398 1 3428 1
3429}
3430
3431our $uuid_lock;
3432our $uuid_skip;
3433
3434sub write_uuid_sync($) {
3435 $uuid_skip ||= $_[0];
3436
3437 return if $uuid_lock;
3438 local $uuid_lock = 1;
3439
3440 my $uuid = "$LOCALDIR/uuid";
3441
3442 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3443 or return;
3444
3445 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3446 $uuid_skip = 0;
3447
3448 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3449 and return;
3450
3451 # always fsync - this file is important
3452 aio_fsync $fh
3453 and return;
3454
3455 close $fh
3456 or return;
3457
3458 aio_rename "$uuid~", $uuid
3459 and return;
3460
3461 warn "uuid file written ($value).\n";
3462
3463 1
3464
3465}
3466
3467sub write_uuid($$) {
3468 my ($skip, $sync) = @_;
3469
3470 $sync ? write_uuid_sync $skip
3471 : async { write_uuid_sync $skip };
3399} 3472}
3400 3473
3401sub emergency_save() { 3474sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3475 my $freeze_guard = cf::freeze_mainloop;
3403 3476
… …
3425 warn "end emergency map save\n"; 3498 warn "end emergency map save\n";
3426 3499
3427 warn "begin emergency database checkpoint\n"; 3500 warn "begin emergency database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3501 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 3502 warn "end emergency database checkpoint\n";
3503
3504 warn "begin write uuid\n";
3505 write_uuid_sync 1;
3506 warn "end write uuid\n";
3430 }; 3507 };
3431 3508
3432 warn "leave emergency perl save\n"; 3509 warn "leave emergency perl save\n";
3433} 3510}
3434 3511
… …
3436 my ($make_core) = @_; 3513 my ($make_core) = @_;
3437 3514
3438 warn Carp::longmess "post_cleanup backtrace" 3515 warn Carp::longmess "post_cleanup backtrace"
3439 if $make_core; 3516 if $make_core;
3440} 3517}
3518
3519# a safer delete_package, copied from Symbol
3520sub clear_package($) {
3521 my $pkg = shift;
3522
3523 # expand to full symbol table name if needed
3524 unless ($pkg =~ /^main::.*::$/) {
3525 $pkg = "main$pkg" if $pkg =~ /^::/;
3526 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3527 $pkg .= '::' unless $pkg =~ /::$/;
3528 }
3529
3530 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3531 my $stem_symtab = *{$stem}{HASH};
3532
3533 defined $stem_symtab and exists $stem_symtab->{$leaf}
3534 or return;
3535
3536 # clear all symbols
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 }
3542 warn "cleared package #$pkg\n";#d#
3543}
3544
3545our $RELOAD; # how many times to reload
3441 3546
3442sub do_reload_perl() { 3547sub do_reload_perl() {
3443 # can/must only be called in main 3548 # can/must only be called in main
3444 if ($Coro::current != $Coro::main) { 3549 if ($Coro::current != $Coro::main) {
3445 warn "can only reload from main coroutine"; 3550 warn "can only reload from main coroutine";
3446 return; 3551 return;
3447 } 3552 }
3448 3553
3554 return if $RELOAD++;
3555
3556 while ($RELOAD) {
3449 warn "reloading..."; 3557 warn "reloading...";
3450 3558
3451 warn "entering sync_job"; 3559 warn "entering sync_job";
3452 3560
3453 cf::sync_job { 3561 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark 3562 cf::write_runtime_sync; # external watchdog should not bark
3455 cf::emergency_save; 3563 cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark 3564 cf::write_runtime_sync; # external watchdog should not bark
3457 3565
3458 warn "syncing database to disk"; 3566 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV; 3567 BDB::db_env_txn_checkpoint $DB_ENV;
3460 3568
3461 # if anything goes wrong in here, we should simply crash as we already saved 3569 # if anything goes wrong in here, we should simply crash as we already saved
3462 3570
3463 warn "flushing outstanding aio requests"; 3571 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; 3572 while (IO::AIO::nreqs || BDB::nreqs) {
3469 warn "iterate..."; 3573 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 } 3574 }
3495 3575
3496 warn "... nuking $pkg"; 3576 warn "cancelling all extension coros";
3497 Symbol::delete_package $pkg; 3577 $_->cancel for values %EXT_CORO;
3498 } 3578 %EXT_CORO = ();
3499 3579
3500 warn "unloading all perl modules loaded from $LIBDIR"; 3580 warn "removing commands";
3501 while (my ($k, $v) = each %INC) { 3581 %COMMAND = ();
3502 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503 3582
3583 warn "removing ext/exti commands";
3584 %EXTCMD = ();
3585 %EXTICMD = ();
3586
3587 warn "unloading/nuking all extensions";
3588 for my $pkg (@EXTS) {
3504 warn "... unloading $k"; 3589 warn "... unloading $pkg";
3505 delete $INC{$k};
3506 3590
3507 $k =~ s/\.pm$//;
3508 $k =~ s/\//::/g;
3509
3510 if (my $cb = $k->can ("unload_module")) { 3591 if (my $cb = $pkg->can ("unload")) {
3592 eval {
3511 $cb->(); 3593 $cb->($pkg);
3594 1
3595 } or warn "$pkg unloaded, but with errors: $@";
3596 }
3597
3598 warn "... clearing $pkg";
3599 clear_package $pkg;
3512 } 3600 }
3513 3601
3514 Symbol::delete_package $k; 3602 warn "unloading all perl modules loaded from $LIBDIR";
3603 while (my ($k, $v) = each %INC) {
3604 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3605
3606 warn "... unloading $k";
3607 delete $INC{$k};
3608
3609 $k =~ s/\.pm$//;
3610 $k =~ s/\//::/g;
3611
3612 if (my $cb = $k->can ("unload_module")) {
3613 $cb->();
3614 }
3615
3616 clear_package $k;
3515 } 3617 }
3516 3618
3517 warn "getting rid of safe::, as good as possible"; 3619 warn "getting rid of safe::, as good as possible";
3518 Symbol::delete_package "safe::$_" 3620 clear_package "safe::$_"
3519 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3621 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3520 3622
3521 warn "unloading cf.pm \"a bit\""; 3623 warn "unloading cf.pm \"a bit\"";
3522 delete $INC{"cf.pm"}; 3624 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"}; 3625 delete $INC{"cf/pod.pm"};
3524 3626
3525 # don't, removes xs symbols, too, 3627 # don't, removes xs symbols, too,
3526 # and global variables created in xs 3628 # and global variables created in xs
3527 #Symbol::delete_package __PACKAGE__; 3629 #clear_package __PACKAGE__;
3528 3630
3529 warn "unload completed, starting to reload now"; 3631 warn "unload completed, starting to reload now";
3530 3632
3531 warn "reloading cf.pm"; 3633 warn "reloading cf.pm";
3532 require cf; 3634 require cf;
3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3635 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3534 3636
3535 warn "loading config and database again"; 3637 warn "loading config and database again";
3536 cf::reload_config; 3638 cf::reload_config;
3537 3639
3538 warn "loading extensions"; 3640 warn "loading extensions";
3539 cf::load_extensions; 3641 cf::load_extensions;
3540 3642
3541 warn "reattaching attachments to objects/players"; 3643 warn "reattaching attachments to objects/players";
3542 _global_reattach; # objects, sockets 3644 _global_reattach; # objects, sockets
3543 warn "reattaching attachments to maps"; 3645 warn "reattaching attachments to maps";
3544 reattach $_ for values %MAP; 3646 reattach $_ for values %MAP;
3545 warn "reattaching attachments to players"; 3647 warn "reattaching attachments to players";
3546 reattach $_ for values %PLAYER; 3648 reattach $_ for values %PLAYER;
3547 3649
3548 warn "leaving sync_job"; 3650 warn "leaving sync_job";
3549 3651
3550 1 3652 1
3551 } or do { 3653 } or do {
3552 warn $@; 3654 warn $@;
3553 warn "error while reloading, exiting."; 3655 cf::cleanup "error while reloading, exiting.";
3554 exit 1;
3555 }; 3656 };
3556 3657
3557 warn "reloaded"; 3658 warn "reloaded";
3659 --$RELOAD;
3660 }
3558}; 3661};
3559 3662
3560our $RELOAD_WATCHER; # used only during reload 3663our $RELOAD_WATCHER; # used only during reload
3561 3664
3562sub reload_perl() { 3665sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 3666 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 3667 # coro crashes during coro_state_free->destroy here.
3565 3668
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3670 do_reload_perl;
3567 undef $RELOAD_WATCHER; 3671 undef $RELOAD_WATCHER;
3568 do_reload_perl;
3569 }; 3672 };
3570} 3673}
3571 3674
3572register_command "reload" => sub { 3675register_command "reload" => sub {
3573 my ($who, $arg) = @_; 3676 my ($who, $arg) = @_;
… …
3587 3690
3588our @WAIT_FOR_TICK; 3691our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 3692our @WAIT_FOR_TICK_BEGIN;
3590 3693
3591sub wait_for_tick { 3694sub wait_for_tick {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 3695 return if tick_inhibit || $Coro::current == $Coro::main;
3594 3696
3595 my $signal = new Coro::Signal; 3697 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 3698 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 3699 $signal->wait;
3598} 3700}
3599 3701
3600sub wait_for_tick_begin { 3702sub wait_for_tick_begin {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 3703 return if tick_inhibit || $Coro::current == $Coro::main;
3603 3704
3604 my $signal = new Coro::Signal; 3705 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 3706 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 3707 $signal->wait;
3607} 3708}
3608 3709
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3710sub tick {
3610 if ($Coro::current != $Coro::main) { 3711 if ($Coro::current != $Coro::main) {
3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3712 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612 unless ++$bug_warning > 10; 3713 unless ++$bug_warning > 10;
3613 return; 3714 return;
3614 } 3715 }
3615 3716
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 3717 cf::server_tick; # one server iteration
3619
3620 $RUNTIME += $TICK;
3621 $NEXT_TICK = $_[0]->at;
3622 3718
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3719 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3720 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 3721 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 3722 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 3723 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 3724 or warn "ERROR: unable to write runtime file: $!";
3629 }; 3725 };
3630 } 3726 }
3631 3727
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3728 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3634 } 3730 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 3731 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 3732 $sig->send;
3637 } 3733 }
3638 3734
3639 $LOAD = ($NOW - $tick_start) / $TICK; 3735 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3736 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 3737
3642 _post_tick; 3738 if (0) {
3643}; 3739 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 3740 my $jitter = $TICK_START - $NEXT_TICK;
3741 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3742 warn "jitter $JITTER\n";#d#
3743 }
3744 }
3745}
3645 3746
3646{ 3747{
3647 # configure BDB 3748 # configure BDB
3648 3749
3649 BDB::min_parallel 8; 3750 BDB::min_parallel 8;
3650 BDB::max_poll_reqs $TICK * 0.1; 3751 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 3752 $AnyEvent::BDB::WATCHER->priority (1);
3652 3753
3653 unless ($DB_ENV) { 3754 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 3755 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3756 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 3757 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3758 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3759 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3760 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 3761
3660 cf::sync_job { 3762 cf::sync_job {
3661 eval { 3763 eval {
… …
3687{ 3789{
3688 # configure IO::AIO 3790 # configure IO::AIO
3689 3791
3690 IO::AIO::min_parallel 8; 3792 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3793 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 3794 undef $AnyEvent::AIO::WATCHER;
3693} 3795}
3694 3796
3695my $_log_backtrace; 3797my $_log_backtrace;
3696 3798
3697sub _log_backtrace { 3799sub _log_backtrace {

Diff Legend

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