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.410 by root, Tue Jan 15 12:02:24 2008 UTC vs.
Revision 1.456 by root, Tue Sep 30 04:00:35 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;
102 134
103binmode STDOUT; 135binmode STDOUT;
104binmode STDERR; 136binmode STDERR;
105 137
106# read virtual server time, if available 138# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
111} 143}
112 144
113mkdir $_ 145mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
221for my $pkg (qw( 253for my $pkg (qw(
222 cf::global cf::attachable 254 cf::global cf::attachable
223 cf::object cf::object::player 255 cf::object cf::object::player
224 cf::client cf::player 256 cf::client cf::player
225 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
226 cf::map cf::party cf::region 259 cf::party cf::region
227)) { 260)) {
228 no strict 'refs';
229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
230} 262}
231 263
232$EV::DIED = sub { 264$EV::DIED = sub {
233 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
276 308
277sub encode_json($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
278sub decode_json($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
279 311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
325
280=item cf::lock_wait $string 326=item cf::lock_wait $string
281 327
282Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
283 329
284=item my $lock = cf::lock_acquire $string 330=item my $lock = cf::lock_acquire $string
311 return;#d# 357 return;#d#
312 }#d# 358 }#d#
313 359
314 # wait for lock, if any 360 # wait for lock, if any
315 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
316 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
317 Coro::schedule; 364 Coro::schedule;
318 } 365 }
319} 366}
320 367
339 386
340 ! ! $LOCK{$key} 387 ! ! $LOCK{$key}
341} 388}
342 389
343sub freeze_mainloop { 390sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 391 tick_inhibit_inc;
345 392
346 my $guard = Coro::guard { 393 Coro::guard \&tick_inhibit_dec;
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 394}
352 395
353=item cf::periodic $interval, $cb 396=item cf::periodic $interval, $cb
354 397
355Like EV::periodic, but randomly selects a starting point so that the actions 398Like EV::periodic, but randomly selects a starting point so that the actions
410 } 453 }
411 } 454 }
412}; 455};
413 456
414sub get_slot($;$$) { 457sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main;
459
415 my ($time, $pri, $name) = @_; 460 my ($time, $pri, $name) = @_;
416 461
417 $time = $TICK * .6 if $time > $TICK * .6; 462 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal; 463 my $sig = new Coro::Signal;
419 464
456 # this is the main coro, too bad, we have to block 501 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 502 # till the operation succeeds, freezing the server :/
458 503
459 LOG llevError, Carp::longmess "sync job";#d# 504 LOG llevError, Carp::longmess "sync job";#d#
460 505
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 506 my $freeze_guard = freeze_mainloop;
464 507
465 my $busy = 1; 508 my $busy = 1;
466 my @res; 509 my @res;
467 510
478 } else { 521 } else {
479 EV::loop EV::LOOP_ONESHOT; 522 EV::loop EV::LOOP_ONESHOT;
480 } 523 }
481 } 524 }
482 525
483 $time = EV::time - $time; 526 my $time = EV::time - $time;
484 527
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 528 $TICK_START += $time; # do not account sync jobs to server load
489 529
490 wantarray ? @res : $res[0] 530 wantarray ? @res : $res[0]
491 } else { 531 } else {
492 # we are in another coroutine, how wonderful, everything just works 532 # we are in another coroutine, how wonderful, everything just works
493 533
535 reset_signals; 575 reset_signals;
536 &$cb 576 &$cb
537 }, @args; 577 }, @args;
538 578
539 wantarray ? @res : $res[-1] 579 wantarray ? @res : $res[-1]
580}
581
582=item $coin = coin_from_name $name
583
584=cut
585
586our %coin_alias = (
587 "silver" => "silvercoin",
588 "silvercoin" => "silvercoin",
589 "silvercoins" => "silvercoin",
590 "gold" => "goldcoin",
591 "goldcoin" => "goldcoin",
592 "goldcoins" => "goldcoin",
593 "platinum" => "platinacoin",
594 "platinumcoin" => "platinacoin",
595 "platinumcoins" => "platinacoin",
596 "platina" => "platinacoin",
597 "platinacoin" => "platinacoin",
598 "platinacoins" => "platinacoin",
599 "royalty" => "royalty",
600 "royalties" => "royalty",
601);
602
603sub coin_from_name($) {
604 $coin_alias{$_[0]}
605 ? cf::arch::find $coin_alias{$_[0]}
606 : undef
540} 607}
541 608
542=item $value = cf::db_get $family => $key 609=item $value = cf::db_get $family => $key
543 610
544Returns a single value from the environment database. 611Returns a single value from the environment database.
683 750
684############################################################################# 751#############################################################################
685 752
686=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
687 754
688Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
689attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
690to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
691 758
692In the following description, CLASS can be any of C<global>, C<object> 759In 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 760C<player>, C<client> or C<map> (i.e. the attachable objects in
743=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
744 811
745Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
746given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
747 814
748Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
749that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
750 817
751These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
752 819
753=over 4 820=over 4
1044 1111
1045sub reattach { 1112sub reattach {
1046 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
1047 my ($obj) = @_; 1114 my ($obj) = @_;
1048 1115
1116 # no longer needed after getting rid of delete_package?
1049 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1117 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1050 1118
1051 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
1052 1120
1053 @$registry = (); 1121 @$registry = ();
1054 1122
1100 utf8::decode (my $decname = $filename); 1168 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
1103 1171
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
1108 close $fh; 1176 aio_close $fh;
1109 1177
1110 if (@$objs) { 1178 if (@$objs) {
1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1112 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
1115 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
1116 close $fh; 1184 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1186 }
1119 } else { 1187 } else {
1120 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1121 } 1189 }
1122 1190
1123 aio_rename "$filename~", $filename; 1191 aio_rename "$filename~", $filename;
1192
1193 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename;
1124 } else { 1195 } else {
1125 warn "FATAL: $filename~: $!\n"; 1196 warn "FATAL: $filename~: $!\n";
1126 } 1197 }
1127 } else { 1198 } else {
1128 aio_unlink $filename; 1199 aio_unlink $filename;
1290 1361
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1364
1294 $ext{source} = 1365 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1296 . "#line 1 \"$path\"\n{\n" 1367 . "#line 1 \"$path\"\n{\n"
1297 . $source 1368 . $source
1298 . "\n};\n1"; 1369 . "\n};\n1";
1299 1370
1300 $todo{$base} = \%ext; 1371 $todo{$base} = \%ext;
1316 my $msg = $@ ? "$v->{path}: $@\n" 1387 my $msg = $@ ? "$v->{path}: $@\n"
1317 : "$v->{base}: extension inactive.\n"; 1388 : "$v->{base}: extension inactive.\n";
1318 1389
1319 if (exists $v->{meta}{mandatory}) { 1390 if (exists $v->{meta}{mandatory}) {
1320 warn $msg; 1391 warn $msg;
1321 warn "mandatory extension failed to load, exiting.\n"; 1392 cf::cleanup "mandatory extension failed to load, exiting.";
1322 exit 1;
1323 } 1393 }
1324 1394
1325 warn $msg; 1395 warn $msg;
1326 } 1396 }
1327 1397
1341 1411
1342=back 1412=back
1343 1413
1344=head2 CORE EXTENSIONS 1414=head2 CORE EXTENSIONS
1345 1415
1346Functions and methods that extend core crossfire objects. 1416Functions and methods that extend core deliantra objects.
1347 1417
1348=cut 1418=cut
1349 1419
1350package cf::player; 1420package cf::player;
1351 1421
1394 1464
1395sub exists($) { 1465sub exists($) {
1396 my ($login) = @_; 1466 my ($login) = @_;
1397 1467
1398 $cf::PLAYER{$login} 1468 $cf::PLAYER{$login}
1399 or cf::sync_job { !aio_stat path $login } 1469 or !aio_stat path $login
1400} 1470}
1401 1471
1402sub find($) { 1472sub find($) {
1403 return $cf::PLAYER{$_[0]} || do { 1473 return $cf::PLAYER{$_[0]} || do {
1404 my $login = $_[0]; 1474 my $login = $_[0];
1416 my $f = new_from_file cf::object::thawer path $login 1486 my $f = new_from_file cf::object::thawer path $login
1417 or return; 1487 or return;
1418 1488
1419 my $pl = cf::player::load_pl $f 1489 my $pl = cf::player::load_pl $f
1420 or return; 1490 or return;
1491
1421 local $cf::PLAYER_LOADING{$login} = $pl; 1492 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs; 1493 $f->resolve_delayed_derefs;
1423 $cf::PLAYER{$login} = $pl 1494 $cf::PLAYER{$login} = $pl
1424 } 1495 }
1425 } 1496 }
1435 1506
1436 return if $pl->{deny_save}; 1507 return if $pl->{deny_save};
1437 1508
1438 aio_mkdir playerdir $pl, 0770; 1509 aio_mkdir playerdir $pl, 0770;
1439 $pl->{last_save} = $cf::RUNTIME; 1510 $pl->{last_save} = $cf::RUNTIME;
1511
1512 cf::get_slot 0.01;
1440 1513
1441 $pl->save_pl ($path); 1514 $pl->save_pl ($path);
1442 cf::cede_to_tick; 1515 cf::cede_to_tick;
1443} 1516}
1444 1517
1476 my ($pl) = @_; 1549 my ($pl) = @_;
1477 1550
1478 my $name = $pl->ob->name; 1551 my $name = $pl->ob->name;
1479 1552
1480 $pl->{deny_save} = 1; 1553 $pl->{deny_save} = 1;
1481 $pl->password ("*"); # this should lock out the player until we nuked the dir 1554 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1482 1555
1483 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1484 $pl->deactivate; 1557 $pl->deactivate;
1558 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1559 $pl->ob->check_score;
1485 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1560 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1486 $pl->ns->destroy if $pl->ns; 1561 $pl->ns->destroy if $pl->ns;
1487 1562
1488 my $path = playerdir $pl; 1563 my $path = playerdir $pl;
1489 my $temp = "$path~$cf::RUNTIME~deleting~"; 1564 my $temp = "$path~$cf::RUNTIME~deleting~";
1528 1603
1529 for my $login (@$dirs) { 1604 for my $login (@$dirs) {
1530 my $path = path $login; 1605 my $path = path $login;
1531 1606
1532 # a .pst is a dead give-away for a valid player 1607 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") { 1608 # if no pst file found, open and chekc for blocked users
1609 if (aio_stat "$path.pst") {
1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1610 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1535 aio_read $fh, 0, 512, my $buf, 0 or next; 1611 aio_read $fh, 0, 512, my $buf, 0 or next;
1536 $buf !~ /^password -------------$/m or next; # official not-valid tag 1612 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 } 1613 }
1538 1614
1569 } 1645 }
1570 1646
1571 \@paths 1647 \@paths
1572} 1648}
1573 1649
1574=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1650=item $protocol_xml = $player->expand_cfpod ($cfpod)
1575 1651
1576Expand crossfire pod fragments into protocol xml. 1652Expand deliantra pod fragments into protocol xml.
1577
1578=cut
1579
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1591sub expand_cfpod {
1592 my ($self, $pod) = @_;
1593
1594 my $xml;
1595
1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1599
1600 $group =~ s/&/&amp;/g;
1601 $group =~ s/</&lt;/g;
1602
1603 $xml .= $group;
1604 } elsif ($pod =~ m%\G
1605 ([BCGHITU])
1606 <
1607 (?:
1608 ([^<>]*) (?{ $group = $^N })
1609 | < $interior >
1610 )
1611 >
1612 %gcsx
1613 ) {
1614 my ($code, $data) = ($1, $group);
1615
1616 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1624 } elsif ($code eq "T") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1626 } elsif ($code eq "G") {
1627 my ($male, $female) = split /\|/, $data;
1628 $data = $self->gender ? $female : $male;
1629 $xml .= expand_cfpod ($self, $data);
1630 } elsif ($code eq "H") {
1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1633 "")
1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1643 }
1644 }
1645
1646 for ($xml) {
1647 # create single paragraphs (very hackish)
1648 s/(?<=\S)\n(?=\w)/ /g;
1649
1650 # compress some whitespace
1651 s/\s+\n/\n/g; # ws line-ends
1652 s/\n\n+/\n/g; # double lines
1653 s/^\n+//; # beginning lines
1654 s/\n+$//; # ending lines
1655 }
1656
1657 $xml
1658}
1659
1660no re 'eval';
1661
1662sub hintmode {
1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1664 $_[0]{hintmode}
1665}
1666 1653
1667=item $player->ext_reply ($msgid, @msg) 1654=item $player->ext_reply ($msgid, @msg)
1668 1655
1669Sends an ext reply to the player. 1656Sends an ext reply to the player.
1670 1657
1737our $MAX_RESET = 3600; 1724our $MAX_RESET = 3600;
1738our $DEFAULT_RESET = 3000; 1725our $DEFAULT_RESET = 3000;
1739 1726
1740sub generate_random_map { 1727sub generate_random_map {
1741 my ($self, $rmp) = @_; 1728 my ($self, $rmp) = @_;
1729
1730 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1731
1742 # mit "rum" bekleckern, nicht 1732 # mit "rum" bekleckern, nicht
1743 $self->_create_random_map ( 1733 $self->_create_random_map (
1744 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1745 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1746 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1868 1858
1869# the temporary/swap location 1859# the temporary/swap location
1870sub save_path { 1860sub save_path {
1871 my ($self) = @_; 1861 my ($self) = @_;
1872 1862
1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1874 "$TMPDIR/$path.map" 1864 "$TMPDIR/$path.map"
1875} 1865}
1876 1866
1877# the unique path, undef == no special unique path 1867# the unique path, undef == no special unique path
1878sub uniq_path { 1868sub uniq_path {
1879 my ($self) = @_; 1869 my ($self) = @_;
1880 1870
1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1882 "$UNIQUEDIR/$path" 1872 "$UNIQUEDIR/$path"
1883} 1873}
1884 1874
1885# and all this just because we cannot iterate over 1875# and all this just because we cannot iterate over
1886# all maps in C++... 1876# all maps in C++...
1984 1974
1985 cf::lock_wait "map_data:$path";#d#remove 1975 cf::lock_wait "map_data:$path";#d#remove
1986 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1987 1977
1988 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1991 1981
1992 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1993 or return; 1983 or return;
1994 1984
1995 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1998 or return; 1988 or return;
1999 1989
2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2001 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
2002 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard2;
2003 undef $guard1; 1994 undef $guard1;
2004 undef $guard2;
2005 $map->reset; 1995 $map->reset;
2006 return find $path; 1996 return find $path;
2007 } 1997 }
2008 1998
2009 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2027 $f->skip_block;
2038 $self->_load_objects ($f) 2028 $self->_load_objects ($f)
2039 or return; 2029 or return;
2040 2030
2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->post_load_original
2042 if delete $self->{load_original}; 2032 if delete $self->{load_original};
2043 2033
2044 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2035 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2036 unless (aio_stat $uniq) {
2072 } 2062 }
2073 2063
2074 $self->{last_save} = $cf::RUNTIME; 2064 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2065 $self->last_access ($cf::RUNTIME);
2076 2066
2077 $self->in_memory (cf::MAP_IN_MEMORY); 2067 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2068 }
2079 2069
2080 $self->post_load; 2070 $self->post_load;
2081} 2071}
2082 2072
2140 my ($path, $origin, $load) = @_; 2130 my ($path, $origin, $load) = @_;
2141 2131
2142 $path = normalise $path, $origin && $origin->{path}; 2132 $path = normalise $path, $origin && $origin->{path};
2143 2133
2144 if (my $map = $cf::MAP{$path}) { 2134 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2135 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2146 } 2136 }
2147 2137
2148 $MAP_PREFETCH{$path} |= $load; 2138 $MAP_PREFETCH{$path} |= $load;
2149 2139
2150 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2187 cf::async { 2177 cf::async {
2188 $Coro::current->{desc} = "map player save"; 2178 $Coro::current->{desc} = "map player save";
2189 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
2190 }; 2180 };
2191 2181
2182 cf::get_slot 0.02;
2183
2192 if ($uniq) { 2184 if ($uniq) {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2194 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2186 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2195 } else { 2187 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2188 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2204 $self->save; 2196 $self->save;
2205 2197
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2198 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2199
2208 return if $self->players; 2200 return if $self->players;
2209 return if $self->in_memory != cf::MAP_IN_MEMORY; 2201 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2202 return if $self->{deny_save};
2211 2203
2212 $self->in_memory (cf::MAP_SWAPPED); 2204 $self->in_memory (cf::MAP_SWAPPED);
2213 2205
2214 $self->deactivate; 2206 $self->deactivate;
2332 2324
2333sub unique_maps() { 2325sub unique_maps() {
2334 [ 2326 [
2335 map { 2327 map {
2336 utf8::decode $_; 2328 utf8::decode $_;
2337 /\.map$/ 2329 s/\.map$//; # TODO future compatibility hack
2330 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2331 ? ()
2338 ? normalise $_ 2332 : normalise $_
2339 : ()
2340 } @{ aio_readdir $UNIQUEDIR or [] } 2333 } @{ aio_readdir $UNIQUEDIR or [] }
2341 ] 2334 ]
2342} 2335}
2343 2336
2344package cf;
2345
2346=back 2337=back
2347 2338
2348=head3 cf::object 2339=head3 cf::object
2349 2340
2350=cut 2341=cut
2353 2344
2354=over 4 2345=over 4
2355 2346
2356=item $ob->inv_recursive 2347=item $ob->inv_recursive
2357 2348
2358Returns the inventory of the object _and_ their inventories, recursively. 2349Returns the inventory of the object I<and> their inventories, recursively,
2350but I<not> the object itself.
2359 2351
2360=cut 2352=cut
2361 2353
2362sub inv_recursive_; 2354sub inv_recursive_;
2363sub inv_recursive_ { 2355sub inv_recursive_ {
2368 inv_recursive_ inv $_[0] 2360 inv_recursive_ inv $_[0]
2369} 2361}
2370 2362
2371=item $ref = $ob->ref 2363=item $ref = $ob->ref
2372 2364
2373creates and returns a persistent reference to an objetc that can be stored as a string. 2365Creates and returns a persistent reference to an object that can be stored as a string.
2374 2366
2375=item $ob = cf::object::deref ($refstring) 2367=item $ob = cf::object::deref ($refstring)
2376 2368
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2369returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block. 2370even if the object actually exists. May block.
2410can be C<undef>. Does the right thing when the player is currently in a 2402can be C<undef>. Does the right thing when the player is currently in a
2411dialogue with the given NPC character. 2403dialogue with the given NPC character.
2412 2404
2413=cut 2405=cut
2414 2406
2407our $SAY_CHANNEL = {
2408 id => "say",
2409 title => "Map",
2410 reply => "say ",
2411 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2412};
2413
2414our $CHAT_CHANNEL = {
2415 id => "chat",
2416 title => "Chat",
2417 reply => "chat ",
2418 tooltip => "Player chat and shouts, global to the server.",
2419};
2420
2415# rough implementation of a future "reply" method that works 2421# rough implementation of a future "reply" method that works
2416# with dialog boxes. 2422# with dialog boxes.
2417#TODO: the first argument must go, split into a $npc->reply_to ( method 2423#TODO: the first argument must go, split into a $npc->reply_to ( method
2418sub cf::object::player::reply($$$;$) { 2424sub cf::object::player::reply($$$;$) {
2419 my ($self, $npc, $msg, $flags) = @_; 2425 my ($self, $npc, $msg, $flags) = @_;
2430 my $dialog = $pl->{npc_dialog}; 2436 my $dialog = $pl->{npc_dialog};
2431 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2437 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2432 2438
2433 } else { 2439 } else {
2434 $msg = $npc->name . " says: $msg" if $npc; 2440 $msg = $npc->name . " says: $msg" if $npc;
2435 $self->message ($msg, $flags); 2441 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2436 } 2442 }
2437 } 2443 }
2438} 2444}
2439 2445
2440=item $object->send_msg ($channel, $msg, $color, [extra...]) 2446=item $object->send_msg ($channel, $msg, $color, [extra...])
2465 2471
2466=item $player_object->enter_link 2472=item $player_object->enter_link
2467 2473
2468Freezes the player and moves him/her to a special map (C<{link}>). 2474Freezes the player and moves him/her to a special map (C<{link}>).
2469 2475
2470The player should be reasonably safe there for short amounts of time. You 2476The player should be reasonably safe there for short amounts of time (e.g.
2471I<MUST> call C<leave_link> as soon as possible, though. 2477for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2478though, as the palyer cannot control the character while it is on the link
2479map.
2472 2480
2473Will never block. 2481Will never block.
2474 2482
2475=item $player_object->leave_link ($map, $x, $y) 2483=item $player_object->leave_link ($map, $x, $y)
2476 2484
2534 2542
2535 $map->load; 2543 $map->load;
2536 $map->load_neighbours; 2544 $map->load_neighbours;
2537 2545
2538 return unless $self->contr->active; 2546 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2539 $self->activate_recursive; 2548 $self->activate_recursive;
2540 2549
2541 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2542 $self->enter_map ($map, $x, $y); 2551 $self->enter_map ($map, $x, $y);
2543} 2552}
2547Moves the player to the given map-path and coordinates by first freezing 2556Moves the player to the given map-path and coordinates by first freezing
2548her, loading and preparing them map, calling the provided $check callback 2557her, loading and preparing them map, calling the provided $check callback
2549that has to return the map if sucecssful, and then unfreezes the player on 2558that has to return the map if sucecssful, and then unfreezes the player on
2550the new (success) or old (failed) map position. In either case, $done will 2559the new (success) or old (failed) map position. In either case, $done will
2551be called at the end of this process. 2560be called at the end of this process.
2561
2562Note that $check will be called with a potentially non-loaded map, so if
2563it needs a loaded map it has to call C<< ->load >>.
2552 2564
2553=cut 2565=cut
2554 2566
2555our $GOTOGEN; 2567our $GOTOGEN;
2556 2568
2635} 2647}
2636 2648
2637sub prepare_random_map { 2649sub prepare_random_map {
2638 my ($exit) = @_; 2650 my ($exit) = @_;
2639 2651
2640 my $guard = cf::lock_acquire "exit_prepare:$exit";
2641
2642 # all this does is basically replace the /! path by 2652 # all this does is basically replace the /! path by
2643 # a new random map path (?random/...) with a seed 2653 # a new random map path (?random/...) with a seed
2644 # that depends on the exit object 2654 # that depends on the exit object
2645 2655
2646 my $rmp = parse_random_map_params $exit->msg; 2656 my $rmp = parse_random_map_params $exit->msg;
2648 if ($exit->map) { 2658 if ($exit->map) {
2649 $rmp->{region} = $exit->region->name; 2659 $rmp->{region} = $exit->region->name;
2650 $rmp->{origin_map} = $exit->map->path; 2660 $rmp->{origin_map} = $exit->map->path;
2651 $rmp->{origin_x} = $exit->x; 2661 $rmp->{origin_x} = $exit->x;
2652 $rmp->{origin_y} = $exit->y; 2662 $rmp->{origin_y} = $exit->y;
2663
2664 $exit->map->touch;
2653 } 2665 }
2654 2666
2655 $rmp->{random_seed} ||= $exit->random_seed; 2667 $rmp->{random_seed} ||= $exit->random_seed;
2656 2668
2657 my $data = cf::encode_json $rmp; 2669 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2658 my $md5 = Digest::MD5::md5_hex $data; 2670 my $md5 = Digest::MD5::md5_hex $data;
2659 my $meta = "$RANDOMDIR/$md5.meta"; 2671 my $meta = "$RANDOMDIR/$md5.meta";
2660 2672
2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2673 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2662 aio_write $fh, 0, (length $data), $data, 0; 2674 aio_write $fh, 0, (length $data), $data, 0;
2663 undef $fh; 2675 undef $fh;
2664 aio_rename "$meta~", $meta; 2676 aio_rename "$meta~", $meta;
2665 2677
2678 my $slaying = "?random/$md5";
2679
2680 if ($exit->valid) {
2666 $exit->slaying ("?random/$md5"); 2681 $exit->slaying ("?random/$md5");
2667 $exit->msg (undef); 2682 $exit->msg (undef);
2683 }
2668 } 2684 }
2669} 2685}
2670 2686
2671sub cf::object::player::enter_exit { 2687sub cf::object::player::enter_exit {
2672 my ($self, $exit) = @_; 2688 my ($self, $exit) = @_;
2673 2689
2674 return unless $self->type == cf::PLAYER; 2690 return unless $self->type == cf::PLAYER;
2675 2691
2676 if ($exit->slaying eq "/!") {
2677 #TODO: this should de-fi-ni-te-ly not be a sync-job
2678 # the problem is that $exit might not survive long enough
2679 # so it needs to be done right now, right here
2680 cf::sync_job { prepare_random_map $exit };
2681 }
2682
2683 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2684 my $hp = $exit->stats->hp;
2685 my $sp = $exit->stats->sp;
2686
2687 $self->enter_link; 2692 $self->enter_link;
2688 2693
2689 # if exit is damned, update players death & WoR home-position
2690 $self->contr->savebed ($slaying, $hp, $sp)
2691 if $exit->flag (FLAG_DAMNED);
2692
2693 (async { 2694 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2695 $Coro::current->{desc} = "enter_exit";
2695 2696
2696 $self->deactivate_recursive; # just to be sure
2697 unless (eval { 2697 unless (eval {
2698 $self->deactivate_recursive; # just to be sure
2699
2700 # random map handling
2701 {
2702 my $guard = cf::lock_acquire "exit_prepare:$exit";
2703
2704 prepare_random_map $exit
2705 if $exit->slaying eq "/!";
2706 }
2707
2708 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2709 my $x = $exit->stats->hp;
2710 my $y = $exit->stats->sp;
2711
2698 $self->goto ($slaying, $hp, $sp); 2712 $self->goto ($map, $x, $y);
2699 2713
2714 # if exit is damned, update players death & WoR home-position
2715 $self->contr->savebed ($map, $x, $y)
2716 if $exit->flag (cf::FLAG_DAMNED);
2717
2700 1; 2718 1
2701 }) { 2719 }) {
2702 $self->message ("Something went wrong deep within the crossfire server. " 2720 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 2721 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2722 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2723 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2724
2707 warn "ERROR in enter_exit: $@"; 2725 warn "ERROR in enter_exit: $@";
2773 id => "infobox", 2791 id => "infobox",
2774 title => "Body Parts", 2792 title => "Body Parts",
2775 reply => undef, 2793 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available", 2794 tooltip => "Shows which body parts you posess and are available",
2777 }, 2795 },
2796 "c/skills" => {
2797 id => "infobox",
2798 title => "Skills",
2799 reply => undef,
2800 tooltip => "Shows your experience per skill and item power",
2801 },
2778 "c/uptime" => { 2802 "c/uptime" => {
2779 id => "infobox", 2803 id => "infobox",
2780 title => "Uptime", 2804 title => "Uptime",
2781 reply => undef, 2805 reply => undef,
2782 tooltip => "How long the server has been running since last restart", 2806 tooltip => "How long the server has been running since last restart",
2785 id => "infobox", 2809 id => "infobox",
2786 title => "Map Info", 2810 title => "Map Info",
2787 reply => undef, 2811 reply => undef,
2788 tooltip => "Information related to the maps", 2812 tooltip => "Information related to the maps",
2789 }, 2813 },
2814 "c/party" => {
2815 id => "party",
2816 title => "Party",
2817 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party",
2819 },
2790); 2820);
2791 2821
2792sub cf::client::send_msg { 2822sub cf::client::send_msg {
2793 my ($self, $channel, $msg, $color, @extra) = @_; 2823 my ($self, $channel, $msg, $color, @extra) = @_;
2794 2824
2795 $msg = $self->pl->expand_cfpod ($msg); 2825 $msg = $self->pl->expand_cfpod ($msg)
2826 unless $color & cf::NDI_VERBATIM;
2796 2827
2797 $color &= cf::NDI_CLIENT_MASK; # just in case... 2828 $color &= cf::NDI_CLIENT_MASK; # just in case...
2798 2829
2799 # check predefined channels, for the benefit of C 2830 # check predefined channels, for the benefit of C
2800 if ($CHANNEL{$channel}) { 2831 if ($CHANNEL{$channel}) {
2821 if ($self->can_msg) { 2852 if ($self->can_msg) {
2822 # default colour, mask it out 2853 # default colour, mask it out
2823 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2824 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2825 2856
2826 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2857 my $pkt = "msg "
2858 . $self->{json_coder}->encode (
2827 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 );
2861
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt);
2828 } else { 2873 } else {
2829 if ($color >= 0) { 2874 if ($color >= 0) {
2830 # replace some tags by gcfclient-compatible ones 2875 # replace some tags by gcfclient-compatible ones
2831 for ($msg) { 2876 for ($msg) {
2832 1 while 2877 1 while
3031 3076
3032The following functions and methods are available within a safe environment: 3077The following functions and methods are available within a safe environment:
3033 3078
3034 cf::object 3079 cf::object
3035 contr pay_amount pay_player map x y force_find force_add destroy 3080 contr pay_amount pay_player map x y force_find force_add destroy
3036 insert remove name archname title slaying race decrease_ob_nr 3081 insert remove name archname title slaying race decrease split
3037 3082
3038 cf::object::player 3083 cf::object::player
3039 player 3084 player
3040 3085
3041 cf::player 3086 cf::player
3046 3091
3047=cut 3092=cut
3048 3093
3049for ( 3094for (
3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3051 insert remove inv name archname title slaying race 3096 insert remove inv nrof name archname title slaying race
3052 decrease_ob_nr destroy)], 3097 decrease split destroy change_exp)],
3053 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
3054 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful)],
3055 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
3056) { 3101) {
3057 no strict 'refs'; 3102 no strict 'refs';
3265 while (my ($k, $v) = each %$want) { 3310 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v); 3311 $ns->fx_want ($k, $v);
3267 } 3312 }
3268}; 3313};
3269 3314
3315sub load_resource_file($) {
3316 my $guard = lock_acquire "load_resource_file";
3317
3318 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100;
3320 cf::arch::commit_load;
3321
3322 $status
3323}
3324
3270sub reload_regions { 3325sub reload_regions {
3271 # HACK to clear player env face cache, we need some signal framework 3326 # HACK to clear player env face cache, we need some signal framework
3272 # for this (global event?) 3327 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = (); 3328 %ext::player_env::MUSIC_FACE_CACHE = ();
3274 3329
3287} 3342}
3288 3343
3289sub reload_archetypes { 3344sub reload_archetypes {
3290 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
3291 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
3292 #d# NEED to laod twice to resolve forward references
3293 # this really needs to be done in an extra post-pass
3294 # (which needs to be synchronous, so solve it differently)
3295 load_resource_file "$DATADIR/archetypes"
3296 or die "unable to load archetypes\n";
3297} 3347}
3298 3348
3299sub reload_treasures { 3349sub reload_treasures {
3300 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
3301 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
3302} 3352}
3303 3353
3304sub reload_resources { 3354sub reload_resources {
3305 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
3306 3356
3357 reload_facedata;
3358 reload_archetypes;
3307 reload_regions; 3359 reload_regions;
3308 reload_facedata;
3309 #reload_archetypes;#d#
3310 reload_archetypes;
3311 reload_treasures; 3360 reload_treasures;
3312 3361
3313 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
3314}
3315
3316sub init {
3317 reload_resources;
3318} 3363}
3319 3364
3320sub reload_config { 3365sub reload_config {
3321 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
3322 or return; 3367 or return;
3336 }; 3381 };
3337 warn $@ if $@; 3382 warn $@ if $@;
3338 } 3383 }
3339} 3384}
3340 3385
3386sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!";
3389 flock $fh, &Fcntl::LOCK_EX
3390 or die "$PIDFILE: flock: $!";
3391 $fh
3392}
3393
3394# make sure only one server instance is running at any one time
3395sub atomic {
3396 my $fh = pidfile;
3397
3398 my $pid = <$fh>;
3399 kill 9, $pid if $pid > 0;
3400
3401 seek $fh, 0, 0;
3402 print $fh $$;
3403}
3404
3341sub main { 3405sub main {
3406 cf::init_globals; # initialise logging
3407
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 cf::init_block;
3418
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420
3342 # we must not ever block the main coroutine 3421 # we must not ever block the main coroutine
3343 local $Coro::idle = sub { 3422 local $Coro::idle = sub {
3344 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3423 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3345 (async { 3424 (async {
3346 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3425 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT; 3426 EV::loop EV::LOOP_ONESHOT;
3348 })->prio (Coro::PRIO_MAX); 3427 })->prio (Coro::PRIO_MAX);
3349 }; 3428 };
3350 3429
3430 evthread_start IO::AIO::poll_fileno;
3431
3432 cf::sync_job {
3433 reload_resources;
3351 reload_config; 3434 reload_config;
3352 db_init; 3435 db_init;
3436
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid;
3440 cf::init_signals;
3441 cf::init_commands;
3442 cf::init_skills;
3443
3444 cf::init_beforeplay;
3445
3446 atomic;
3447
3353 load_extensions; 3448 load_extensions;
3354 3449
3355 $TICK_WATCHER->start; 3450 utime time, time, $RUNTIMEFILE;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3451
3452 # no (long-running) fork's whatsoever before this point(!)
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454
3455 (pop @POST_INIT)->(0) while @POST_INIT;
3456 };
3457
3357 EV::loop; 3458 EV::loop;
3358} 3459}
3359 3460
3360############################################################################# 3461#############################################################################
3361# initialisation and cleanup 3462# initialisation and cleanup
3368 cf::cleanup "SIG$signal"; 3469 cf::cleanup "SIG$signal";
3369 }; 3470 };
3370 } 3471 }
3371} 3472}
3372 3473
3373sub write_runtime { 3474sub write_runtime_sync {
3374 my $runtime = "$LOCALDIR/runtime";
3375
3376 # first touch the runtime file to show we are still running: 3475 # first touch the runtime file to show we are still running:
3377 # the fsync below can take a very very long time. 3476 # the fsync below can take a very very long time.
3378 3477
3379 IO::AIO::aio_utime $runtime, undef, undef; 3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3380 3479
3381 my $guard = cf::lock_acquire "write_runtime"; 3480 my $guard = cf::lock_acquire "write_runtime";
3382 3481
3383 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3384 or return; 3483 or return;
3385 3484
3386 my $value = $cf::RUNTIME + 90 + 10; 3485 my $value = $cf::RUNTIME + 90 + 10;
3387 # 10 is the runtime save interval, for a monotonic clock 3486 # 10 is the runtime save interval, for a monotonic clock
3388 # 60 allows for the watchdog to kill the server. 3487 # 60 allows for the watchdog to kill the server.
3398 aio_utime $fh, undef, undef; 3497 aio_utime $fh, undef, undef;
3399 3498
3400 close $fh 3499 close $fh
3401 or return; 3500 or return;
3402 3501
3403 aio_rename "$runtime~", $runtime 3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3404 and return; 3503 and return;
3405 3504
3406 warn "runtime file written.\n"; 3505 warn "runtime file written.\n";
3407 3506
3408 1 3507 1
3508}
3509
3510our $uuid_lock;
3511our $uuid_skip;
3512
3513sub write_uuid_sync($) {
3514 $uuid_skip ||= $_[0];
3515
3516 return if $uuid_lock;
3517 local $uuid_lock = 1;
3518
3519 my $uuid = "$LOCALDIR/uuid";
3520
3521 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3522 or return;
3523
3524 my $value = uuid_seq uuid_cur;
3525
3526 unless ($value) {
3527 warn "cowardly refusing to write zero uuid value!\n";
3528 return;
3529 }
3530
3531 my $value = uuid_str $value + $uuid_skip;
3532 $uuid_skip = 0;
3533
3534 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3535 and return;
3536
3537 # always fsync - this file is important
3538 aio_fsync $fh
3539 and return;
3540
3541 close $fh
3542 or return;
3543
3544 aio_rename "$uuid~", $uuid
3545 and return;
3546
3547 warn "uuid file written ($value).\n";
3548
3549 1
3550
3551}
3552
3553sub write_uuid($$) {
3554 my ($skip, $sync) = @_;
3555
3556 $sync ? write_uuid_sync $skip
3557 : async { write_uuid_sync $skip };
3409} 3558}
3410 3559
3411sub emergency_save() { 3560sub emergency_save() {
3412 my $freeze_guard = cf::freeze_mainloop; 3561 my $freeze_guard = cf::freeze_mainloop;
3413 3562
3435 warn "end emergency map save\n"; 3584 warn "end emergency map save\n";
3436 3585
3437 warn "begin emergency database checkpoint\n"; 3586 warn "begin emergency database checkpoint\n";
3438 BDB::db_env_txn_checkpoint $DB_ENV; 3587 BDB::db_env_txn_checkpoint $DB_ENV;
3439 warn "end emergency database checkpoint\n"; 3588 warn "end emergency database checkpoint\n";
3589
3590 warn "begin write uuid\n";
3591 write_uuid_sync 1;
3592 warn "end write uuid\n";
3440 }; 3593 };
3441 3594
3442 warn "leave emergency perl save\n"; 3595 warn "leave emergency perl save\n";
3443} 3596}
3444 3597
3445sub post_cleanup { 3598sub post_cleanup {
3446 my ($make_core) = @_; 3599 my ($make_core) = @_;
3447 3600
3448 warn Carp::longmess "post_cleanup backtrace" 3601 warn Carp::longmess "post_cleanup backtrace"
3449 if $make_core; 3602 if $make_core;
3603
3604 my $fh = pidfile;
3605 unlink $PIDFILE if <$fh> == $$;
3606}
3607
3608# a safer delete_package, copied from Symbol
3609sub clear_package($) {
3610 my $pkg = shift;
3611
3612 # expand to full symbol table name if needed
3613 unless ($pkg =~ /^main::.*::$/) {
3614 $pkg = "main$pkg" if $pkg =~ /^::/;
3615 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3616 $pkg .= '::' unless $pkg =~ /::$/;
3617 }
3618
3619 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3620 my $stem_symtab = *{$stem}{HASH};
3621
3622 defined $stem_symtab and exists $stem_symtab->{$leaf}
3623 or return;
3624
3625 # clear all symbols
3626 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3627 for my $name (keys %$leaf_symtab) {
3628 _gv_clear *{"$pkg$name"};
3629# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3630 }
3631 warn "cleared package $pkg\n";#d#
3450} 3632}
3451 3633
3452sub do_reload_perl() { 3634sub do_reload_perl() {
3453 # can/must only be called in main 3635 # can/must only be called in main
3454 if ($Coro::current != $Coro::main) { 3636 if ($Coro::current != $Coro::main) {
3455 warn "can only reload from main coroutine"; 3637 warn "can only reload from main coroutine";
3456 return; 3638 return;
3457 } 3639 }
3458 3640
3641 return if $RELOAD++;
3642
3643 while ($RELOAD) {
3459 warn "reloading..."; 3644 warn "reloading...";
3460 3645
3461 warn "entering sync_job"; 3646 warn "entering sync_job";
3462 3647
3463 cf::sync_job { 3648 cf::sync_job {
3464 cf::write_runtime; # external watchdog should not bark 3649 cf::write_runtime_sync; # external watchdog should not bark
3465 cf::emergency_save; 3650 cf::emergency_save;
3466 cf::write_runtime; # external watchdog should not bark 3651 cf::write_runtime_sync; # external watchdog should not bark
3467 3652
3468 warn "syncing database to disk"; 3653 warn "syncing database to disk";
3469 BDB::db_env_txn_checkpoint $DB_ENV; 3654 BDB::db_env_txn_checkpoint $DB_ENV;
3470 3655
3471 # if anything goes wrong in here, we should simply crash as we already saved 3656 # if anything goes wrong in here, we should simply crash as we already saved
3472 3657
3473 warn "flushing outstanding aio requests"; 3658 warn "flushing outstanding aio requests";
3474 for (;;) {
3475 BDB::flush;
3476 IO::AIO::flush;
3477 Coro::cede_notself;
3478 last unless IO::AIO::nreqs || BDB::nreqs; 3659 while (IO::AIO::nreqs || BDB::nreqs) {
3479 warn "iterate..."; 3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3480 }
3481
3482 ++$RELOAD;
3483
3484 warn "cancelling all extension coros";
3485 $_->cancel for values %EXT_CORO;
3486 %EXT_CORO = ();
3487
3488 warn "removing commands";
3489 %COMMAND = ();
3490
3491 warn "removing ext/exti commands";
3492 %EXTCMD = ();
3493 %EXTICMD = ();
3494
3495 warn "unloading/nuking all extensions";
3496 for my $pkg (@EXTS) {
3497 warn "... unloading $pkg";
3498
3499 if (my $cb = $pkg->can ("unload")) {
3500 eval {
3501 $cb->($pkg);
3502 1
3503 } or warn "$pkg unloaded, but with errors: $@";
3504 } 3661 }
3505 3662
3506 warn "... nuking $pkg"; 3663 warn "cancelling all extension coros";
3507 Symbol::delete_package $pkg; 3664 $_->cancel for values %EXT_CORO;
3508 } 3665 %EXT_CORO = ();
3509 3666
3510 warn "unloading all perl modules loaded from $LIBDIR"; 3667 warn "removing commands";
3511 while (my ($k, $v) = each %INC) { 3668 %COMMAND = ();
3512 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3513 3669
3670 warn "removing ext/exti commands";
3671 %EXTCMD = ();
3672 %EXTICMD = ();
3673
3674 warn "unloading/nuking all extensions";
3675 for my $pkg (@EXTS) {
3514 warn "... unloading $k"; 3676 warn "... unloading $pkg";
3515 delete $INC{$k};
3516 3677
3517 $k =~ s/\.pm$//;
3518 $k =~ s/\//::/g;
3519
3520 if (my $cb = $k->can ("unload_module")) { 3678 if (my $cb = $pkg->can ("unload")) {
3679 eval {
3521 $cb->(); 3680 $cb->($pkg);
3681 1
3682 } or warn "$pkg unloaded, but with errors: $@";
3683 }
3684
3685 warn "... clearing $pkg";
3686 clear_package $pkg;
3522 } 3687 }
3523 3688
3524 Symbol::delete_package $k; 3689 warn "unloading all perl modules loaded from $LIBDIR";
3690 while (my ($k, $v) = each %INC) {
3691 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3692
3693 warn "... unloading $k";
3694 delete $INC{$k};
3695
3696 $k =~ s/\.pm$//;
3697 $k =~ s/\//::/g;
3698
3699 if (my $cb = $k->can ("unload_module")) {
3700 $cb->();
3701 }
3702
3703 clear_package $k;
3525 } 3704 }
3526 3705
3527 warn "getting rid of safe::, as good as possible"; 3706 warn "getting rid of safe::, as good as possible";
3528 Symbol::delete_package "safe::$_" 3707 clear_package "safe::$_"
3529 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3530 3709
3531 warn "unloading cf.pm \"a bit\""; 3710 warn "unloading cf.pm \"a bit\"";
3532 delete $INC{"cf.pm"}; 3711 delete $INC{"cf.pm"};
3533 delete $INC{"cf/pod.pm"}; 3712 delete $INC{"cf/pod.pm"};
3534 3713
3535 # don't, removes xs symbols, too, 3714 # don't, removes xs symbols, too,
3536 # and global variables created in xs 3715 # and global variables created in xs
3537 #Symbol::delete_package __PACKAGE__; 3716 #clear_package __PACKAGE__;
3538 3717
3539 warn "unload completed, starting to reload now"; 3718 warn "unload completed, starting to reload now";
3540 3719
3541 warn "reloading cf.pm"; 3720 warn "reloading cf.pm";
3542 require cf; 3721 require cf;
3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3544 3723
3545 warn "loading config and database again"; 3724 warn "loading config and database again";
3546 cf::reload_config; 3725 cf::reload_config;
3547 3726
3548 warn "loading extensions"; 3727 warn "loading extensions";
3549 cf::load_extensions; 3728 cf::load_extensions;
3550 3729
3551 warn "reattaching attachments to objects/players"; 3730 warn "reattaching attachments to objects/players";
3552 _global_reattach; # objects, sockets 3731 _global_reattach; # objects, sockets
3553 warn "reattaching attachments to maps"; 3732 warn "reattaching attachments to maps";
3554 reattach $_ for values %MAP; 3733 reattach $_ for values %MAP;
3555 warn "reattaching attachments to players"; 3734 warn "reattaching attachments to players";
3556 reattach $_ for values %PLAYER; 3735 reattach $_ for values %PLAYER;
3557 3736
3737 warn "running post_load";
3738 (pop @POST_INIT)->(1) while @POST_INIT;
3739
3558 warn "leaving sync_job"; 3740 warn "leaving sync_job";
3559 3741
3560 1 3742 1
3561 } or do { 3743 } or do {
3562 warn $@; 3744 warn $@;
3563 warn "error while reloading, exiting."; 3745 cf::cleanup "error while reloading, exiting.";
3564 exit 1;
3565 }; 3746 };
3566 3747
3567 warn "reloaded"; 3748 warn "reloaded";
3749 --$RELOAD;
3750 }
3568}; 3751};
3569 3752
3570our $RELOAD_WATCHER; # used only during reload 3753our $RELOAD_WATCHER; # used only during reload
3571 3754
3572sub reload_perl() { 3755sub reload_perl() {
3573 # doing reload synchronously and two reloads happen back-to-back, 3756 # doing reload synchronously and two reloads happen back-to-back,
3574 # coro crashes during coro_state_free->destroy here. 3757 # coro crashes during coro_state_free->destroy here.
3575 3758
3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3577 do_reload_perl; 3760 do_reload_perl;
3578 undef $RELOAD_WATCHER; 3761 undef $RELOAD_WATCHER;
3579 }; 3762 };
3580} 3763}
3581 3764
3597 3780
3598our @WAIT_FOR_TICK; 3781our @WAIT_FOR_TICK;
3599our @WAIT_FOR_TICK_BEGIN; 3782our @WAIT_FOR_TICK_BEGIN;
3600 3783
3601sub wait_for_tick { 3784sub wait_for_tick {
3602 return unless $TICK_WATCHER->is_active;
3603 return if $Coro::current == $Coro::main; 3785 return if tick_inhibit || $Coro::current == $Coro::main;
3604 3786
3605 my $signal = new Coro::Signal; 3787 my $signal = new Coro::Signal;
3606 push @WAIT_FOR_TICK, $signal; 3788 push @WAIT_FOR_TICK, $signal;
3607 $signal->wait; 3789 $signal->wait;
3608} 3790}
3609 3791
3610sub wait_for_tick_begin { 3792sub wait_for_tick_begin {
3611 return unless $TICK_WATCHER->is_active;
3612 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3613 3794
3614 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3615 push @WAIT_FOR_TICK_BEGIN, $signal; 3796 push @WAIT_FOR_TICK_BEGIN, $signal;
3616 $signal->wait; 3797 $signal->wait;
3617} 3798}
3618 3799
3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3800sub tick {
3620 if ($Coro::current != $Coro::main) { 3801 if ($Coro::current != $Coro::main) {
3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3622 unless ++$bug_warning > 10; 3803 unless ++$bug_warning > 10;
3623 return; 3804 return;
3624 } 3805 }
3625 3806
3626 $NOW = $tick_start = EV::now;
3627
3628 cf::server_tick; # one server iteration 3807 cf::server_tick; # one server iteration
3629
3630 $RUNTIME += $TICK;
3631 $NEXT_TICK = $_[0]->at;
3632 3808
3633 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3809 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3635 Coro::async_pool { 3811 Coro::async_pool {
3636 $Coro::current->{desc} = "runtime saver"; 3812 $Coro::current->{desc} = "runtime saver";
3637 write_runtime 3813 write_runtime_sync
3638 or warn "ERROR: unable to write runtime file: $!"; 3814 or warn "ERROR: unable to write runtime file: $!";
3639 }; 3815 };
3640 } 3816 }
3641 3817
3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3644 } 3820 }
3645 while (my $sig = shift @WAIT_FOR_TICK) { 3821 while (my $sig = shift @WAIT_FOR_TICK) {
3646 $sig->send; 3822 $sig->send;
3647 } 3823 }
3648 3824
3649 $LOAD = ($NOW - $tick_start) / $TICK; 3825 $LOAD = ($NOW - $TICK_START) / $TICK;
3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3651 3827
3652 _post_tick; 3828 if (0) {
3653}; 3829 if ($NEXT_TICK) {
3654$TICK_WATCHER->priority (EV::MAXPRI); 3830 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d#
3833 }
3834 }
3835}
3655 3836
3656{ 3837{
3657 # configure BDB 3838 # configure BDB
3658 3839
3659 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3660 BDB::max_poll_reqs $TICK * 0.1; 3841 BDB::max_poll_reqs $TICK * 0.1;
3661 $Coro::BDB::WATCHER->priority (1); 3842 $AnyEvent::BDB::WATCHER->priority (1);
3662 3843
3663 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3664 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3666 | BDB::LOG_AUTOREMOVE, 1); 3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3848 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3669 3851
3670 cf::sync_job { 3852 cf::sync_job {
3671 eval { 3853 eval {
3697{ 3879{
3698 # configure IO::AIO 3880 # configure IO::AIO
3699 3881
3700 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3701 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3702 $Coro::AIO::WATCHER->priority (1); 3884 undef $AnyEvent::AIO::WATCHER;
3703} 3885}
3704 3886
3705my $_log_backtrace; 3887my $_log_backtrace;
3706 3888
3707sub _log_backtrace { 3889sub _log_backtrace {
3710 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3711 3893
3712 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3713 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3714 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3715 async { 3898 async {
3716 $Coro::current->{desc} = "abt $msg"; 3899 $Coro::current->{desc} = "abt $msg";
3717 3900
3718 my @bt = fork_call { 3901 my @bt = fork_call {
3719 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3730 } 3913 }
3731 3914
3732 @funcs 3915 @funcs
3733 }; 3916 };
3734 3917
3735 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3736 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3737 --$_log_backtrace; 3921 --$_log_backtrace;
3738 }; 3922 };
3739 } else { 3923 } else {
3740 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines