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.411 by root, Fri Feb 1 15:54:07 2008 UTC vs.
Revision 1.457 by root, Wed Oct 1 05:50:19 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
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43
44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
45 74
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
47 76
48our %COMMAND = (); 77our %COMMAND = ();
49our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
52our %EXTCMD = (); 81our %EXTCMD = ();
53our %EXTICMD = (); 82our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
56 85
57our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 87our @EVENT;
59 88
60our $CONFDIR = confdir; 89our $CONFDIR = confdir;
61our $DATADIR = datadir; 90our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
71our %RESOURCE; 103our %RESOURCE;
72 104
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $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 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 107our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
79 109
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 110our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 111our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 112our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 113our $DB_ENV;
85 114
96# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 127
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
132
133our @POST_INIT;
134
135our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
102 136
103binmode STDOUT; 137binmode STDOUT;
104binmode STDERR; 138binmode STDERR;
105 139
106# read virtual server time, if available 140# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 141unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 142 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 143 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 144 $RUNTIME = <$fh> + 0.;
111} 145}
112 146
113mkdir $_ 147mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
221for my $pkg (qw( 255for my $pkg (qw(
222 cf::global cf::attachable 256 cf::global cf::attachable
223 cf::object cf::object::player 257 cf::object cf::object::player
224 cf::client cf::player 258 cf::client cf::player
225 cf::arch cf::living 259 cf::arch cf::living
260 cf::map cf::mapspace
226 cf::map cf::party cf::region 261 cf::party cf::region
227)) { 262)) {
228 no strict 'refs';
229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
230} 264}
231 265
232$EV::DIED = sub { 266$EV::DIED = sub {
233 warn "error in event callback: @_"; 267 warn "error in event callback: @_";
275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 309our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
276 310
277sub encode_json($) { $json_coder->encode ($_[0]) } 311sub encode_json($) { $json_coder->encode ($_[0]) }
278sub decode_json($) { $json_coder->decode ($_[0]) } 312sub decode_json($) { $json_coder->decode ($_[0]) }
279 313
314=item cf::post_init { BLOCK }
315
316Execute the given codeblock, I<after> all extensions have been (re-)loaded,
317but I<before> the server starts ticking again.
318
319The cdoeblock will have a single boolean argument to indicate whether this
320is a reload or not.
321
322=cut
323
324sub post_init(&) {
325 push @POST_INIT, shift;
326}
327
280=item cf::lock_wait $string 328=item cf::lock_wait $string
281 329
282Wait until the given lock is available. See cf::lock_acquire. 330Wait until the given lock is available. See cf::lock_acquire.
283 331
284=item my $lock = cf::lock_acquire $string 332=item my $lock = cf::lock_acquire $string
311 return;#d# 359 return;#d#
312 }#d# 360 }#d#
313 361
314 # wait for lock, if any 362 # wait for lock, if any
315 while ($LOCK{$key}) { 363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
316 push @{ $LOCK{$key} }, $Coro::current; 365 push @{ $LOCK{$key} }, $Coro::current;
317 Coro::schedule; 366 Coro::schedule;
318 } 367 }
319} 368}
320 369
339 388
340 ! ! $LOCK{$key} 389 ! ! $LOCK{$key}
341} 390}
342 391
343sub freeze_mainloop { 392sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
345 394
346 my $guard = Coro::guard { 395 Coro::guard \&tick_inhibit_dec;
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 396}
352 397
353=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
354 399
355Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
410 } 455 }
411 } 456 }
412}; 457};
413 458
414sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
415 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
416 463
417 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
419 466
456 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
458 505
459 LOG llevError, Carp::longmess "sync job";#d# 506 LOG llevError, Carp::longmess "sync job";#d#
460 507
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
464 509
465 my $busy = 1; 510 my $busy = 1;
466 my @res; 511 my @res;
467 512
478 } else { 523 } else {
479 EV::loop EV::LOOP_ONESHOT; 524 EV::loop EV::LOOP_ONESHOT;
480 } 525 }
481 } 526 }
482 527
483 $time = EV::time - $time; 528 my $time = EV::time - $time;
484 529
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
489 531
490 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
491 } else { 533 } else {
492 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
493 535
535 reset_signals; 577 reset_signals;
536 &$cb 578 &$cb
537 }, @args; 579 }, @args;
538 580
539 wantarray ? @res : $res[-1] 581 wantarray ? @res : $res[-1]
582}
583
584=item $coin = coin_from_name $name
585
586=cut
587
588our %coin_alias = (
589 "silver" => "silvercoin",
590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
540} 609}
541 610
542=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
543 612
544Returns a single value from the environment database. 613Returns a single value from the environment database.
683 752
684############################################################################# 753#############################################################################
685 754
686=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
687 756
688Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
689attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
690to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
691 760
692In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
693C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
743=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
744 813
745Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
746given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
747 816
748Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
749that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
750 819
751These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
752 821
753=over 4 822=over 4
1044 1113
1045sub reattach { 1114sub reattach {
1046 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
1047 my ($obj) = @_; 1116 my ($obj) = @_;
1048 1117
1118 # no longer needed after getting rid of delete_package?
1049 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1050 1120
1051 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
1052 1122
1053 @$registry = (); 1123 @$registry = ();
1054 1124
1100 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1103 1173
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 aio_fsync $fh if $cf::USE_FSYNC; 1177 aio_fsync $fh if $cf::USE_FSYNC;
1108 close $fh; 1178 aio_close $fh;
1109 1179
1110 if (@$objs) { 1180 if (@$objs) {
1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1112 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1184 aio_write $fh, 0, (length $data), $data, 0;
1115 aio_fsync $fh if $cf::USE_FSYNC; 1185 aio_fsync $fh if $cf::USE_FSYNC;
1116 close $fh; 1186 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1187 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1188 }
1119 } else { 1189 } else {
1120 aio_unlink "$filename.pst"; 1190 aio_unlink "$filename.pst";
1121 } 1191 }
1122 1192
1123 aio_rename "$filename~", $filename; 1193 aio_rename "$filename~", $filename;
1194
1195 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC;
1124 } else { 1197 } else {
1125 warn "FATAL: $filename~: $!\n"; 1198 warn "FATAL: $filename~: $!\n";
1126 } 1199 }
1127 } else { 1200 } else {
1128 aio_unlink $filename; 1201 aio_unlink $filename;
1221 my ($name, $cb) = @_; 1294 my ($name, $cb) = @_;
1222 1295
1223 $EXTICMD{$name} = $cb; 1296 $EXTICMD{$name} = $cb;
1224} 1297}
1225 1298
1299use File::Glob ();
1300
1226cf::player->attach ( 1301cf::player->attach (
1227 on_command => sub { 1302 on_command => sub {
1228 my ($pl, $name, $params) = @_; 1303 my ($pl, $name, $params) = @_;
1229 1304
1230 my $cb = $COMMAND{$name} 1305 my $cb = $COMMAND{$name}
1262 1337
1263 cf::override; 1338 cf::override;
1264 }, 1339 },
1265); 1340);
1266 1341
1342# "readahead" all extensions
1343sub cache_extensions {
1344 my $grp = IO::AIO::aio_group;
1345
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1347 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 }
1350 };
1351
1352 $grp
1353}
1354
1267sub load_extensions { 1355sub load_extensions {
1268 cf::sync_job { 1356 cf::sync_job {
1269 my %todo; 1357 my %todo;
1270 1358
1271 for my $path (<$LIBDIR/*.ext>) { 1359 for my $path (<$LIBDIR/*.ext>) {
1290 1378
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1379 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1380 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1381
1294 $ext{source} = 1382 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1383 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1296 . "#line 1 \"$path\"\n{\n" 1384 . "#line 1 \"$path\"\n{\n"
1297 . $source 1385 . $source
1298 . "\n};\n1"; 1386 . "\n};\n1";
1299 1387
1300 $todo{$base} = \%ext; 1388 $todo{$base} = \%ext;
1340 1428
1341=back 1429=back
1342 1430
1343=head2 CORE EXTENSIONS 1431=head2 CORE EXTENSIONS
1344 1432
1345Functions and methods that extend core crossfire objects. 1433Functions and methods that extend core deliantra objects.
1346 1434
1347=cut 1435=cut
1348 1436
1349package cf::player; 1437package cf::player;
1350 1438
1393 1481
1394sub exists($) { 1482sub exists($) {
1395 my ($login) = @_; 1483 my ($login) = @_;
1396 1484
1397 $cf::PLAYER{$login} 1485 $cf::PLAYER{$login}
1398 or cf::sync_job { !aio_stat path $login } 1486 or !aio_stat path $login
1399} 1487}
1400 1488
1401sub find($) { 1489sub find($) {
1402 return $cf::PLAYER{$_[0]} || do { 1490 return $cf::PLAYER{$_[0]} || do {
1403 my $login = $_[0]; 1491 my $login = $_[0];
1415 my $f = new_from_file cf::object::thawer path $login 1503 my $f = new_from_file cf::object::thawer path $login
1416 or return; 1504 or return;
1417 1505
1418 my $pl = cf::player::load_pl $f 1506 my $pl = cf::player::load_pl $f
1419 or return; 1507 or return;
1508
1420 local $cf::PLAYER_LOADING{$login} = $pl; 1509 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs; 1510 $f->resolve_delayed_derefs;
1422 $cf::PLAYER{$login} = $pl 1511 $cf::PLAYER{$login} = $pl
1423 } 1512 }
1424 } 1513 }
1434 1523
1435 return if $pl->{deny_save}; 1524 return if $pl->{deny_save};
1436 1525
1437 aio_mkdir playerdir $pl, 0770; 1526 aio_mkdir playerdir $pl, 0770;
1438 $pl->{last_save} = $cf::RUNTIME; 1527 $pl->{last_save} = $cf::RUNTIME;
1528
1529 cf::get_slot 0.01;
1439 1530
1440 $pl->save_pl ($path); 1531 $pl->save_pl ($path);
1441 cf::cede_to_tick; 1532 cf::cede_to_tick;
1442} 1533}
1443 1534
1475 my ($pl) = @_; 1566 my ($pl) = @_;
1476 1567
1477 my $name = $pl->ob->name; 1568 my $name = $pl->ob->name;
1478 1569
1479 $pl->{deny_save} = 1; 1570 $pl->{deny_save} = 1;
1480 $pl->password ("*"); # this should lock out the player until we nuked the dir 1571 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1481 1572
1482 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1483 $pl->deactivate; 1574 $pl->deactivate;
1575 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1576 $pl->ob->check_score;
1484 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1577 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1485 $pl->ns->destroy if $pl->ns; 1578 $pl->ns->destroy if $pl->ns;
1486 1579
1487 my $path = playerdir $pl; 1580 my $path = playerdir $pl;
1488 my $temp = "$path~$cf::RUNTIME~deleting~"; 1581 my $temp = "$path~$cf::RUNTIME~deleting~";
1527 1620
1528 for my $login (@$dirs) { 1621 for my $login (@$dirs) {
1529 my $path = path $login; 1622 my $path = path $login;
1530 1623
1531 # a .pst is a dead give-away for a valid player 1624 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") { 1625 # if no pst file found, open and chekc for blocked users
1626 if (aio_stat "$path.pst") {
1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1627 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1534 aio_read $fh, 0, 512, my $buf, 0 or next; 1628 aio_read $fh, 0, 512, my $buf, 0 or next;
1535 $buf !~ /^password -------------$/m or next; # official not-valid tag 1629 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 } 1630 }
1537 1631
1568 } 1662 }
1569 1663
1570 \@paths 1664 \@paths
1571} 1665}
1572 1666
1573=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1667=item $protocol_xml = $player->expand_cfpod ($cfpod)
1574 1668
1575Expand crossfire pod fragments into protocol xml. 1669Expand deliantra pod fragments into protocol xml.
1576
1577=cut
1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1590sub expand_cfpod {
1591 my ($self, $pod) = @_;
1592
1593 my $xml;
1594
1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1598
1599 $group =~ s/&/&amp;/g;
1600 $group =~ s/</&lt;/g;
1601
1602 $xml .= $group;
1603 } elsif ($pod =~ m%\G
1604 ([BCGHITU])
1605 <
1606 (?:
1607 ([^<>]*) (?{ $group = $^N })
1608 | < $interior >
1609 )
1610 >
1611 %gcsx
1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1632 "")
1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1644
1645 for ($xml) {
1646 # create single paragraphs (very hackish)
1647 s/(?<=\S)\n(?=\w)/ /g;
1648
1649 # compress some whitespace
1650 s/\s+\n/\n/g; # ws line-ends
1651 s/\n\n+/\n/g; # double lines
1652 s/^\n+//; # beginning lines
1653 s/\n+$//; # ending lines
1654 }
1655
1656 $xml
1657}
1658
1659no re 'eval';
1660
1661sub hintmode {
1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1663 $_[0]{hintmode}
1664}
1665 1670
1666=item $player->ext_reply ($msgid, @msg) 1671=item $player->ext_reply ($msgid, @msg)
1667 1672
1668Sends an ext reply to the player. 1673Sends an ext reply to the player.
1669 1674
1736our $MAX_RESET = 3600; 1741our $MAX_RESET = 3600;
1737our $DEFAULT_RESET = 3000; 1742our $DEFAULT_RESET = 3000;
1738 1743
1739sub generate_random_map { 1744sub generate_random_map {
1740 my ($self, $rmp) = @_; 1745 my ($self, $rmp) = @_;
1746
1747 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1748
1741 # mit "rum" bekleckern, nicht 1749 # mit "rum" bekleckern, nicht
1742 $self->_create_random_map ( 1750 $self->_create_random_map (
1743 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1751 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1744 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1752 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1745 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1753 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1867 1875
1868# the temporary/swap location 1876# the temporary/swap location
1869sub save_path { 1877sub save_path {
1870 my ($self) = @_; 1878 my ($self) = @_;
1871 1879
1872 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1873 "$TMPDIR/$path.map" 1881 "$TMPDIR/$path.map"
1874} 1882}
1875 1883
1876# the unique path, undef == no special unique path 1884# the unique path, undef == no special unique path
1877sub uniq_path { 1885sub uniq_path {
1878 my ($self) = @_; 1886 my ($self) = @_;
1879 1887
1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1881 "$UNIQUEDIR/$path" 1889 "$UNIQUEDIR/$path"
1882} 1890}
1883 1891
1884# and all this just because we cannot iterate over 1892# and all this just because we cannot iterate over
1885# all maps in C++... 1893# all maps in C++...
1983 1991
1984 cf::lock_wait "map_data:$path";#d#remove 1992 cf::lock_wait "map_data:$path";#d#remove
1985 cf::lock_wait "map_find:$path"; 1993 cf::lock_wait "map_find:$path";
1986 1994
1987 $cf::MAP{$path} || do { 1995 $cf::MAP{$path} || do {
1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997 my $guard2 = cf::lock_acquire "map_find:$path";
1990 1998
1991 my $map = new_from_path cf::map $path 1999 my $map = new_from_path cf::map $path
1992 or return; 2000 or return;
1993 2001
1994 $map->{last_save} = $cf::RUNTIME; 2002 $map->{last_save} = $cf::RUNTIME;
1997 or return; 2005 or return;
1998 2006
1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2007 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2000 # doing this can freeze the server in a sync job, obviously 2008 # doing this can freeze the server in a sync job, obviously
2001 #$cf::WAIT_FOR_TICK->wait; 2009 #$cf::WAIT_FOR_TICK->wait;
2010 undef $guard2;
2002 undef $guard1; 2011 undef $guard1;
2003 undef $guard2;
2004 $map->reset; 2012 $map->reset;
2005 return find $path; 2013 return find $path;
2006 } 2014 }
2007 2015
2008 $cf::MAP{$path} = $map 2016 $cf::MAP{$path} = $map
2035 my $f = new_from_file cf::object::thawer $self->{load_path}; 2043 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block; 2044 $f->skip_block;
2037 $self->_load_objects ($f) 2045 $self->_load_objects ($f)
2038 or return; 2046 or return;
2039 2047
2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2048 $self->post_load_original
2041 if delete $self->{load_original}; 2049 if delete $self->{load_original};
2042 2050
2043 if (my $uniq = $self->uniq_path) { 2051 if (my $uniq = $self->uniq_path) {
2044 utf8::encode $uniq; 2052 utf8::encode $uniq;
2045 unless (aio_stat $uniq) { 2053 unless (aio_stat $uniq) {
2071 } 2079 }
2072 2080
2073 $self->{last_save} = $cf::RUNTIME; 2081 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2082 $self->last_access ($cf::RUNTIME);
2075 2083
2076 $self->in_memory (cf::MAP_IN_MEMORY); 2084 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2085 }
2078 2086
2079 $self->post_load; 2087 $self->post_load;
2080} 2088}
2081 2089
2139 my ($path, $origin, $load) = @_; 2147 my ($path, $origin, $load) = @_;
2140 2148
2141 $path = normalise $path, $origin && $origin->{path}; 2149 $path = normalise $path, $origin && $origin->{path};
2142 2150
2143 if (my $map = $cf::MAP{$path}) { 2151 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2152 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2145 } 2153 }
2146 2154
2147 $MAP_PREFETCH{$path} |= $load; 2155 $MAP_PREFETCH{$path} |= $load;
2148 2156
2149 $MAP_PREFETCHER ||= cf::async { 2157 $MAP_PREFETCHER ||= cf::async {
2186 cf::async { 2194 cf::async {
2187 $Coro::current->{desc} = "map player save"; 2195 $Coro::current->{desc} = "map player save";
2188 $_->contr->save for $self->players; 2196 $_->contr->save for $self->players;
2189 }; 2197 };
2190 2198
2199 cf::get_slot 0.02;
2200
2191 if ($uniq) { 2201 if ($uniq) {
2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2202 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2193 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2203 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2194 } else { 2204 } else {
2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2205 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2203 $self->save; 2213 $self->save;
2204 2214
2205 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2215 my $lock = cf::lock_acquire "map_data:$self->{path}";
2206 2216
2207 return if $self->players; 2217 return if $self->players;
2208 return if $self->in_memory != cf::MAP_IN_MEMORY; 2218 return if $self->in_memory != cf::MAP_ACTIVE;
2209 return if $self->{deny_save}; 2219 return if $self->{deny_save};
2210 2220
2211 $self->in_memory (cf::MAP_SWAPPED); 2221 $self->in_memory (cf::MAP_SWAPPED);
2212 2222
2213 $self->deactivate; 2223 $self->deactivate;
2331 2341
2332sub unique_maps() { 2342sub unique_maps() {
2333 [ 2343 [
2334 map { 2344 map {
2335 utf8::decode $_; 2345 utf8::decode $_;
2336 /\.map$/ 2346 s/\.map$//; # TODO future compatibility hack
2347 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2348 ? ()
2337 ? normalise $_ 2349 : normalise $_
2338 : ()
2339 } @{ aio_readdir $UNIQUEDIR or [] } 2350 } @{ aio_readdir $UNIQUEDIR or [] }
2340 ] 2351 ]
2341} 2352}
2342 2353
2343package cf;
2344
2345=back 2354=back
2346 2355
2347=head3 cf::object 2356=head3 cf::object
2348 2357
2349=cut 2358=cut
2352 2361
2353=over 4 2362=over 4
2354 2363
2355=item $ob->inv_recursive 2364=item $ob->inv_recursive
2356 2365
2357Returns the inventory of the object _and_ their inventories, recursively. 2366Returns the inventory of the object I<and> their inventories, recursively,
2367but I<not> the object itself.
2358 2368
2359=cut 2369=cut
2360 2370
2361sub inv_recursive_; 2371sub inv_recursive_;
2362sub inv_recursive_ { 2372sub inv_recursive_ {
2367 inv_recursive_ inv $_[0] 2377 inv_recursive_ inv $_[0]
2368} 2378}
2369 2379
2370=item $ref = $ob->ref 2380=item $ref = $ob->ref
2371 2381
2372creates and returns a persistent reference to an objetc that can be stored as a string. 2382Creates and returns a persistent reference to an object that can be stored as a string.
2373 2383
2374=item $ob = cf::object::deref ($refstring) 2384=item $ob = cf::object::deref ($refstring)
2375 2385
2376returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2386returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2377even if the object actually exists. May block. 2387even if the object actually exists. May block.
2409can be C<undef>. Does the right thing when the player is currently in a 2419can be C<undef>. Does the right thing when the player is currently in a
2410dialogue with the given NPC character. 2420dialogue with the given NPC character.
2411 2421
2412=cut 2422=cut
2413 2423
2424our $SAY_CHANNEL = {
2425 id => "say",
2426 title => "Map",
2427 reply => "say ",
2428 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2429};
2430
2431our $CHAT_CHANNEL = {
2432 id => "chat",
2433 title => "Chat",
2434 reply => "chat ",
2435 tooltip => "Player chat and shouts, global to the server.",
2436};
2437
2414# rough implementation of a future "reply" method that works 2438# rough implementation of a future "reply" method that works
2415# with dialog boxes. 2439# with dialog boxes.
2416#TODO: the first argument must go, split into a $npc->reply_to ( method 2440#TODO: the first argument must go, split into a $npc->reply_to ( method
2417sub cf::object::player::reply($$$;$) { 2441sub cf::object::player::reply($$$;$) {
2418 my ($self, $npc, $msg, $flags) = @_; 2442 my ($self, $npc, $msg, $flags) = @_;
2429 my $dialog = $pl->{npc_dialog}; 2453 my $dialog = $pl->{npc_dialog};
2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2454 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2431 2455
2432 } else { 2456 } else {
2433 $msg = $npc->name . " says: $msg" if $npc; 2457 $msg = $npc->name . " says: $msg" if $npc;
2434 $self->message ($msg, $flags); 2458 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2435 } 2459 }
2436 } 2460 }
2437} 2461}
2438 2462
2439=item $object->send_msg ($channel, $msg, $color, [extra...]) 2463=item $object->send_msg ($channel, $msg, $color, [extra...])
2464 2488
2465=item $player_object->enter_link 2489=item $player_object->enter_link
2466 2490
2467Freezes the player and moves him/her to a special map (C<{link}>). 2491Freezes the player and moves him/her to a special map (C<{link}>).
2468 2492
2469The player should be reasonably safe there for short amounts of time. You 2493The player should be reasonably safe there for short amounts of time (e.g.
2470I<MUST> call C<leave_link> as soon as possible, though. 2494for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2495though, as the palyer cannot control the character while it is on the link
2496map.
2471 2497
2472Will never block. 2498Will never block.
2473 2499
2474=item $player_object->leave_link ($map, $x, $y) 2500=item $player_object->leave_link ($map, $x, $y)
2475 2501
2533 2559
2534 $map->load; 2560 $map->load;
2535 $map->load_neighbours; 2561 $map->load_neighbours;
2536 2562
2537 return unless $self->contr->active; 2563 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2538 $self->activate_recursive; 2565 $self->activate_recursive;
2539 2566
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541 $self->enter_map ($map, $x, $y); 2568 $self->enter_map ($map, $x, $y);
2542} 2569}
2546Moves the player to the given map-path and coordinates by first freezing 2573Moves the player to the given map-path and coordinates by first freezing
2547her, loading and preparing them map, calling the provided $check callback 2574her, loading and preparing them map, calling the provided $check callback
2548that has to return the map if sucecssful, and then unfreezes the player on 2575that has to return the map if sucecssful, and then unfreezes the player on
2549the new (success) or old (failed) map position. In either case, $done will 2576the new (success) or old (failed) map position. In either case, $done will
2550be called at the end of this process. 2577be called at the end of this process.
2578
2579Note that $check will be called with a potentially non-loaded map, so if
2580it needs a loaded map it has to call C<< ->load >>.
2551 2581
2552=cut 2582=cut
2553 2583
2554our $GOTOGEN; 2584our $GOTOGEN;
2555 2585
2634} 2664}
2635 2665
2636sub prepare_random_map { 2666sub prepare_random_map {
2637 my ($exit) = @_; 2667 my ($exit) = @_;
2638 2668
2639 my $guard = cf::lock_acquire "exit_prepare:$exit";
2640
2641 # all this does is basically replace the /! path by 2669 # all this does is basically replace the /! path by
2642 # a new random map path (?random/...) with a seed 2670 # a new random map path (?random/...) with a seed
2643 # that depends on the exit object 2671 # that depends on the exit object
2644 2672
2645 my $rmp = parse_random_map_params $exit->msg; 2673 my $rmp = parse_random_map_params $exit->msg;
2647 if ($exit->map) { 2675 if ($exit->map) {
2648 $rmp->{region} = $exit->region->name; 2676 $rmp->{region} = $exit->region->name;
2649 $rmp->{origin_map} = $exit->map->path; 2677 $rmp->{origin_map} = $exit->map->path;
2650 $rmp->{origin_x} = $exit->x; 2678 $rmp->{origin_x} = $exit->x;
2651 $rmp->{origin_y} = $exit->y; 2679 $rmp->{origin_y} = $exit->y;
2680
2681 $exit->map->touch;
2652 } 2682 }
2653 2683
2654 $rmp->{random_seed} ||= $exit->random_seed; 2684 $rmp->{random_seed} ||= $exit->random_seed;
2655 2685
2656 my $data = cf::encode_json $rmp; 2686 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2657 my $md5 = Digest::MD5::md5_hex $data; 2687 my $md5 = Digest::MD5::md5_hex $data;
2658 my $meta = "$RANDOMDIR/$md5.meta"; 2688 my $meta = "$RANDOMDIR/$md5.meta";
2659 2689
2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2690 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2661 aio_write $fh, 0, (length $data), $data, 0; 2691 aio_write $fh, 0, (length $data), $data, 0;
2662 undef $fh; 2692 undef $fh;
2663 aio_rename "$meta~", $meta; 2693 aio_rename "$meta~", $meta;
2664 2694
2695 my $slaying = "?random/$md5";
2696
2697 if ($exit->valid) {
2665 $exit->slaying ("?random/$md5"); 2698 $exit->slaying ("?random/$md5");
2666 $exit->msg (undef); 2699 $exit->msg (undef);
2700 }
2667 } 2701 }
2668} 2702}
2669 2703
2670sub cf::object::player::enter_exit { 2704sub cf::object::player::enter_exit {
2671 my ($self, $exit) = @_; 2705 my ($self, $exit) = @_;
2672 2706
2673 return unless $self->type == cf::PLAYER; 2707 return unless $self->type == cf::PLAYER;
2674 2708
2675 if ($exit->slaying eq "/!") {
2676 #TODO: this should de-fi-ni-te-ly not be a sync-job
2677 # the problem is that $exit might not survive long enough
2678 # so it needs to be done right now, right here
2679 cf::sync_job { prepare_random_map $exit };
2680 }
2681
2682 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2683 my $hp = $exit->stats->hp;
2684 my $sp = $exit->stats->sp;
2685
2686 $self->enter_link; 2709 $self->enter_link;
2687 2710
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($slaying, $hp, $sp)
2690 if $exit->flag (FLAG_DAMNED);
2691
2692 (async { 2711 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2712 $Coro::current->{desc} = "enter_exit";
2694 2713
2695 $self->deactivate_recursive; # just to be sure
2696 unless (eval { 2714 unless (eval {
2715 $self->deactivate_recursive; # just to be sure
2716
2717 # random map handling
2718 {
2719 my $guard = cf::lock_acquire "exit_prepare:$exit";
2720
2721 prepare_random_map $exit
2722 if $exit->slaying eq "/!";
2723 }
2724
2725 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2726 my $x = $exit->stats->hp;
2727 my $y = $exit->stats->sp;
2728
2697 $self->goto ($slaying, $hp, $sp); 2729 $self->goto ($map, $x, $y);
2698 2730
2731 # if exit is damned, update players death & WoR home-position
2732 $self->contr->savebed ($map, $x, $y)
2733 if $exit->flag (cf::FLAG_DAMNED);
2734
2699 1; 2735 1
2700 }) { 2736 }) {
2701 $self->message ("Something went wrong deep within the crossfire server. " 2737 $self->message ("Something went wrong deep within the deliantra server. "
2702 . "I'll try to bring you back to the map you were before. " 2738 . "I'll try to bring you back to the map you were before. "
2703 . "Please report this to the dungeon master!", 2739 . "Please report this to the dungeon master!",
2704 cf::NDI_UNIQUE | cf::NDI_RED); 2740 cf::NDI_UNIQUE | cf::NDI_RED);
2705 2741
2706 warn "ERROR in enter_exit: $@"; 2742 warn "ERROR in enter_exit: $@";
2772 id => "infobox", 2808 id => "infobox",
2773 title => "Body Parts", 2809 title => "Body Parts",
2774 reply => undef, 2810 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 2811 tooltip => "Shows which body parts you posess and are available",
2776 }, 2812 },
2813 "c/skills" => {
2814 id => "infobox",
2815 title => "Skills",
2816 reply => undef,
2817 tooltip => "Shows your experience per skill and item power",
2818 },
2777 "c/uptime" => { 2819 "c/uptime" => {
2778 id => "infobox", 2820 id => "infobox",
2779 title => "Uptime", 2821 title => "Uptime",
2780 reply => undef, 2822 reply => undef,
2781 tooltip => "How long the server has been running since last restart", 2823 tooltip => "How long the server has been running since last restart",
2784 id => "infobox", 2826 id => "infobox",
2785 title => "Map Info", 2827 title => "Map Info",
2786 reply => undef, 2828 reply => undef,
2787 tooltip => "Information related to the maps", 2829 tooltip => "Information related to the maps",
2788 }, 2830 },
2831 "c/party" => {
2832 id => "party",
2833 title => "Party",
2834 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party",
2836 },
2789); 2837);
2790 2838
2791sub cf::client::send_msg { 2839sub cf::client::send_msg {
2792 my ($self, $channel, $msg, $color, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2793 2841
2794 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg)
2843 unless $color & cf::NDI_VERBATIM;
2795 2844
2796 $color &= cf::NDI_CLIENT_MASK; # just in case... 2845 $color &= cf::NDI_CLIENT_MASK; # just in case...
2797 2846
2798 # check predefined channels, for the benefit of C 2847 # check predefined channels, for the benefit of C
2799 if ($CHANNEL{$channel}) { 2848 if ($CHANNEL{$channel}) {
2820 if ($self->can_msg) { 2869 if ($self->can_msg) {
2821 # default colour, mask it out 2870 # default colour, mask it out
2822 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2823 if $color & cf::NDI_DEF; 2872 if $color & cf::NDI_DEF;
2824 2873
2825 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2874 my $pkt = "msg "
2875 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 );
2878
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt);
2827 } else { 2890 } else {
2828 if ($color >= 0) { 2891 if ($color >= 0) {
2829 # replace some tags by gcfclient-compatible ones 2892 # replace some tags by gcfclient-compatible ones
2830 for ($msg) { 2893 for ($msg) {
2831 1 while 2894 1 while
3030 3093
3031The following functions and methods are available within a safe environment: 3094The following functions and methods are available within a safe environment:
3032 3095
3033 cf::object 3096 cf::object
3034 contr pay_amount pay_player map x y force_find force_add destroy 3097 contr pay_amount pay_player map x y force_find force_add destroy
3035 insert remove name archname title slaying race decrease_ob_nr 3098 insert remove name archname title slaying race decrease split
3036 3099
3037 cf::object::player 3100 cf::object::player
3038 player 3101 player
3039 3102
3040 cf::player 3103 cf::player
3045 3108
3046=cut 3109=cut
3047 3110
3048for ( 3111for (
3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race 3113 insert remove inv nrof name archname title slaying race
3051 decrease_ob_nr destroy)], 3114 decrease split destroy change_exp)],
3052 ["cf::object::player" => qw(player)], 3115 ["cf::object::player" => qw(player)],
3053 ["cf::player" => qw(peaceful)], 3116 ["cf::player" => qw(peaceful)],
3054 ["cf::map" => qw(trigger)], 3117 ["cf::map" => qw(trigger)],
3055) { 3118) {
3056 no strict 'refs'; 3119 no strict 'refs';
3264 while (my ($k, $v) = each %$want) { 3327 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v); 3328 $ns->fx_want ($k, $v);
3266 } 3329 }
3267}; 3330};
3268 3331
3332sub load_resource_file($) {
3333 my $guard = lock_acquire "load_resource_file";
3334
3335 my $status = load_resource_file_ $_[0];
3336 get_slot 0.1, 100;
3337 cf::arch::commit_load;
3338
3339 $status
3340}
3341
3269sub reload_regions { 3342sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework 3343 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?) 3344 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3345 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3346
3286} 3359}
3287 3360
3288sub reload_archetypes { 3361sub reload_archetypes {
3289 load_resource_file "$DATADIR/archetypes" 3362 load_resource_file "$DATADIR/archetypes"
3290 or die "unable to load archetypes\n"; 3363 or die "unable to load archetypes\n";
3291 #d# NEED to laod twice to resolve forward references
3292 # this really needs to be done in an extra post-pass
3293 # (which needs to be synchronous, so solve it differently)
3294 load_resource_file "$DATADIR/archetypes"
3295 or die "unable to load archetypes\n";
3296} 3364}
3297 3365
3298sub reload_treasures { 3366sub reload_treasures {
3299 load_resource_file "$DATADIR/treasures" 3367 load_resource_file "$DATADIR/treasures"
3300 or die "unable to load treasurelists\n"; 3368 or die "unable to load treasurelists\n";
3301} 3369}
3302 3370
3303sub reload_resources { 3371sub reload_resources {
3304 warn "reloading resource files...\n"; 3372 warn "reloading resource files...\n";
3305 3373
3374 reload_facedata;
3375 reload_archetypes;
3306 reload_regions; 3376 reload_regions;
3307 reload_facedata;
3308 #reload_archetypes;#d#
3309 reload_archetypes;
3310 reload_treasures; 3377 reload_treasures;
3311 3378
3312 warn "finished reloading resource files\n"; 3379 warn "finished reloading resource files\n";
3313}
3314
3315sub init {
3316 reload_resources;
3317} 3380}
3318 3381
3319sub reload_config { 3382sub reload_config {
3320 open my $fh, "<:utf8", "$CONFDIR/config" 3383 open my $fh, "<:utf8", "$CONFDIR/config"
3321 or return; 3384 or return;
3335 }; 3398 };
3336 warn $@ if $@; 3399 warn $@ if $@;
3337 } 3400 }
3338} 3401}
3339 3402
3403sub pidfile() {
3404 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3405 or die "$PIDFILE: $!";
3406 flock $fh, &Fcntl::LOCK_EX
3407 or die "$PIDFILE: flock: $!";
3408 $fh
3409}
3410
3411# make sure only one server instance is running at any one time
3412sub atomic {
3413 my $fh = pidfile;
3414
3415 my $pid = <$fh>;
3416 kill 9, $pid if $pid > 0;
3417
3418 seek $fh, 0, 0;
3419 print $fh $$;
3420}
3421
3340sub main { 3422sub main {
3423 cf::init_globals; # initialise logging
3424
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3427 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3428 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3429
3430 cf::init_experience;
3431 cf::init_anim;
3432 cf::init_attackmess;
3433 cf::init_dynamic;
3434 cf::init_block;
3435
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437
3341 # we must not ever block the main coroutine 3438 # we must not ever block the main coroutine
3342 local $Coro::idle = sub { 3439 local $Coro::idle = sub {
3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3440 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3344 (async { 3441 (async {
3345 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3442 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT; 3443 EV::loop EV::LOOP_ONESHOT;
3347 })->prio (Coro::PRIO_MAX); 3444 })->prio (Coro::PRIO_MAX);
3348 }; 3445 };
3349 3446
3447 evthread_start IO::AIO::poll_fileno;
3448
3449 cf::sync_job {
3450 reload_resources;
3350 reload_config; 3451 reload_config;
3351 db_init; 3452 db_init;
3453
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid;
3457 cf::init_signals;
3458 cf::init_commands;
3459 cf::init_skills;
3460
3461 cf::init_beforeplay;
3462
3463 atomic;
3464
3352 load_extensions; 3465 load_extensions;
3353 3466
3354 $TICK_WATCHER->start; 3467 utime time, time, $RUNTIMEFILE;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3468
3469 # no (long-running) fork's whatsoever before this point(!)
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471
3472 (pop @POST_INIT)->(0) while @POST_INIT;
3473 };
3474
3356 EV::loop; 3475 EV::loop;
3357} 3476}
3358 3477
3359############################################################################# 3478#############################################################################
3360# initialisation and cleanup 3479# initialisation and cleanup
3367 cf::cleanup "SIG$signal"; 3486 cf::cleanup "SIG$signal";
3368 }; 3487 };
3369 } 3488 }
3370} 3489}
3371 3490
3372sub write_runtime { 3491sub write_runtime_sync {
3373 my $runtime = "$LOCALDIR/runtime";
3374
3375 # first touch the runtime file to show we are still running: 3492 # first touch the runtime file to show we are still running:
3376 # the fsync below can take a very very long time. 3493 # the fsync below can take a very very long time.
3377 3494
3378 IO::AIO::aio_utime $runtime, undef, undef; 3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3379 3496
3380 my $guard = cf::lock_acquire "write_runtime"; 3497 my $guard = cf::lock_acquire "write_runtime";
3381 3498
3382 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3383 or return; 3500 or return;
3384 3501
3385 my $value = $cf::RUNTIME + 90 + 10; 3502 my $value = $cf::RUNTIME + 90 + 10;
3386 # 10 is the runtime save interval, for a monotonic clock 3503 # 10 is the runtime save interval, for a monotonic clock
3387 # 60 allows for the watchdog to kill the server. 3504 # 60 allows for the watchdog to kill the server.
3397 aio_utime $fh, undef, undef; 3514 aio_utime $fh, undef, undef;
3398 3515
3399 close $fh 3516 close $fh
3400 or return; 3517 or return;
3401 3518
3402 aio_rename "$runtime~", $runtime 3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3403 and return; 3520 and return;
3404 3521
3405 warn "runtime file written.\n"; 3522 warn "runtime file written.\n";
3406 3523
3407 1 3524 1
3525}
3526
3527our $uuid_lock;
3528our $uuid_skip;
3529
3530sub write_uuid_sync($) {
3531 $uuid_skip ||= $_[0];
3532
3533 return if $uuid_lock;
3534 local $uuid_lock = 1;
3535
3536 my $uuid = "$LOCALDIR/uuid";
3537
3538 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3539 or return;
3540
3541 my $value = uuid_seq uuid_cur;
3542
3543 unless ($value) {
3544 warn "cowardly refusing to write zero uuid value!\n";
3545 return;
3546 }
3547
3548 my $value = uuid_str $value + $uuid_skip;
3549 $uuid_skip = 0;
3550
3551 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3552 and return;
3553
3554 # always fsync - this file is important
3555 aio_fsync $fh
3556 and return;
3557
3558 close $fh
3559 or return;
3560
3561 aio_rename "$uuid~", $uuid
3562 and return;
3563
3564 warn "uuid file written ($value).\n";
3565
3566 1
3567
3568}
3569
3570sub write_uuid($$) {
3571 my ($skip, $sync) = @_;
3572
3573 $sync ? write_uuid_sync $skip
3574 : async { write_uuid_sync $skip };
3408} 3575}
3409 3576
3410sub emergency_save() { 3577sub emergency_save() {
3411 my $freeze_guard = cf::freeze_mainloop; 3578 my $freeze_guard = cf::freeze_mainloop;
3412 3579
3413 warn "enter emergency perl save\n"; 3580 warn "emergency_perl_save: enter\n";
3414 3581
3415 cf::sync_job { 3582 cf::sync_job {
3583 # this is a trade-off: we want to be very quick here, so
3584 # save all maps without fsync, and later call a global sync
3585 # (which in turn might be very very slow)
3586 local $USE_FSYNC = 0;
3587
3416 # use a peculiar iteration method to avoid tripping on perl 3588 # use a peculiar iteration method to avoid tripping on perl
3417 # refcount bugs in for. also avoids problems with players 3589 # refcount bugs in for. also avoids problems with players
3418 # and maps saved/destroyed asynchronously. 3590 # and maps saved/destroyed asynchronously.
3419 warn "begin emergency player save\n"; 3591 warn "emergency_perl_save: begin player save\n";
3420 for my $login (keys %cf::PLAYER) { 3592 for my $login (keys %cf::PLAYER) {
3421 my $pl = $cf::PLAYER{$login} or next; 3593 my $pl = $cf::PLAYER{$login} or next;
3422 $pl->valid or next; 3594 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3595 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3424 $pl->save; 3596 $pl->save;
3425 } 3597 }
3426 warn "end emergency player save\n"; 3598 warn "emergency_perl_save: end player save\n";
3427 3599
3428 warn "begin emergency map save\n"; 3600 warn "emergency_perl_save: begin map save\n";
3429 for my $path (keys %cf::MAP) { 3601 for my $path (keys %cf::MAP) {
3430 my $map = $cf::MAP{$path} or next; 3602 my $map = $cf::MAP{$path} or next;
3431 $map->valid or next; 3603 $map->valid or next;
3432 $map->save; 3604 $map->save;
3433 } 3605 }
3434 warn "end emergency map save\n"; 3606 warn "emergency_perl_save: end map save\n";
3435 3607
3436 warn "begin emergency database checkpoint\n"; 3608 warn "emergency_perl_save: begin database checkpoint\n";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3438 warn "end emergency database checkpoint\n"; 3610 warn "emergency_perl_save: end database checkpoint\n";
3611
3612 warn "emergency_perl_save: begin write uuid\n";
3613 write_uuid_sync 1;
3614 warn "emergency_perl_save: end write uuid\n";
3439 }; 3615 };
3440 3616
3617 warn "emergency_perl_save: starting sync()\n";
3618 IO::AIO::aio_sync sub {
3619 warn "emergency_perl_save: finished sync()\n";
3620 };
3621
3441 warn "leave emergency perl save\n"; 3622 warn "emergency_perl_save: leave\n";
3442} 3623}
3443 3624
3444sub post_cleanup { 3625sub post_cleanup {
3445 my ($make_core) = @_; 3626 my ($make_core) = @_;
3446 3627
3447 warn Carp::longmess "post_cleanup backtrace" 3628 warn Carp::longmess "post_cleanup backtrace"
3448 if $make_core; 3629 if $make_core;
3630
3631 my $fh = pidfile;
3632 unlink $PIDFILE if <$fh> == $$;
3633}
3634
3635# a safer delete_package, copied from Symbol
3636sub clear_package($) {
3637 my $pkg = shift;
3638
3639 # expand to full symbol table name if needed
3640 unless ($pkg =~ /^main::.*::$/) {
3641 $pkg = "main$pkg" if $pkg =~ /^::/;
3642 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3643 $pkg .= '::' unless $pkg =~ /::$/;
3644 }
3645
3646 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3647 my $stem_symtab = *{$stem}{HASH};
3648
3649 defined $stem_symtab and exists $stem_symtab->{$leaf}
3650 or return;
3651
3652 # clear all symbols
3653 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3654 for my $name (keys %$leaf_symtab) {
3655 _gv_clear *{"$pkg$name"};
3656# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3657 }
3658 warn "cleared package $pkg\n";#d#
3449} 3659}
3450 3660
3451sub do_reload_perl() { 3661sub do_reload_perl() {
3452 # can/must only be called in main 3662 # can/must only be called in main
3453 if ($Coro::current != $Coro::main) { 3663 if ($Coro::current != $Coro::main) {
3454 warn "can only reload from main coroutine"; 3664 warn "can only reload from main coroutine";
3455 return; 3665 return;
3456 } 3666 }
3457 3667
3668 return if $RELOAD++;
3669
3670 my $t1 = EV::time;
3671
3672 while ($RELOAD) {
3458 warn "reloading..."; 3673 warn "reloading...";
3459 3674
3460 warn "entering sync_job"; 3675 warn "entering sync_job";
3461 3676
3462 cf::sync_job { 3677 cf::sync_job {
3463 cf::write_runtime; # external watchdog should not bark 3678 cf::write_runtime_sync; # external watchdog should not bark
3464 cf::emergency_save; 3679 cf::emergency_save;
3465 cf::write_runtime; # external watchdog should not bark 3680 cf::write_runtime_sync; # external watchdog should not bark
3466 3681
3467 warn "syncing database to disk"; 3682 warn "syncing database to disk";
3468 BDB::db_env_txn_checkpoint $DB_ENV; 3683 BDB::db_env_txn_checkpoint $DB_ENV;
3469 3684
3470 # if anything goes wrong in here, we should simply crash as we already saved 3685 # if anything goes wrong in here, we should simply crash as we already saved
3471 3686
3472 warn "flushing outstanding aio requests"; 3687 warn "flushing outstanding aio requests";
3473 for (;;) {
3474 BDB::flush;
3475 IO::AIO::flush;
3476 Coro::cede_notself;
3477 last unless IO::AIO::nreqs || BDB::nreqs; 3688 while (IO::AIO::nreqs || BDB::nreqs) {
3478 warn "iterate..."; 3689 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3479 }
3480
3481 ++$RELOAD;
3482
3483 warn "cancelling all extension coros";
3484 $_->cancel for values %EXT_CORO;
3485 %EXT_CORO = ();
3486
3487 warn "removing commands";
3488 %COMMAND = ();
3489
3490 warn "removing ext/exti commands";
3491 %EXTCMD = ();
3492 %EXTICMD = ();
3493
3494 warn "unloading/nuking all extensions";
3495 for my $pkg (@EXTS) {
3496 warn "... unloading $pkg";
3497
3498 if (my $cb = $pkg->can ("unload")) {
3499 eval {
3500 $cb->($pkg);
3501 1
3502 } or warn "$pkg unloaded, but with errors: $@";
3503 } 3690 }
3504 3691
3505 warn "... nuking $pkg"; 3692 warn "cancelling all extension coros";
3506 Symbol::delete_package $pkg; 3693 $_->cancel for values %EXT_CORO;
3507 } 3694 %EXT_CORO = ();
3508 3695
3509 warn "unloading all perl modules loaded from $LIBDIR"; 3696 warn "removing commands";
3510 while (my ($k, $v) = each %INC) { 3697 %COMMAND = ();
3511 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3512 3698
3699 warn "removing ext/exti commands";
3700 %EXTCMD = ();
3701 %EXTICMD = ();
3702
3703 warn "unloading/nuking all extensions";
3704 for my $pkg (@EXTS) {
3513 warn "... unloading $k"; 3705 warn "... unloading $pkg";
3514 delete $INC{$k};
3515 3706
3516 $k =~ s/\.pm$//;
3517 $k =~ s/\//::/g;
3518
3519 if (my $cb = $k->can ("unload_module")) { 3707 if (my $cb = $pkg->can ("unload")) {
3708 eval {
3520 $cb->(); 3709 $cb->($pkg);
3710 1
3711 } or warn "$pkg unloaded, but with errors: $@";
3712 }
3713
3714 warn "... clearing $pkg";
3715 clear_package $pkg;
3521 } 3716 }
3522 3717
3523 Symbol::delete_package $k; 3718 warn "unloading all perl modules loaded from $LIBDIR";
3719 while (my ($k, $v) = each %INC) {
3720 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3721
3722 warn "... unloading $k";
3723 delete $INC{$k};
3724
3725 $k =~ s/\.pm$//;
3726 $k =~ s/\//::/g;
3727
3728 if (my $cb = $k->can ("unload_module")) {
3729 $cb->();
3730 }
3731
3732 clear_package $k;
3524 } 3733 }
3525 3734
3526 warn "getting rid of safe::, as good as possible"; 3735 warn "getting rid of safe::, as good as possible";
3527 Symbol::delete_package "safe::$_" 3736 clear_package "safe::$_"
3528 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3529 3738
3530 warn "unloading cf.pm \"a bit\""; 3739 warn "unloading cf.pm \"a bit\"";
3531 delete $INC{"cf.pm"}; 3740 delete $INC{"cf.pm"};
3532 delete $INC{"cf/pod.pm"}; 3741 delete $INC{"cf/pod.pm"};
3533 3742
3534 # don't, removes xs symbols, too, 3743 # don't, removes xs symbols, too,
3535 # and global variables created in xs 3744 # and global variables created in xs
3536 #Symbol::delete_package __PACKAGE__; 3745 #clear_package __PACKAGE__;
3537 3746
3538 warn "unload completed, starting to reload now"; 3747 warn "unload completed, starting to reload now";
3539 3748
3540 warn "reloading cf.pm"; 3749 warn "reloading cf.pm";
3541 require cf; 3750 require cf;
3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3543 3752
3544 warn "loading config and database again"; 3753 warn "loading config and database again";
3545 cf::reload_config; 3754 cf::reload_config;
3546 3755
3547 warn "loading extensions"; 3756 warn "loading extensions";
3548 cf::load_extensions; 3757 cf::load_extensions;
3549 3758
3759 if ($REATTACH_ON_RELOAD) {
3550 warn "reattaching attachments to objects/players"; 3760 warn "reattaching attachments to objects/players";
3551 _global_reattach; # objects, sockets 3761 _global_reattach; # objects, sockets
3552 warn "reattaching attachments to maps"; 3762 warn "reattaching attachments to maps";
3553 reattach $_ for values %MAP; 3763 reattach $_ for values %MAP;
3554 warn "reattaching attachments to players"; 3764 warn "reattaching attachments to players";
3555 reattach $_ for values %PLAYER; 3765 reattach $_ for values %PLAYER;
3766 }
3556 3767
3768 warn "running post_init jobs";
3769 (pop @POST_INIT)->(1) while @POST_INIT;
3770
3557 warn "leaving sync_job"; 3771 warn "leaving sync_job";
3558 3772
3559 1 3773 1
3560 } or do { 3774 } or do {
3561 warn $@; 3775 warn $@;
3562 cf::cleanup "error while reloading, exiting."; 3776 cf::cleanup "error while reloading, exiting.";
3563 }; 3777 };
3564 3778
3565 warn "reloaded"; 3779 warn "reloaded";
3780 --$RELOAD;
3781 }
3782
3783 $t1 = EV::time - $t1;
3784 warn "reload completed in ${t1}s\n";
3566}; 3785};
3567 3786
3568our $RELOAD_WATCHER; # used only during reload 3787our $RELOAD_WATCHER; # used only during reload
3569 3788
3570sub reload_perl() { 3789sub reload_perl() {
3571 # doing reload synchronously and two reloads happen back-to-back, 3790 # doing reload synchronously and two reloads happen back-to-back,
3572 # coro crashes during coro_state_free->destroy here. 3791 # coro crashes during coro_state_free->destroy here.
3573 3792
3793 $RELOAD_WATCHER ||= cf::async {
3794 Coro::AIO::aio_wait cache_extensions;
3795
3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3575 do_reload_perl; 3797 do_reload_perl;
3576 undef $RELOAD_WATCHER; 3798 undef $RELOAD_WATCHER;
3799 };
3577 }; 3800 };
3578} 3801}
3579 3802
3580register_command "reload" => sub { 3803register_command "reload" => sub {
3581 my ($who, $arg) = @_; 3804 my ($who, $arg) = @_;
3595 3818
3596our @WAIT_FOR_TICK; 3819our @WAIT_FOR_TICK;
3597our @WAIT_FOR_TICK_BEGIN; 3820our @WAIT_FOR_TICK_BEGIN;
3598 3821
3599sub wait_for_tick { 3822sub wait_for_tick {
3600 return unless $TICK_WATCHER->is_active;
3601 return if $Coro::current == $Coro::main; 3823 return if tick_inhibit || $Coro::current == $Coro::main;
3602 3824
3603 my $signal = new Coro::Signal; 3825 my $signal = new Coro::Signal;
3604 push @WAIT_FOR_TICK, $signal; 3826 push @WAIT_FOR_TICK, $signal;
3605 $signal->wait; 3827 $signal->wait;
3606} 3828}
3607 3829
3608sub wait_for_tick_begin { 3830sub wait_for_tick_begin {
3609 return unless $TICK_WATCHER->is_active;
3610 return if $Coro::current == $Coro::main; 3831 return if tick_inhibit || $Coro::current == $Coro::main;
3611 3832
3612 my $signal = new Coro::Signal; 3833 my $signal = new Coro::Signal;
3613 push @WAIT_FOR_TICK_BEGIN, $signal; 3834 push @WAIT_FOR_TICK_BEGIN, $signal;
3614 $signal->wait; 3835 $signal->wait;
3615} 3836}
3616 3837
3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3838sub tick {
3618 if ($Coro::current != $Coro::main) { 3839 if ($Coro::current != $Coro::main) {
3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3840 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3620 unless ++$bug_warning > 10; 3841 unless ++$bug_warning > 10;
3621 return; 3842 return;
3622 } 3843 }
3623 3844
3624 $NOW = $tick_start = EV::now;
3625
3626 cf::server_tick; # one server iteration 3845 cf::server_tick; # one server iteration
3627
3628 $RUNTIME += $TICK;
3629 $NEXT_TICK = $_[0]->at;
3630 3846
3631 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3847 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3848 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3633 Coro::async_pool { 3849 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver"; 3850 $Coro::current->{desc} = "runtime saver";
3635 write_runtime 3851 write_runtime_sync
3636 or warn "ERROR: unable to write runtime file: $!"; 3852 or warn "ERROR: unable to write runtime file: $!";
3637 }; 3853 };
3638 } 3854 }
3639 3855
3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3642 } 3858 }
3643 while (my $sig = shift @WAIT_FOR_TICK) { 3859 while (my $sig = shift @WAIT_FOR_TICK) {
3644 $sig->send; 3860 $sig->send;
3645 } 3861 }
3646 3862
3647 $LOAD = ($NOW - $tick_start) / $TICK; 3863 $LOAD = ($NOW - $TICK_START) / $TICK;
3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3864 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3649 3865
3650 _post_tick; 3866 if (0) {
3651}; 3867 if ($NEXT_TICK) {
3652$TICK_WATCHER->priority (EV::MAXPRI); 3868 my $jitter = $TICK_START - $NEXT_TICK;
3869 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3870 warn "jitter $JITTER\n";#d#
3871 }
3872 }
3873}
3653 3874
3654{ 3875{
3655 # configure BDB 3876 # configure BDB
3656 3877
3657 BDB::min_parallel 8; 3878 BDB::min_parallel 8;
3658 BDB::max_poll_reqs $TICK * 0.1; 3879 BDB::max_poll_reqs $TICK * 0.1;
3659 $Coro::BDB::WATCHER->priority (1); 3880 $AnyEvent::BDB::WATCHER->priority (1);
3660 3881
3661 unless ($DB_ENV) { 3882 unless ($DB_ENV) {
3662 $DB_ENV = BDB::db_env_create; 3883 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3884 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3664 | BDB::LOG_AUTOREMOVE, 1); 3885 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3886 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3887 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3888 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3667 3889
3668 cf::sync_job { 3890 cf::sync_job {
3669 eval { 3891 eval {
3695{ 3917{
3696 # configure IO::AIO 3918 # configure IO::AIO
3697 3919
3698 IO::AIO::min_parallel 8; 3920 IO::AIO::min_parallel 8;
3699 IO::AIO::max_poll_time $TICK * 0.1; 3921 IO::AIO::max_poll_time $TICK * 0.1;
3700 $Coro::AIO::WATCHER->priority (1); 3922 undef $AnyEvent::AIO::WATCHER;
3701} 3923}
3702 3924
3703my $_log_backtrace; 3925my $_log_backtrace;
3704 3926
3705sub _log_backtrace { 3927sub _log_backtrace {
3708 $msg =~ s/\n//; 3930 $msg =~ s/\n//;
3709 3931
3710 # limit the # of concurrent backtraces 3932 # limit the # of concurrent backtraces
3711 if ($_log_backtrace < 2) { 3933 if ($_log_backtrace < 2) {
3712 ++$_log_backtrace; 3934 ++$_log_backtrace;
3935 my $perl_bt = Carp::longmess $msg;
3713 async { 3936 async {
3714 $Coro::current->{desc} = "abt $msg"; 3937 $Coro::current->{desc} = "abt $msg";
3715 3938
3716 my @bt = fork_call { 3939 my @bt = fork_call {
3717 @addr = map { sprintf "%x", $_ } @addr; 3940 @addr = map { sprintf "%x", $_ } @addr;
3728 } 3951 }
3729 3952
3730 @funcs 3953 @funcs
3731 }; 3954 };
3732 3955
3733 LOG llevInfo, "[ABT] $msg\n"; 3956 LOG llevInfo, "[ABT] $perl_bt\n";
3957 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3734 LOG llevInfo, "[ABT] $_\n" for @bt; 3958 LOG llevInfo, "[ABT] $_\n" for @bt;
3735 --$_log_backtrace; 3959 --$_log_backtrace;
3736 }; 3960 };
3737 } else { 3961 } else {
3738 LOG llevInfo, "[ABT] $msg\n"; 3962 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines