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.453 by root, Tue Sep 23 04:29:11 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 }
1290 1358
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1361
1294 $ext{source} = 1362 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1296 . "#line 1 \"$path\"\n{\n" 1364 . "#line 1 \"$path\"\n{\n"
1297 . $source 1365 . $source
1298 . "\n};\n1"; 1366 . "\n};\n1";
1299 1367
1300 $todo{$base} = \%ext; 1368 $todo{$base} = \%ext;
1316 my $msg = $@ ? "$v->{path}: $@\n" 1384 my $msg = $@ ? "$v->{path}: $@\n"
1317 : "$v->{base}: extension inactive.\n"; 1385 : "$v->{base}: extension inactive.\n";
1318 1386
1319 if (exists $v->{meta}{mandatory}) { 1387 if (exists $v->{meta}{mandatory}) {
1320 warn $msg; 1388 warn $msg;
1321 warn "mandatory extension failed to load, exiting.\n"; 1389 cf::cleanup "mandatory extension failed to load, exiting.";
1322 exit 1;
1323 } 1390 }
1324 1391
1325 warn $msg; 1392 warn $msg;
1326 } 1393 }
1327 1394
1341 1408
1342=back 1409=back
1343 1410
1344=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1345 1412
1346Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1347 1414
1348=cut 1415=cut
1349 1416
1350package cf::player; 1417package cf::player;
1351 1418
1394 1461
1395sub exists($) { 1462sub exists($) {
1396 my ($login) = @_; 1463 my ($login) = @_;
1397 1464
1398 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1399 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1400} 1467}
1401 1468
1402sub find($) { 1469sub find($) {
1403 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1404 my $login = $_[0]; 1471 my $login = $_[0];
1416 my $f = new_from_file cf::object::thawer path $login 1483 my $f = new_from_file cf::object::thawer path $login
1417 or return; 1484 or return;
1418 1485
1419 my $pl = cf::player::load_pl $f 1486 my $pl = cf::player::load_pl $f
1420 or return; 1487 or return;
1488
1421 local $cf::PLAYER_LOADING{$login} = $pl; 1489 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs; 1490 $f->resolve_delayed_derefs;
1423 $cf::PLAYER{$login} = $pl 1491 $cf::PLAYER{$login} = $pl
1424 } 1492 }
1425 } 1493 }
1435 1503
1436 return if $pl->{deny_save}; 1504 return if $pl->{deny_save};
1437 1505
1438 aio_mkdir playerdir $pl, 0770; 1506 aio_mkdir playerdir $pl, 0770;
1439 $pl->{last_save} = $cf::RUNTIME; 1507 $pl->{last_save} = $cf::RUNTIME;
1508
1509 cf::get_slot 0.01;
1440 1510
1441 $pl->save_pl ($path); 1511 $pl->save_pl ($path);
1442 cf::cede_to_tick; 1512 cf::cede_to_tick;
1443} 1513}
1444 1514
1476 my ($pl) = @_; 1546 my ($pl) = @_;
1477 1547
1478 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1479 1549
1480 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1481 $pl->password ("*"); # this should lock out the player until we nuked the dir 1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1482 1552
1483 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1484 $pl->deactivate; 1554 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1485 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1557 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1486 $pl->ns->destroy if $pl->ns; 1558 $pl->ns->destroy if $pl->ns;
1487 1559
1488 my $path = playerdir $pl; 1560 my $path = playerdir $pl;
1489 my $temp = "$path~$cf::RUNTIME~deleting~"; 1561 my $temp = "$path~$cf::RUNTIME~deleting~";
1528 1600
1529 for my $login (@$dirs) { 1601 for my $login (@$dirs) {
1530 my $path = path $login; 1602 my $path = path $login;
1531 1603
1532 # a .pst is a dead give-away for a valid player 1604 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") { 1605 # if no pst file found, open and chekc for blocked users
1606 if (aio_stat "$path.pst") {
1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1607 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1535 aio_read $fh, 0, 512, my $buf, 0 or next; 1608 aio_read $fh, 0, 512, my $buf, 0 or next;
1536 $buf !~ /^password -------------$/m or next; # official not-valid tag 1609 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 } 1610 }
1538 1611
1569 } 1642 }
1570 1643
1571 \@paths 1644 \@paths
1572} 1645}
1573 1646
1574=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1575 1648
1576Expand crossfire pod fragments into protocol xml. 1649Expand 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 1650
1667=item $player->ext_reply ($msgid, @msg) 1651=item $player->ext_reply ($msgid, @msg)
1668 1652
1669Sends an ext reply to the player. 1653Sends an ext reply to the player.
1670 1654
1737our $MAX_RESET = 3600; 1721our $MAX_RESET = 3600;
1738our $DEFAULT_RESET = 3000; 1722our $DEFAULT_RESET = 3000;
1739 1723
1740sub generate_random_map { 1724sub generate_random_map {
1741 my ($self, $rmp) = @_; 1725 my ($self, $rmp) = @_;
1726
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728
1742 # mit "rum" bekleckern, nicht 1729 # mit "rum" bekleckern, nicht
1743 $self->_create_random_map ( 1730 $self->_create_random_map (
1744 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1745 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1746 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1868 1855
1869# the temporary/swap location 1856# the temporary/swap location
1870sub save_path { 1857sub save_path {
1871 my ($self) = @_; 1858 my ($self) = @_;
1872 1859
1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1874 "$TMPDIR/$path.map" 1861 "$TMPDIR/$path.map"
1875} 1862}
1876 1863
1877# the unique path, undef == no special unique path 1864# the unique path, undef == no special unique path
1878sub uniq_path { 1865sub uniq_path {
1879 my ($self) = @_; 1866 my ($self) = @_;
1880 1867
1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1882 "$UNIQUEDIR/$path" 1869 "$UNIQUEDIR/$path"
1883} 1870}
1884 1871
1885# and all this just because we cannot iterate over 1872# and all this just because we cannot iterate over
1886# all maps in C++... 1873# all maps in C++...
1984 1971
1985 cf::lock_wait "map_data:$path";#d#remove 1972 cf::lock_wait "map_data:$path";#d#remove
1986 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1987 1974
1988 $cf::MAP{$path} || do { 1975 $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 1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1991 1978
1992 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1993 or return; 1980 or return;
1994 1981
1995 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1998 or return; 1985 or return;
1999 1986
2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2001 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
2002 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard2;
2003 undef $guard1; 1991 undef $guard1;
2004 undef $guard2;
2005 $map->reset; 1992 $map->reset;
2006 return find $path; 1993 return find $path;
2007 } 1994 }
2008 1995
2009 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2024 $f->skip_block;
2038 $self->_load_objects ($f) 2025 $self->_load_objects ($f)
2039 or return; 2026 or return;
2040 2027
2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->post_load_original
2042 if delete $self->{load_original}; 2029 if delete $self->{load_original};
2043 2030
2044 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2032 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2033 unless (aio_stat $uniq) {
2072 } 2059 }
2073 2060
2074 $self->{last_save} = $cf::RUNTIME; 2061 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2062 $self->last_access ($cf::RUNTIME);
2076 2063
2077 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2065 }
2079 2066
2080 $self->post_load; 2067 $self->post_load;
2081} 2068}
2082 2069
2140 my ($path, $origin, $load) = @_; 2127 my ($path, $origin, $load) = @_;
2141 2128
2142 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
2143 2130
2144 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2146 } 2133 }
2147 2134
2148 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
2149 2136
2150 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2187 cf::async { 2174 cf::async {
2188 $Coro::current->{desc} = "map player save"; 2175 $Coro::current->{desc} = "map player save";
2189 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2190 }; 2177 };
2191 2178
2179 cf::get_slot 0.02;
2180
2192 if ($uniq) { 2181 if ($uniq) {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2194 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2183 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2195 } else { 2184 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2204 $self->save; 2193 $self->save;
2205 2194
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2195 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2196
2208 return if $self->players; 2197 return if $self->players;
2209 return if $self->in_memory != cf::MAP_IN_MEMORY; 2198 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2199 return if $self->{deny_save};
2211 2200
2212 $self->in_memory (cf::MAP_SWAPPED); 2201 $self->in_memory (cf::MAP_SWAPPED);
2213 2202
2214 $self->deactivate; 2203 $self->deactivate;
2332 2321
2333sub unique_maps() { 2322sub unique_maps() {
2334 [ 2323 [
2335 map { 2324 map {
2336 utf8::decode $_; 2325 utf8::decode $_;
2337 /\.map$/ 2326 s/\.map$//; # TODO future compatibility hack
2327 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2328 ? ()
2338 ? normalise $_ 2329 : normalise $_
2339 : ()
2340 } @{ aio_readdir $UNIQUEDIR or [] } 2330 } @{ aio_readdir $UNIQUEDIR or [] }
2341 ] 2331 ]
2342} 2332}
2343 2333
2344package cf;
2345
2346=back 2334=back
2347 2335
2348=head3 cf::object 2336=head3 cf::object
2349 2337
2350=cut 2338=cut
2353 2341
2354=over 4 2342=over 4
2355 2343
2356=item $ob->inv_recursive 2344=item $ob->inv_recursive
2357 2345
2358Returns the inventory of the object _and_ their inventories, recursively. 2346Returns the inventory of the object I<and> their inventories, recursively,
2347but I<not> the object itself.
2359 2348
2360=cut 2349=cut
2361 2350
2362sub inv_recursive_; 2351sub inv_recursive_;
2363sub inv_recursive_ { 2352sub inv_recursive_ {
2368 inv_recursive_ inv $_[0] 2357 inv_recursive_ inv $_[0]
2369} 2358}
2370 2359
2371=item $ref = $ob->ref 2360=item $ref = $ob->ref
2372 2361
2373creates and returns a persistent reference to an objetc that can be stored as a string. 2362Creates and returns a persistent reference to an object that can be stored as a string.
2374 2363
2375=item $ob = cf::object::deref ($refstring) 2364=item $ob = cf::object::deref ($refstring)
2376 2365
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2366returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block. 2367even if the object actually exists. May block.
2410can be C<undef>. Does the right thing when the player is currently in a 2399can be C<undef>. Does the right thing when the player is currently in a
2411dialogue with the given NPC character. 2400dialogue with the given NPC character.
2412 2401
2413=cut 2402=cut
2414 2403
2404our $SAY_CHANNEL = {
2405 id => "say",
2406 title => "Map",
2407 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2409};
2410
2411our $CHAT_CHANNEL = {
2412 id => "chat",
2413 title => "Chat",
2414 reply => "chat ",
2415 tooltip => "Player chat and shouts, global to the server.",
2416};
2417
2415# rough implementation of a future "reply" method that works 2418# rough implementation of a future "reply" method that works
2416# with dialog boxes. 2419# with dialog boxes.
2417#TODO: the first argument must go, split into a $npc->reply_to ( method 2420#TODO: the first argument must go, split into a $npc->reply_to ( method
2418sub cf::object::player::reply($$$;$) { 2421sub cf::object::player::reply($$$;$) {
2419 my ($self, $npc, $msg, $flags) = @_; 2422 my ($self, $npc, $msg, $flags) = @_;
2430 my $dialog = $pl->{npc_dialog}; 2433 my $dialog = $pl->{npc_dialog};
2431 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2434 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2432 2435
2433 } else { 2436 } else {
2434 $msg = $npc->name . " says: $msg" if $npc; 2437 $msg = $npc->name . " says: $msg" if $npc;
2435 $self->message ($msg, $flags); 2438 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2436 } 2439 }
2437 } 2440 }
2438} 2441}
2439 2442
2440=item $object->send_msg ($channel, $msg, $color, [extra...]) 2443=item $object->send_msg ($channel, $msg, $color, [extra...])
2465 2468
2466=item $player_object->enter_link 2469=item $player_object->enter_link
2467 2470
2468Freezes the player and moves him/her to a special map (C<{link}>). 2471Freezes the player and moves him/her to a special map (C<{link}>).
2469 2472
2470The player should be reasonably safe there for short amounts of time. You 2473The player should be reasonably safe there for short amounts of time (e.g.
2471I<MUST> call C<leave_link> as soon as possible, though. 2474for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link
2476map.
2472 2477
2473Will never block. 2478Will never block.
2474 2479
2475=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2476 2481
2534 2539
2535 $map->load; 2540 $map->load;
2536 $map->load_neighbours; 2541 $map->load_neighbours;
2537 2542
2538 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2539 $self->activate_recursive; 2545 $self->activate_recursive;
2540 2546
2541 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2542 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2543} 2549}
2547Moves the player to the given map-path and coordinates by first freezing 2553Moves the player to the given map-path and coordinates by first freezing
2548her, loading and preparing them map, calling the provided $check callback 2554her, loading and preparing them map, calling the provided $check callback
2549that has to return the map if sucecssful, and then unfreezes the player on 2555that 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 2556the new (success) or old (failed) map position. In either case, $done will
2551be called at the end of this process. 2557be called at the end of this process.
2558
2559Note that $check will be called with a potentially non-loaded map, so if
2560it needs a loaded map it has to call C<< ->load >>.
2552 2561
2553=cut 2562=cut
2554 2563
2555our $GOTOGEN; 2564our $GOTOGEN;
2556 2565
2635} 2644}
2636 2645
2637sub prepare_random_map { 2646sub prepare_random_map {
2638 my ($exit) = @_; 2647 my ($exit) = @_;
2639 2648
2640 my $guard = cf::lock_acquire "exit_prepare:$exit";
2641
2642 # all this does is basically replace the /! path by 2649 # all this does is basically replace the /! path by
2643 # a new random map path (?random/...) with a seed 2650 # a new random map path (?random/...) with a seed
2644 # that depends on the exit object 2651 # that depends on the exit object
2645 2652
2646 my $rmp = parse_random_map_params $exit->msg; 2653 my $rmp = parse_random_map_params $exit->msg;
2648 if ($exit->map) { 2655 if ($exit->map) {
2649 $rmp->{region} = $exit->region->name; 2656 $rmp->{region} = $exit->region->name;
2650 $rmp->{origin_map} = $exit->map->path; 2657 $rmp->{origin_map} = $exit->map->path;
2651 $rmp->{origin_x} = $exit->x; 2658 $rmp->{origin_x} = $exit->x;
2652 $rmp->{origin_y} = $exit->y; 2659 $rmp->{origin_y} = $exit->y;
2660
2661 $exit->map->touch;
2653 } 2662 }
2654 2663
2655 $rmp->{random_seed} ||= $exit->random_seed; 2664 $rmp->{random_seed} ||= $exit->random_seed;
2656 2665
2657 my $data = cf::encode_json $rmp; 2666 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2658 my $md5 = Digest::MD5::md5_hex $data; 2667 my $md5 = Digest::MD5::md5_hex $data;
2659 my $meta = "$RANDOMDIR/$md5.meta"; 2668 my $meta = "$RANDOMDIR/$md5.meta";
2660 2669
2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2670 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2662 aio_write $fh, 0, (length $data), $data, 0; 2671 aio_write $fh, 0, (length $data), $data, 0;
2663 undef $fh; 2672 undef $fh;
2664 aio_rename "$meta~", $meta; 2673 aio_rename "$meta~", $meta;
2665 2674
2675 my $slaying = "?random/$md5";
2676
2677 if ($exit->valid) {
2666 $exit->slaying ("?random/$md5"); 2678 $exit->slaying ("?random/$md5");
2667 $exit->msg (undef); 2679 $exit->msg (undef);
2680 }
2668 } 2681 }
2669} 2682}
2670 2683
2671sub cf::object::player::enter_exit { 2684sub cf::object::player::enter_exit {
2672 my ($self, $exit) = @_; 2685 my ($self, $exit) = @_;
2673 2686
2674 return unless $self->type == cf::PLAYER; 2687 return unless $self->type == cf::PLAYER;
2675 2688
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; 2689 $self->enter_link;
2688 2690
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 { 2691 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2692 $Coro::current->{desc} = "enter_exit";
2695 2693
2696 $self->deactivate_recursive; # just to be sure
2697 unless (eval { 2694 unless (eval {
2695 $self->deactivate_recursive; # just to be sure
2696
2697 # random map handling
2698 {
2699 my $guard = cf::lock_acquire "exit_prepare:$exit";
2700
2701 prepare_random_map $exit
2702 if $exit->slaying eq "/!";
2703 }
2704
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2706 my $x = $exit->stats->hp;
2707 my $y = $exit->stats->sp;
2708
2698 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($map, $x, $y);
2699 2710
2711 # if exit is damned, update players death & WoR home-position
2712 $self->contr->savebed ($map, $x, $y)
2713 if $exit->flag (cf::FLAG_DAMNED);
2714
2700 1; 2715 1
2701 }) { 2716 }) {
2702 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 2718 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2721
2707 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
2773 id => "infobox", 2788 id => "infobox",
2774 title => "Body Parts", 2789 title => "Body Parts",
2775 reply => undef, 2790 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available", 2791 tooltip => "Shows which body parts you posess and are available",
2777 }, 2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2778 "c/uptime" => { 2799 "c/uptime" => {
2779 id => "infobox", 2800 id => "infobox",
2780 title => "Uptime", 2801 title => "Uptime",
2781 reply => undef, 2802 reply => undef,
2782 tooltip => "How long the server has been running since last restart", 2803 tooltip => "How long the server has been running since last restart",
2785 id => "infobox", 2806 id => "infobox",
2786 title => "Map Info", 2807 title => "Map Info",
2787 reply => undef, 2808 reply => undef,
2788 tooltip => "Information related to the maps", 2809 tooltip => "Information related to the maps",
2789 }, 2810 },
2811 "c/party" => {
2812 id => "party",
2813 title => "Party",
2814 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party",
2816 },
2790); 2817);
2791 2818
2792sub cf::client::send_msg { 2819sub cf::client::send_msg {
2793 my ($self, $channel, $msg, $color, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2794 2821
2795 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2796 2824
2797 $color &= cf::NDI_CLIENT_MASK; # just in case... 2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2798 2826
2799 # check predefined channels, for the benefit of C 2827 # check predefined channels, for the benefit of C
2800 if ($CHANNEL{$channel}) { 2828 if ($CHANNEL{$channel}) {
2821 if ($self->can_msg) { 2849 if ($self->can_msg) {
2822 # default colour, mask it out 2850 # default colour, mask it out
2823 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2824 if $color & cf::NDI_DEF; 2852 if $color & cf::NDI_DEF;
2825 2853
2826 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2827 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 );
2858
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt);
2828 } else { 2870 } else {
2829 if ($color >= 0) { 2871 if ($color >= 0) {
2830 # replace some tags by gcfclient-compatible ones 2872 # replace some tags by gcfclient-compatible ones
2831 for ($msg) { 2873 for ($msg) {
2832 1 while 2874 1 while
3031 3073
3032The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
3033 3075
3034 cf::object 3076 cf::object
3035 contr pay_amount pay_player map x y force_find force_add destroy 3077 contr pay_amount pay_player map x y force_find force_add destroy
3036 insert remove name archname title slaying race decrease_ob_nr 3078 insert remove name archname title slaying race decrease split
3037 3079
3038 cf::object::player 3080 cf::object::player
3039 player 3081 player
3040 3082
3041 cf::player 3083 cf::player
3046 3088
3047=cut 3089=cut
3048 3090
3049for ( 3091for (
3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3051 insert remove inv name archname title slaying race 3093 insert remove inv nrof name archname title slaying race
3052 decrease_ob_nr destroy)], 3094 decrease split destroy change_exp)],
3053 ["cf::object::player" => qw(player)], 3095 ["cf::object::player" => qw(player)],
3054 ["cf::player" => qw(peaceful)], 3096 ["cf::player" => qw(peaceful)],
3055 ["cf::map" => qw(trigger)], 3097 ["cf::map" => qw(trigger)],
3056) { 3098) {
3057 no strict 'refs'; 3099 no strict 'refs';
3265 while (my ($k, $v) = each %$want) { 3307 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v); 3308 $ns->fx_want ($k, $v);
3267 } 3309 }
3268}; 3310};
3269 3311
3312sub load_resource_file($) {
3313 my $guard = lock_acquire "load_resource_file";
3314
3315 my $status = load_resource_file_ $_[0];
3316 get_slot 0.1, 100;
3317 cf::arch::commit_load;
3318
3319 $status
3320}
3321
3270sub reload_regions { 3322sub reload_regions {
3271 # HACK to clear player env face cache, we need some signal framework 3323 # HACK to clear player env face cache, we need some signal framework
3272 # for this (global event?) 3324 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = (); 3325 %ext::player_env::MUSIC_FACE_CACHE = ();
3274 3326
3287} 3339}
3288 3340
3289sub reload_archetypes { 3341sub reload_archetypes {
3290 load_resource_file "$DATADIR/archetypes" 3342 load_resource_file "$DATADIR/archetypes"
3291 or die "unable to load archetypes\n"; 3343 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} 3344}
3298 3345
3299sub reload_treasures { 3346sub reload_treasures {
3300 load_resource_file "$DATADIR/treasures" 3347 load_resource_file "$DATADIR/treasures"
3301 or die "unable to load treasurelists\n"; 3348 or die "unable to load treasurelists\n";
3302} 3349}
3303 3350
3304sub reload_resources { 3351sub reload_resources {
3305 warn "reloading resource files...\n"; 3352 warn "reloading resource files...\n";
3306 3353
3354 reload_facedata;
3355 reload_archetypes;
3307 reload_regions; 3356 reload_regions;
3308 reload_facedata;
3309 #reload_archetypes;#d#
3310 reload_archetypes;
3311 reload_treasures; 3357 reload_treasures;
3312 3358
3313 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
3314}
3315
3316sub init {
3317 reload_resources;
3318} 3360}
3319 3361
3320sub reload_config { 3362sub reload_config {
3321 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
3322 or return; 3364 or return;
3336 }; 3378 };
3337 warn $@ if $@; 3379 warn $@ if $@;
3338 } 3380 }
3339} 3381}
3340 3382
3383sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!";
3386 flock $fh, &Fcntl::LOCK_EX
3387 or die "$PIDFILE: flock: $!";
3388 $fh
3389}
3390
3391# make sure only one server instance is running at any one time
3392sub atomic {
3393 my $fh = pidfile;
3394
3395 my $pid = <$fh>;
3396 kill 9, $pid if $pid > 0;
3397
3398 seek $fh, 0, 0;
3399 print $fh $$;
3400}
3401
3341sub main { 3402sub main {
3403 cf::init_globals; # initialise logging
3404
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417
3342 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
3343 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
3344 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3420 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3345 (async { 3421 (async {
3346 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT; 3423 EV::loop EV::LOOP_ONESHOT;
3348 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
3349 }; 3425 };
3350 3426
3427 evthread_start IO::AIO::poll_fileno;
3428
3429 cf::sync_job {
3430 reload_resources;
3351 reload_config; 3431 reload_config;
3352 db_init; 3432 db_init;
3433
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid;
3437 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills;
3440
3441 cf::init_beforeplay;
3442
3443 atomic;
3444
3353 load_extensions; 3445 load_extensions;
3354 3446
3355 $TICK_WATCHER->start; 3447 utime time, time, $RUNTIMEFILE;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3448
3449 # no (long-running) fork's whatsoever before this point(!)
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451
3452 (pop @POST_INIT)->(0) while @POST_INIT;
3453 };
3454
3357 EV::loop; 3455 EV::loop;
3358} 3456}
3359 3457
3360############################################################################# 3458#############################################################################
3361# initialisation and cleanup 3459# initialisation and cleanup
3368 cf::cleanup "SIG$signal"; 3466 cf::cleanup "SIG$signal";
3369 }; 3467 };
3370 } 3468 }
3371} 3469}
3372 3470
3373sub write_runtime { 3471sub write_runtime_sync {
3374 my $runtime = "$LOCALDIR/runtime";
3375
3376 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
3377 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
3378 3474
3379 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3380 3476
3381 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
3382 3478
3383 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3384 or return; 3480 or return;
3385 3481
3386 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
3387 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
3388 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
3398 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
3399 3495
3400 close $fh 3496 close $fh
3401 or return; 3497 or return;
3402 3498
3403 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3404 and return; 3500 and return;
3405 3501
3406 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
3407 3503
3408 1 3504 1
3505}
3506
3507our $uuid_lock;
3508our $uuid_skip;
3509
3510sub write_uuid_sync($) {
3511 $uuid_skip ||= $_[0];
3512
3513 return if $uuid_lock;
3514 local $uuid_lock = 1;
3515
3516 my $uuid = "$LOCALDIR/uuid";
3517
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return;
3520
3521 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3522 $uuid_skip = 0;
3523
3524 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3525 and return;
3526
3527 # always fsync - this file is important
3528 aio_fsync $fh
3529 and return;
3530
3531 close $fh
3532 or return;
3533
3534 aio_rename "$uuid~", $uuid
3535 and return;
3536
3537 warn "uuid file written ($value).\n";
3538
3539 1
3540
3541}
3542
3543sub write_uuid($$) {
3544 my ($skip, $sync) = @_;
3545
3546 $sync ? write_uuid_sync $skip
3547 : async { write_uuid_sync $skip };
3409} 3548}
3410 3549
3411sub emergency_save() { 3550sub emergency_save() {
3412 my $freeze_guard = cf::freeze_mainloop; 3551 my $freeze_guard = cf::freeze_mainloop;
3413 3552
3435 warn "end emergency map save\n"; 3574 warn "end emergency map save\n";
3436 3575
3437 warn "begin emergency database checkpoint\n"; 3576 warn "begin emergency database checkpoint\n";
3438 BDB::db_env_txn_checkpoint $DB_ENV; 3577 BDB::db_env_txn_checkpoint $DB_ENV;
3439 warn "end emergency database checkpoint\n"; 3578 warn "end emergency database checkpoint\n";
3579
3580 warn "begin write uuid\n";
3581 write_uuid_sync 1;
3582 warn "end write uuid\n";
3440 }; 3583 };
3441 3584
3442 warn "leave emergency perl save\n"; 3585 warn "leave emergency perl save\n";
3443} 3586}
3444 3587
3445sub post_cleanup { 3588sub post_cleanup {
3446 my ($make_core) = @_; 3589 my ($make_core) = @_;
3447 3590
3448 warn Carp::longmess "post_cleanup backtrace" 3591 warn Carp::longmess "post_cleanup backtrace"
3449 if $make_core; 3592 if $make_core;
3593
3594 my $fh = pidfile;
3595 unlink $PIDFILE if <$fh> == $$;
3596}
3597
3598# a safer delete_package, copied from Symbol
3599sub clear_package($) {
3600 my $pkg = shift;
3601
3602 # expand to full symbol table name if needed
3603 unless ($pkg =~ /^main::.*::$/) {
3604 $pkg = "main$pkg" if $pkg =~ /^::/;
3605 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3606 $pkg .= '::' unless $pkg =~ /::$/;
3607 }
3608
3609 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3610 my $stem_symtab = *{$stem}{HASH};
3611
3612 defined $stem_symtab and exists $stem_symtab->{$leaf}
3613 or return;
3614
3615 # clear all symbols
3616 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3617 for my $name (keys %$leaf_symtab) {
3618 _gv_clear *{"$pkg$name"};
3619# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3620 }
3621 warn "cleared package $pkg\n";#d#
3450} 3622}
3451 3623
3452sub do_reload_perl() { 3624sub do_reload_perl() {
3453 # can/must only be called in main 3625 # can/must only be called in main
3454 if ($Coro::current != $Coro::main) { 3626 if ($Coro::current != $Coro::main) {
3455 warn "can only reload from main coroutine"; 3627 warn "can only reload from main coroutine";
3456 return; 3628 return;
3457 } 3629 }
3458 3630
3631 return if $RELOAD++;
3632
3633 while ($RELOAD) {
3459 warn "reloading..."; 3634 warn "reloading...";
3460 3635
3461 warn "entering sync_job"; 3636 warn "entering sync_job";
3462 3637
3463 cf::sync_job { 3638 cf::sync_job {
3464 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3465 cf::emergency_save; 3640 cf::emergency_save;
3466 cf::write_runtime; # external watchdog should not bark 3641 cf::write_runtime_sync; # external watchdog should not bark
3467 3642
3468 warn "syncing database to disk"; 3643 warn "syncing database to disk";
3469 BDB::db_env_txn_checkpoint $DB_ENV; 3644 BDB::db_env_txn_checkpoint $DB_ENV;
3470 3645
3471 # if anything goes wrong in here, we should simply crash as we already saved 3646 # if anything goes wrong in here, we should simply crash as we already saved
3472 3647
3473 warn "flushing outstanding aio requests"; 3648 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; 3649 while (IO::AIO::nreqs || BDB::nreqs) {
3479 warn "iterate..."; 3650 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 } 3651 }
3505 3652
3506 warn "... nuking $pkg"; 3653 warn "cancelling all extension coros";
3507 Symbol::delete_package $pkg; 3654 $_->cancel for values %EXT_CORO;
3508 } 3655 %EXT_CORO = ();
3509 3656
3510 warn "unloading all perl modules loaded from $LIBDIR"; 3657 warn "removing commands";
3511 while (my ($k, $v) = each %INC) { 3658 %COMMAND = ();
3512 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3513 3659
3660 warn "removing ext/exti commands";
3661 %EXTCMD = ();
3662 %EXTICMD = ();
3663
3664 warn "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) {
3514 warn "... unloading $k"; 3666 warn "... unloading $pkg";
3515 delete $INC{$k};
3516 3667
3517 $k =~ s/\.pm$//;
3518 $k =~ s/\//::/g;
3519
3520 if (my $cb = $k->can ("unload_module")) { 3668 if (my $cb = $pkg->can ("unload")) {
3669 eval {
3521 $cb->(); 3670 $cb->($pkg);
3671 1
3672 } or warn "$pkg unloaded, but with errors: $@";
3673 }
3674
3675 warn "... clearing $pkg";
3676 clear_package $pkg;
3522 } 3677 }
3523 3678
3524 Symbol::delete_package $k; 3679 warn "unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682
3683 warn "... unloading $k";
3684 delete $INC{$k};
3685
3686 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g;
3688
3689 if (my $cb = $k->can ("unload_module")) {
3690 $cb->();
3691 }
3692
3693 clear_package $k;
3525 } 3694 }
3526 3695
3527 warn "getting rid of safe::, as good as possible"; 3696 warn "getting rid of safe::, as good as possible";
3528 Symbol::delete_package "safe::$_" 3697 clear_package "safe::$_"
3529 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3530 3699
3531 warn "unloading cf.pm \"a bit\""; 3700 warn "unloading cf.pm \"a bit\"";
3532 delete $INC{"cf.pm"}; 3701 delete $INC{"cf.pm"};
3533 delete $INC{"cf/pod.pm"}; 3702 delete $INC{"cf/pod.pm"};
3534 3703
3535 # don't, removes xs symbols, too, 3704 # don't, removes xs symbols, too,
3536 # and global variables created in xs 3705 # and global variables created in xs
3537 #Symbol::delete_package __PACKAGE__; 3706 #clear_package __PACKAGE__;
3538 3707
3539 warn "unload completed, starting to reload now"; 3708 warn "unload completed, starting to reload now";
3540 3709
3541 warn "reloading cf.pm"; 3710 warn "reloading cf.pm";
3542 require cf; 3711 require cf;
3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3544 3713
3545 warn "loading config and database again"; 3714 warn "loading config and database again";
3546 cf::reload_config; 3715 cf::reload_config;
3547 3716
3548 warn "loading extensions"; 3717 warn "loading extensions";
3549 cf::load_extensions; 3718 cf::load_extensions;
3550 3719
3551 warn "reattaching attachments to objects/players"; 3720 warn "reattaching attachments to objects/players";
3552 _global_reattach; # objects, sockets 3721 _global_reattach; # objects, sockets
3553 warn "reattaching attachments to maps"; 3722 warn "reattaching attachments to maps";
3554 reattach $_ for values %MAP; 3723 reattach $_ for values %MAP;
3555 warn "reattaching attachments to players"; 3724 warn "reattaching attachments to players";
3556 reattach $_ for values %PLAYER; 3725 reattach $_ for values %PLAYER;
3557 3726
3727 warn "running post_load";
3728 (pop @POST_INIT)->(1) while @POST_INIT;
3729
3558 warn "leaving sync_job"; 3730 warn "leaving sync_job";
3559 3731
3560 1 3732 1
3561 } or do { 3733 } or do {
3562 warn $@; 3734 warn $@;
3563 warn "error while reloading, exiting."; 3735 cf::cleanup "error while reloading, exiting.";
3564 exit 1;
3565 }; 3736 };
3566 3737
3567 warn "reloaded"; 3738 warn "reloaded";
3739 --$RELOAD;
3740 }
3568}; 3741};
3569 3742
3570our $RELOAD_WATCHER; # used only during reload 3743our $RELOAD_WATCHER; # used only during reload
3571 3744
3572sub reload_perl() { 3745sub reload_perl() {
3573 # doing reload synchronously and two reloads happen back-to-back, 3746 # doing reload synchronously and two reloads happen back-to-back,
3574 # coro crashes during coro_state_free->destroy here. 3747 # coro crashes during coro_state_free->destroy here.
3575 3748
3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3577 do_reload_perl; 3750 do_reload_perl;
3578 undef $RELOAD_WATCHER; 3751 undef $RELOAD_WATCHER;
3579 }; 3752 };
3580} 3753}
3581 3754
3597 3770
3598our @WAIT_FOR_TICK; 3771our @WAIT_FOR_TICK;
3599our @WAIT_FOR_TICK_BEGIN; 3772our @WAIT_FOR_TICK_BEGIN;
3600 3773
3601sub wait_for_tick { 3774sub wait_for_tick {
3602 return unless $TICK_WATCHER->is_active;
3603 return if $Coro::current == $Coro::main; 3775 return if tick_inhibit || $Coro::current == $Coro::main;
3604 3776
3605 my $signal = new Coro::Signal; 3777 my $signal = new Coro::Signal;
3606 push @WAIT_FOR_TICK, $signal; 3778 push @WAIT_FOR_TICK, $signal;
3607 $signal->wait; 3779 $signal->wait;
3608} 3780}
3609 3781
3610sub wait_for_tick_begin { 3782sub wait_for_tick_begin {
3611 return unless $TICK_WATCHER->is_active;
3612 return if $Coro::current == $Coro::main; 3783 return if tick_inhibit || $Coro::current == $Coro::main;
3613 3784
3614 my $signal = new Coro::Signal; 3785 my $signal = new Coro::Signal;
3615 push @WAIT_FOR_TICK_BEGIN, $signal; 3786 push @WAIT_FOR_TICK_BEGIN, $signal;
3616 $signal->wait; 3787 $signal->wait;
3617} 3788}
3618 3789
3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3790sub tick {
3620 if ($Coro::current != $Coro::main) { 3791 if ($Coro::current != $Coro::main) {
3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3792 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3622 unless ++$bug_warning > 10; 3793 unless ++$bug_warning > 10;
3623 return; 3794 return;
3624 } 3795 }
3625 3796
3626 $NOW = $tick_start = EV::now;
3627
3628 cf::server_tick; # one server iteration 3797 cf::server_tick; # one server iteration
3629
3630 $RUNTIME += $TICK;
3631 $NEXT_TICK = $_[0]->at;
3632 3798
3633 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3799 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3800 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3635 Coro::async_pool { 3801 Coro::async_pool {
3636 $Coro::current->{desc} = "runtime saver"; 3802 $Coro::current->{desc} = "runtime saver";
3637 write_runtime 3803 write_runtime_sync
3638 or warn "ERROR: unable to write runtime file: $!"; 3804 or warn "ERROR: unable to write runtime file: $!";
3639 }; 3805 };
3640 } 3806 }
3641 3807
3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3808 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3644 } 3810 }
3645 while (my $sig = shift @WAIT_FOR_TICK) { 3811 while (my $sig = shift @WAIT_FOR_TICK) {
3646 $sig->send; 3812 $sig->send;
3647 } 3813 }
3648 3814
3649 $LOAD = ($NOW - $tick_start) / $TICK; 3815 $LOAD = ($NOW - $TICK_START) / $TICK;
3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3816 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3651 3817
3652 _post_tick; 3818 if (0) {
3653}; 3819 if ($NEXT_TICK) {
3654$TICK_WATCHER->priority (EV::MAXPRI); 3820 my $jitter = $TICK_START - $NEXT_TICK;
3821 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3822 warn "jitter $JITTER\n";#d#
3823 }
3824 }
3825}
3655 3826
3656{ 3827{
3657 # configure BDB 3828 # configure BDB
3658 3829
3659 BDB::min_parallel 8; 3830 BDB::min_parallel 8;
3660 BDB::max_poll_reqs $TICK * 0.1; 3831 BDB::max_poll_reqs $TICK * 0.1;
3661 $Coro::BDB::WATCHER->priority (1); 3832 $AnyEvent::BDB::WATCHER->priority (1);
3662 3833
3663 unless ($DB_ENV) { 3834 unless ($DB_ENV) {
3664 $DB_ENV = BDB::db_env_create; 3835 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3836 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3666 | BDB::LOG_AUTOREMOVE, 1); 3837 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3838 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3839 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3840 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3669 3841
3670 cf::sync_job { 3842 cf::sync_job {
3671 eval { 3843 eval {
3697{ 3869{
3698 # configure IO::AIO 3870 # configure IO::AIO
3699 3871
3700 IO::AIO::min_parallel 8; 3872 IO::AIO::min_parallel 8;
3701 IO::AIO::max_poll_time $TICK * 0.1; 3873 IO::AIO::max_poll_time $TICK * 0.1;
3702 $Coro::AIO::WATCHER->priority (1); 3874 undef $AnyEvent::AIO::WATCHER;
3703} 3875}
3704 3876
3705my $_log_backtrace; 3877my $_log_backtrace;
3706 3878
3707sub _log_backtrace { 3879sub _log_backtrace {
3710 $msg =~ s/\n//; 3882 $msg =~ s/\n//;
3711 3883
3712 # limit the # of concurrent backtraces 3884 # limit the # of concurrent backtraces
3713 if ($_log_backtrace < 2) { 3885 if ($_log_backtrace < 2) {
3714 ++$_log_backtrace; 3886 ++$_log_backtrace;
3887 my $perl_bt = Carp::longmess $msg;
3715 async { 3888 async {
3716 $Coro::current->{desc} = "abt $msg"; 3889 $Coro::current->{desc} = "abt $msg";
3717 3890
3718 my @bt = fork_call { 3891 my @bt = fork_call {
3719 @addr = map { sprintf "%x", $_ } @addr; 3892 @addr = map { sprintf "%x", $_ } @addr;
3730 } 3903 }
3731 3904
3732 @funcs 3905 @funcs
3733 }; 3906 };
3734 3907
3735 LOG llevInfo, "[ABT] $msg\n"; 3908 LOG llevInfo, "[ABT] $perl_bt\n";
3909 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3736 LOG llevInfo, "[ABT] $_\n" for @bt; 3910 LOG llevInfo, "[ABT] $_\n" for @bt;
3737 --$_log_backtrace; 3911 --$_log_backtrace;
3738 }; 3912 };
3739 } else { 3913 } else {
3740 LOG llevInfo, "[ABT] $msg\n"; 3914 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines