ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.408 by root, Mon Jan 14 10:12:12 2008 UTC vs.
Revision 1.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;
192 LOG llevError, $msg; 224 LOG llevError, $msg;
193 }; 225 };
194} 226}
195 227
196$Coro::State::DIEHOOK = sub { 228$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "=="
230
231 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d#
234 }#d#
235
236 # kill coroutine otherwise
197 warn Carp::longmess $_[0]; 237 warn Carp::longmess $_[0];
198 Coro::terminate; 238 Coro::terminate
199}; 239};
240
241$SIG{__DIE__} = sub { }; #d#?
200 242
201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
211for my $pkg (qw( 253for my $pkg (qw(
212 cf::global cf::attachable 254 cf::global cf::attachable
213 cf::object cf::object::player 255 cf::object cf::object::player
214 cf::client cf::player 256 cf::client cf::player
215 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
216 cf::map cf::party cf::region 259 cf::party cf::region
217)) { 260)) {
218 no strict 'refs';
219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
220} 262}
221 263
222$EV::DIED = sub { 264$EV::DIED = sub {
223 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
265our $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
266 308
267sub encode_json($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
268sub decode_json($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
269 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
270=item cf::lock_wait $string 326=item cf::lock_wait $string
271 327
272Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
273 329
274=item my $lock = cf::lock_acquire $string 330=item my $lock = cf::lock_acquire $string
301 return;#d# 357 return;#d#
302 }#d# 358 }#d#
303 359
304 # wait for lock, if any 360 # wait for lock, if any
305 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
306 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
307 Coro::schedule; 364 Coro::schedule;
308 } 365 }
309} 366}
310 367
329 386
330 ! ! $LOCK{$key} 387 ! ! $LOCK{$key}
331} 388}
332 389
333sub freeze_mainloop { 390sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 391 tick_inhibit_inc;
335 392
336 my $guard = Coro::guard { 393 Coro::guard \&tick_inhibit_dec;
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 394}
342 395
343=item cf::periodic $interval, $cb 396=item cf::periodic $interval, $cb
344 397
345Like 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
400 } 453 }
401 } 454 }
402}; 455};
403 456
404sub get_slot($;$$) { 457sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main;
459
405 my ($time, $pri, $name) = @_; 460 my ($time, $pri, $name) = @_;
406 461
407 $time = $TICK * .6 if $time > $TICK * .6; 462 $time = $TICK * .6 if $time > $TICK * .6;
408 my $sig = new Coro::Signal; 463 my $sig = new Coro::Signal;
409 464
446 # this is the main coro, too bad, we have to block 501 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 502 # till the operation succeeds, freezing the server :/
448 503
449 LOG llevError, Carp::longmess "sync job";#d# 504 LOG llevError, Carp::longmess "sync job";#d#
450 505
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 506 my $freeze_guard = freeze_mainloop;
454 507
455 my $busy = 1; 508 my $busy = 1;
456 my @res; 509 my @res;
457 510
468 } else { 521 } else {
469 EV::loop EV::LOOP_ONESHOT; 522 EV::loop EV::LOOP_ONESHOT;
470 } 523 }
471 } 524 }
472 525
473 $time = EV::time - $time; 526 my $time = EV::time - $time;
474 527
475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
477
478 $tick_start += $time; # do not account sync jobs to server load 528 $TICK_START += $time; # do not account sync jobs to server load
479 529
480 wantarray ? @res : $res[0] 530 wantarray ? @res : $res[0]
481 } else { 531 } else {
482 # we are in another coroutine, how wonderful, everything just works 532 # we are in another coroutine, how wonderful, everything just works
483 533
525 reset_signals; 575 reset_signals;
526 &$cb 576 &$cb
527 }, @args; 577 }, @args;
528 578
529 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
530} 607}
531 608
532=item $value = cf::db_get $family => $key 609=item $value = cf::db_get $family => $key
533 610
534Returns a single value from the environment database. 611Returns a single value from the environment database.
673 750
674############################################################################# 751#############################################################################
675 752
676=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
677 754
678Many 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
679attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
680to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
681 758
682In 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>
683C<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
733=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
734 811
735Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
736given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
737 814
738Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
739that 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.
740 817
741These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
742 819
743=over 4 820=over 4
1034 1111
1035sub reattach { 1112sub reattach {
1036 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
1037 my ($obj) = @_; 1114 my ($obj) = @_;
1038 1115
1116 # no longer needed after getting rid of delete_package?
1039 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
1040 1118
1041 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
1042 1120
1043 @$registry = (); 1121 @$registry = ();
1044 1122
1090 utf8::decode (my $decname = $filename); 1168 utf8::decode (my $decname = $filename);
1091 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
1092 $decname, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
1093 1171
1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
1098 close $fh; 1176 aio_close $fh;
1099 1177
1100 if (@$objs) { 1178 if (@$objs) {
1101 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) {
1102 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
1105 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
1106 close $fh; 1184 aio_close $fh;
1107 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
1108 } 1186 }
1109 } else { 1187 } else {
1110 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1111 } 1189 }
1112 1190
1113 aio_rename "$filename~", $filename; 1191 aio_rename "$filename~", $filename;
1192
1193 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename;
1114 } else { 1195 } else {
1115 warn "FATAL: $filename~: $!\n"; 1196 warn "FATAL: $filename~: $!\n";
1116 } 1197 }
1117 } else { 1198 } else {
1118 aio_unlink $filename; 1199 aio_unlink $filename;
1280 1361
1281 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1282 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1283 1364
1284 $ext{source} = 1365 $ext{source} =
1285 "package $pkg; use strict; use utf8;\n" 1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1286 . "#line 1 \"$path\"\n{\n" 1367 . "#line 1 \"$path\"\n{\n"
1287 . $source 1368 . $source
1288 . "\n};\n1"; 1369 . "\n};\n1";
1289 1370
1290 $todo{$base} = \%ext; 1371 $todo{$base} = \%ext;
1306 my $msg = $@ ? "$v->{path}: $@\n" 1387 my $msg = $@ ? "$v->{path}: $@\n"
1307 : "$v->{base}: extension inactive.\n"; 1388 : "$v->{base}: extension inactive.\n";
1308 1389
1309 if (exists $v->{meta}{mandatory}) { 1390 if (exists $v->{meta}{mandatory}) {
1310 warn $msg; 1391 warn $msg;
1311 warn "mandatory extension failed to load, exiting.\n"; 1392 cf::cleanup "mandatory extension failed to load, exiting.";
1312 exit 1;
1313 } 1393 }
1314 1394
1315 warn $msg; 1395 warn $msg;
1316 } 1396 }
1317 1397
1331 1411
1332=back 1412=back
1333 1413
1334=head2 CORE EXTENSIONS 1414=head2 CORE EXTENSIONS
1335 1415
1336Functions and methods that extend core crossfire objects. 1416Functions and methods that extend core deliantra objects.
1337 1417
1338=cut 1418=cut
1339 1419
1340package cf::player; 1420package cf::player;
1341 1421
1384 1464
1385sub exists($) { 1465sub exists($) {
1386 my ($login) = @_; 1466 my ($login) = @_;
1387 1467
1388 $cf::PLAYER{$login} 1468 $cf::PLAYER{$login}
1389 or cf::sync_job { !aio_stat path $login } 1469 or !aio_stat path $login
1390} 1470}
1391 1471
1392sub find($) { 1472sub find($) {
1393 return $cf::PLAYER{$_[0]} || do { 1473 return $cf::PLAYER{$_[0]} || do {
1394 my $login = $_[0]; 1474 my $login = $_[0];
1406 my $f = new_from_file cf::object::thawer path $login 1486 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1487 or return;
1408 1488
1409 my $pl = cf::player::load_pl $f 1489 my $pl = cf::player::load_pl $f
1410 or return; 1490 or return;
1491
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1492 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1493 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1494 $cf::PLAYER{$login} = $pl
1414 } 1495 }
1415 } 1496 }
1425 1506
1426 return if $pl->{deny_save}; 1507 return if $pl->{deny_save};
1427 1508
1428 aio_mkdir playerdir $pl, 0770; 1509 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1510 $pl->{last_save} = $cf::RUNTIME;
1511
1512 cf::get_slot 0.01;
1430 1513
1431 $pl->save_pl ($path); 1514 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1515 cf::cede_to_tick;
1433} 1516}
1434 1517
1466 my ($pl) = @_; 1549 my ($pl) = @_;
1467 1550
1468 my $name = $pl->ob->name; 1551 my $name = $pl->ob->name;
1469 1552
1470 $pl->{deny_save} = 1; 1553 $pl->{deny_save} = 1;
1471 $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
1472 1555
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1474 $pl->deactivate; 1557 $pl->deactivate;
1558 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1559 $pl->ob->check_score;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1560 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1476 $pl->ns->destroy if $pl->ns; 1561 $pl->ns->destroy if $pl->ns;
1477 1562
1478 my $path = playerdir $pl; 1563 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1564 my $temp = "$path~$cf::RUNTIME~deleting~";
1518 1603
1519 for my $login (@$dirs) { 1604 for my $login (@$dirs) {
1520 my $path = path $login; 1605 my $path = path $login;
1521 1606
1522 # a .pst is a dead give-away for a valid player 1607 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1608 # if no pst file found, open and chekc for blocked users
1609 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1610 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1611 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1612 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1613 }
1528 1614
1559 } 1645 }
1560 1646
1561 \@paths 1647 \@paths
1562} 1648}
1563 1649
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1650=item $protocol_xml = $player->expand_cfpod ($cfpod)
1565 1651
1566Expand crossfire pod fragments into protocol xml. 1652Expand deliantra pod fragments into protocol xml.
1567
1568=cut
1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1581sub expand_cfpod {
1582 my ($self, $pod) = @_;
1583
1584 my $xml;
1585
1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1589
1590 $group =~ s/&/&amp;/g;
1591 $group =~ s/</&lt;/g;
1592
1593 $xml .= $group;
1594 } elsif ($pod =~ m%\G
1595 ([BCGHITU])
1596 <
1597 (?:
1598 ([^<>]*) (?{ $group = $^N })
1599 | < $interior >
1600 )
1601 >
1602 %gcsx
1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1623 "")
1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1635
1636 for ($xml) {
1637 # create single paragraphs (very hackish)
1638 s/(?<=\S)\n(?=\w)/ /g;
1639
1640 # compress some whitespace
1641 s/\s+\n/\n/g; # ws line-ends
1642 s/\n\n+/\n/g; # double lines
1643 s/^\n+//; # beginning lines
1644 s/\n+$//; # ending lines
1645 }
1646
1647 $xml
1648}
1649
1650no re 'eval';
1651
1652sub hintmode {
1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1654 $_[0]{hintmode}
1655}
1656 1653
1657=item $player->ext_reply ($msgid, @msg) 1654=item $player->ext_reply ($msgid, @msg)
1658 1655
1659Sends an ext reply to the player. 1656Sends an ext reply to the player.
1660 1657
1727our $MAX_RESET = 3600; 1724our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1725our $DEFAULT_RESET = 3000;
1729 1726
1730sub generate_random_map { 1727sub generate_random_map {
1731 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
1732 # mit "rum" bekleckern, nicht 1732 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1733 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1858 1858
1859# the temporary/swap location 1859# the temporary/swap location
1860sub save_path { 1860sub save_path {
1861 my ($self) = @_; 1861 my ($self) = @_;
1862 1862
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1864 "$TMPDIR/$path.map"
1865} 1865}
1866 1866
1867# the unique path, undef == no special unique path 1867# the unique path, undef == no special unique path
1868sub uniq_path { 1868sub uniq_path {
1869 my ($self) = @_; 1869 my ($self) = @_;
1870 1870
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1872 "$UNIQUEDIR/$path"
1873} 1873}
1874 1874
1875# and all this just because we cannot iterate over 1875# and all this just because we cannot iterate over
1876# all maps in C++... 1876# all maps in C++...
1974 1974
1975 cf::lock_wait "map_data:$path";#d#remove 1975 cf::lock_wait "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1977 1977
1978 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981 1981
1982 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1983 or return; 1983 or return;
1984 1984
1985 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1988 or return; 1988 or return;
1989 1989
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard2;
1993 undef $guard1; 1994 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 1995 $map->reset;
1996 return find $path; 1996 return find $path;
1997 } 1997 }
1998 1998
1999 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2027 $f->skip_block;
2028 $self->_load_objects ($f) 2028 $self->_load_objects ($f)
2029 or return; 2029 or return;
2030 2030
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->post_load_original
2032 if delete $self->{load_original}; 2032 if delete $self->{load_original};
2033 2033
2034 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2035 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2036 unless (aio_stat $uniq) {
2062 } 2062 }
2063 2063
2064 $self->{last_save} = $cf::RUNTIME; 2064 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2065 $self->last_access ($cf::RUNTIME);
2066 2066
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2067 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2068 }
2069 2069
2070 $self->post_load; 2070 $self->post_load;
2071} 2071}
2072 2072
2130 my ($path, $origin, $load) = @_; 2130 my ($path, $origin, $load) = @_;
2131 2131
2132 $path = normalise $path, $origin && $origin->{path}; 2132 $path = normalise $path, $origin && $origin->{path};
2133 2133
2134 if (my $map = $cf::MAP{$path}) { 2134 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2135 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2136 }
2137 2137
2138 $MAP_PREFETCH{$path} |= $load; 2138 $MAP_PREFETCH{$path} |= $load;
2139 2139
2140 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2177 cf::async { 2177 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2178 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
2180 }; 2180 };
2181 2181
2182 cf::get_slot 0.02;
2183
2182 if ($uniq) { 2184 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2186 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2187 } else {
2186 $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);
2194 $self->save; 2196 $self->save;
2195 2197
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2198 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2199
2198 return if $self->players; 2200 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY; 2201 return if $self->in_memory != cf::MAP_ACTIVE;
2200 return if $self->{deny_save}; 2202 return if $self->{deny_save};
2201 2203
2202 $self->in_memory (cf::MAP_SWAPPED); 2204 $self->in_memory (cf::MAP_SWAPPED);
2203 2205
2204 $self->deactivate; 2206 $self->deactivate;
2322 2324
2323sub unique_maps() { 2325sub unique_maps() {
2324 [ 2326 [
2325 map { 2327 map {
2326 utf8::decode $_; 2328 utf8::decode $_;
2327 /\.map$/ 2329 s/\.map$//; # TODO future compatibility hack
2330 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2331 ? ()
2328 ? normalise $_ 2332 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2333 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2334 ]
2332} 2335}
2333 2336
2334package cf;
2335
2336=back 2337=back
2337 2338
2338=head3 cf::object 2339=head3 cf::object
2339 2340
2340=cut 2341=cut
2343 2344
2344=over 4 2345=over 4
2345 2346
2346=item $ob->inv_recursive 2347=item $ob->inv_recursive
2347 2348
2348Returns 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.
2349 2351
2350=cut 2352=cut
2351 2353
2352sub inv_recursive_; 2354sub inv_recursive_;
2353sub inv_recursive_ { 2355sub inv_recursive_ {
2358 inv_recursive_ inv $_[0] 2360 inv_recursive_ inv $_[0]
2359} 2361}
2360 2362
2361=item $ref = $ob->ref 2363=item $ref = $ob->ref
2362 2364
2363creates 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.
2364 2366
2365=item $ob = cf::object::deref ($refstring) 2367=item $ob = cf::object::deref ($refstring)
2366 2368
2367returns 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,
2368even if the object actually exists. May block. 2370even if the object actually exists. May block.
2400can 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
2401dialogue with the given NPC character. 2403dialogue with the given NPC character.
2402 2404
2403=cut 2405=cut
2404 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
2405# rough implementation of a future "reply" method that works 2421# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2422# with dialog boxes.
2407#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
2408sub cf::object::player::reply($$$;$) { 2424sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2425 my ($self, $npc, $msg, $flags) = @_;
2420 my $dialog = $pl->{npc_dialog}; 2436 my $dialog = $pl->{npc_dialog};
2421 $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));
2422 2438
2423 } else { 2439 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2440 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2441 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2442 }
2427 } 2443 }
2428} 2444}
2429 2445
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2446=item $object->send_msg ($channel, $msg, $color, [extra...])
2455 2471
2456=item $player_object->enter_link 2472=item $player_object->enter_link
2457 2473
2458Freezes 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}>).
2459 2475
2460The 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.
2461I<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.
2462 2480
2463Will never block. 2481Will never block.
2464 2482
2465=item $player_object->leave_link ($map, $x, $y) 2483=item $player_object->leave_link ($map, $x, $y)
2466 2484
2524 2542
2525 $map->load; 2543 $map->load;
2526 $map->load_neighbours; 2544 $map->load_neighbours;
2527 2545
2528 return unless $self->contr->active; 2546 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2529 $self->activate_recursive; 2548 $self->activate_recursive;
2530 2549
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2551 $self->enter_map ($map, $x, $y);
2533} 2552}
2537Moves 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
2538her, loading and preparing them map, calling the provided $check callback 2557her, loading and preparing them map, calling the provided $check callback
2539that 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
2540the 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
2541be 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 >>.
2542 2564
2543=cut 2565=cut
2544 2566
2545our $GOTOGEN; 2567our $GOTOGEN;
2546 2568
2625} 2647}
2626 2648
2627sub prepare_random_map { 2649sub prepare_random_map {
2628 my ($exit) = @_; 2650 my ($exit) = @_;
2629 2651
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2652 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2653 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2654 # that depends on the exit object
2635 2655
2636 my $rmp = parse_random_map_params $exit->msg; 2656 my $rmp = parse_random_map_params $exit->msg;
2638 if ($exit->map) { 2658 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2659 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2660 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2661 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2662 $rmp->{origin_y} = $exit->y;
2663
2664 $exit->map->touch;
2643 } 2665 }
2644 2666
2645 $rmp->{random_seed} ||= $exit->random_seed; 2667 $rmp->{random_seed} ||= $exit->random_seed;
2646 2668
2647 my $data = cf::encode_json $rmp; 2669 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2670 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2671 my $meta = "$RANDOMDIR/$md5.meta";
2650 2672
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2673 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2674 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2675 undef $fh;
2654 aio_rename "$meta~", $meta; 2676 aio_rename "$meta~", $meta;
2655 2677
2678 my $slaying = "?random/$md5";
2679
2680 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2681 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2682 $exit->msg (undef);
2683 }
2658 } 2684 }
2659} 2685}
2660 2686
2661sub cf::object::player::enter_exit { 2687sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2688 my ($self, $exit) = @_;
2663 2689
2664 return unless $self->type == cf::PLAYER; 2690 return unless $self->type == cf::PLAYER;
2665 2691
2666 if ($exit->slaying eq "/!") {
2667 #TODO: this should de-fi-ni-te-ly not be a sync-job
2668 # the problem is that $exit might not survive long enough
2669 # so it needs to be done right now, right here
2670 cf::sync_job { prepare_random_map $exit };
2671 }
2672
2673 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2674 my $hp = $exit->stats->hp;
2675 my $sp = $exit->stats->sp;
2676
2677 $self->enter_link; 2692 $self->enter_link;
2678 2693
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
2683 (async { 2694 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2695 $Coro::current->{desc} = "enter_exit";
2685 2696
2686 $self->deactivate_recursive; # just to be sure
2687 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
2688 $self->goto ($slaying, $hp, $sp); 2712 $self->goto ($map, $x, $y);
2689 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
2690 1; 2718 1
2691 }) { 2719 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2720 $self->message ("Something went wrong deep within the deliantra server. "
2693 . "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. "
2694 . "Please report this to the dungeon master!", 2722 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2723 cf::NDI_UNIQUE | cf::NDI_RED);
2696 2724
2697 warn "ERROR in enter_exit: $@"; 2725 warn "ERROR in enter_exit: $@";
2763 id => "infobox", 2791 id => "infobox",
2764 title => "Body Parts", 2792 title => "Body Parts",
2765 reply => undef, 2793 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available", 2794 tooltip => "Shows which body parts you posess and are available",
2767 }, 2795 },
2796 "c/skills" => {
2797 id => "infobox",
2798 title => "Skills",
2799 reply => undef,
2800 tooltip => "Shows your experience per skill and item power",
2801 },
2768 "c/uptime" => { 2802 "c/uptime" => {
2769 id => "infobox", 2803 id => "infobox",
2770 title => "Uptime", 2804 title => "Uptime",
2771 reply => undef, 2805 reply => undef,
2772 tooltip => "How long the server has been running since last restart", 2806 tooltip => "How long the server has been running since last restart",
2775 id => "infobox", 2809 id => "infobox",
2776 title => "Map Info", 2810 title => "Map Info",
2777 reply => undef, 2811 reply => undef,
2778 tooltip => "Information related to the maps", 2812 tooltip => "Information related to the maps",
2779 }, 2813 },
2814 "c/party" => {
2815 id => "party",
2816 title => "Party",
2817 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party",
2819 },
2780); 2820);
2781 2821
2782sub cf::client::send_msg { 2822sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 2823 my ($self, $channel, $msg, $color, @extra) = @_;
2784 2824
2785 $msg = $self->pl->expand_cfpod ($msg); 2825 $msg = $self->pl->expand_cfpod ($msg)
2826 unless $color & cf::NDI_VERBATIM;
2786 2827
2787 $color &= cf::NDI_CLIENT_MASK; # just in case... 2828 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788 2829
2789 # check predefined channels, for the benefit of C 2830 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) { 2831 if ($CHANNEL{$channel}) {
2811 if ($self->can_msg) { 2852 if ($self->can_msg) {
2812 # default colour, mask it out 2853 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2815 2856
2816 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2857 my $pkt = "msg "
2858 . $self->{json_coder}->encode (
2817 [$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);
2818 } else { 2873 } else {
2819 if ($color >= 0) { 2874 if ($color >= 0) {
2820 # replace some tags by gcfclient-compatible ones 2875 # replace some tags by gcfclient-compatible ones
2821 for ($msg) { 2876 for ($msg) {
2822 1 while 2877 1 while
3021 3076
3022The following functions and methods are available within a safe environment: 3077The following functions and methods are available within a safe environment:
3023 3078
3024 cf::object 3079 cf::object
3025 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
3026 insert remove name archname title slaying race decrease_ob_nr 3081 insert remove name archname title slaying race decrease split
3027 3082
3028 cf::object::player 3083 cf::object::player
3029 player 3084 player
3030 3085
3031 cf::player 3086 cf::player
3036 3091
3037=cut 3092=cut
3038 3093
3039for ( 3094for (
3040 ["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
3041 insert remove inv name archname title slaying race 3096 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3097 decrease split destroy change_exp)],
3043 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful)],
3045 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
3046) { 3101) {
3047 no strict 'refs'; 3102 no strict 'refs';
3255 while (my ($k, $v) = each %$want) { 3310 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3311 $ns->fx_want ($k, $v);
3257 } 3312 }
3258}; 3313};
3259 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
3260sub reload_regions { 3325sub reload_regions {
3261 # 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
3262 # for this (global event?) 3327 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3328 %ext::player_env::MUSIC_FACE_CACHE = ();
3264 3329
3277} 3342}
3278 3343
3279sub reload_archetypes { 3344sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
3285 load_resource_file "$DATADIR/archetypes"
3286 or die "unable to load archetypes\n";
3287} 3347}
3288 3348
3289sub reload_treasures { 3349sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
3292} 3352}
3293 3353
3294sub reload_resources { 3354sub reload_resources {
3295 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
3296 3356
3357 reload_facedata;
3358 reload_archetypes;
3297 reload_regions; 3359 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3360 reload_treasures;
3302 3361
3303 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
3304}
3305
3306sub init {
3307 reload_resources;
3308} 3363}
3309 3364
3310sub reload_config { 3365sub reload_config {
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
3312 or return; 3367 or return;
3326 }; 3381 };
3327 warn $@ if $@; 3382 warn $@ if $@;
3328 } 3383 }
3329} 3384}
3330 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
3331sub 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
3332 # we must not ever block the main coroutine 3421 # we must not ever block the main coroutine
3333 local $Coro::idle = sub { 3422 local $Coro::idle = sub {
3334 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#
3335 (async { 3424 (async {
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3425 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3426 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3427 })->prio (Coro::PRIO_MAX);
3339 }; 3428 };
3340 3429
3430 evthread_start IO::AIO::poll_fileno;
3431
3432 cf::sync_job {
3433 reload_resources;
3341 reload_config; 3434 reload_config;
3342 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
3343 load_extensions; 3448 load_extensions;
3344 3449
3345 $TICK_WATCHER->start; 3450 utime time, time, $RUNTIMEFILE;
3346 $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
3347 EV::loop; 3458 EV::loop;
3348} 3459}
3349 3460
3350############################################################################# 3461#############################################################################
3351# initialisation and cleanup 3462# initialisation and cleanup
3358 cf::cleanup "SIG$signal"; 3469 cf::cleanup "SIG$signal";
3359 }; 3470 };
3360 } 3471 }
3361} 3472}
3362 3473
3363sub write_runtime { 3474sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime";
3365
3366 # first touch the runtime file to show we are still running: 3475 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3476 # the fsync below can take a very very long time.
3368 3477
3369 IO::AIO::aio_utime $runtime, undef, undef; 3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3370 3479
3371 my $guard = cf::lock_acquire "write_runtime"; 3480 my $guard = cf::lock_acquire "write_runtime";
3372 3481
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3374 or return; 3483 or return;
3375 3484
3376 my $value = $cf::RUNTIME + 90 + 10; 3485 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock 3486 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server. 3487 # 60 allows for the watchdog to kill the server.
3388 aio_utime $fh, undef, undef; 3497 aio_utime $fh, undef, undef;
3389 3498
3390 close $fh 3499 close $fh
3391 or return; 3500 or return;
3392 3501
3393 aio_rename "$runtime~", $runtime 3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3394 and return; 3503 and return;
3395 3504
3396 warn "runtime file written.\n"; 3505 warn "runtime file written.\n";
3397 3506
3398 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 };
3399} 3558}
3400 3559
3401sub emergency_save() { 3560sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3561 my $freeze_guard = cf::freeze_mainloop;
3403 3562
3425 warn "end emergency map save\n"; 3584 warn "end emergency map save\n";
3426 3585
3427 warn "begin emergency database checkpoint\n"; 3586 warn "begin emergency database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3587 BDB::db_env_txn_checkpoint $DB_ENV;
3429 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";
3430 }; 3593 };
3431 3594
3432 warn "leave emergency perl save\n"; 3595 warn "leave emergency perl save\n";
3433} 3596}
3434 3597
3435sub post_cleanup { 3598sub post_cleanup {
3436 my ($make_core) = @_; 3599 my ($make_core) = @_;
3437 3600
3438 warn Carp::longmess "post_cleanup backtrace" 3601 warn Carp::longmess "post_cleanup backtrace"
3439 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#
3440} 3632}
3441 3633
3442sub do_reload_perl() { 3634sub do_reload_perl() {
3443 # can/must only be called in main 3635 # can/must only be called in main
3444 if ($Coro::current != $Coro::main) { 3636 if ($Coro::current != $Coro::main) {
3445 warn "can only reload from main coroutine"; 3637 warn "can only reload from main coroutine";
3446 return; 3638 return;
3447 } 3639 }
3448 3640
3641 return if $RELOAD++;
3642
3643 while ($RELOAD) {
3449 warn "reloading..."; 3644 warn "reloading...";
3450 3645
3451 warn "entering sync_job"; 3646 warn "entering sync_job";
3452 3647
3453 cf::sync_job { 3648 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark 3649 cf::write_runtime_sync; # external watchdog should not bark
3455 cf::emergency_save; 3650 cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark 3651 cf::write_runtime_sync; # external watchdog should not bark
3457 3652
3458 warn "syncing database to disk"; 3653 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV; 3654 BDB::db_env_txn_checkpoint $DB_ENV;
3460 3655
3461 # 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
3462 3657
3463 warn "flushing outstanding aio requests"; 3658 warn "flushing outstanding aio requests";
3464 for (;;) {
3465 BDB::flush;
3466 IO::AIO::flush;
3467 Coro::cede_notself;
3468 last unless IO::AIO::nreqs || BDB::nreqs; 3659 while (IO::AIO::nreqs || BDB::nreqs) {
3469 warn "iterate..."; 3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3470 }
3471
3472 ++$RELOAD;
3473
3474 warn "cancelling all extension coros";
3475 $_->cancel for values %EXT_CORO;
3476 %EXT_CORO = ();
3477
3478 warn "removing commands";
3479 %COMMAND = ();
3480
3481 warn "removing ext/exti commands";
3482 %EXTCMD = ();
3483 %EXTICMD = ();
3484
3485 warn "unloading/nuking all extensions";
3486 for my $pkg (@EXTS) {
3487 warn "... unloading $pkg";
3488
3489 if (my $cb = $pkg->can ("unload")) {
3490 eval {
3491 $cb->($pkg);
3492 1
3493 } or warn "$pkg unloaded, but with errors: $@";
3494 } 3661 }
3495 3662
3496 warn "... nuking $pkg"; 3663 warn "cancelling all extension coros";
3497 Symbol::delete_package $pkg; 3664 $_->cancel for values %EXT_CORO;
3498 } 3665 %EXT_CORO = ();
3499 3666
3500 warn "unloading all perl modules loaded from $LIBDIR"; 3667 warn "removing commands";
3501 while (my ($k, $v) = each %INC) { 3668 %COMMAND = ();
3502 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503 3669
3670 warn "removing ext/exti commands";
3671 %EXTCMD = ();
3672 %EXTICMD = ();
3673
3674 warn "unloading/nuking all extensions";
3675 for my $pkg (@EXTS) {
3504 warn "... unloading $k"; 3676 warn "... unloading $pkg";
3505 delete $INC{$k};
3506 3677
3507 $k =~ s/\.pm$//;
3508 $k =~ s/\//::/g;
3509
3510 if (my $cb = $k->can ("unload_module")) { 3678 if (my $cb = $pkg->can ("unload")) {
3679 eval {
3511 $cb->(); 3680 $cb->($pkg);
3681 1
3682 } or warn "$pkg unloaded, but with errors: $@";
3683 }
3684
3685 warn "... clearing $pkg";
3686 clear_package $pkg;
3512 } 3687 }
3513 3688
3514 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;
3515 } 3704 }
3516 3705
3517 warn "getting rid of safe::, as good as possible"; 3706 warn "getting rid of safe::, as good as possible";
3518 Symbol::delete_package "safe::$_" 3707 clear_package "safe::$_"
3519 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);
3520 3709
3521 warn "unloading cf.pm \"a bit\""; 3710 warn "unloading cf.pm \"a bit\"";
3522 delete $INC{"cf.pm"}; 3711 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"}; 3712 delete $INC{"cf/pod.pm"};
3524 3713
3525 # don't, removes xs symbols, too, 3714 # don't, removes xs symbols, too,
3526 # and global variables created in xs 3715 # and global variables created in xs
3527 #Symbol::delete_package __PACKAGE__; 3716 #clear_package __PACKAGE__;
3528 3717
3529 warn "unload completed, starting to reload now"; 3718 warn "unload completed, starting to reload now";
3530 3719
3531 warn "reloading cf.pm"; 3720 warn "reloading cf.pm";
3532 require cf; 3721 require cf;
3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3534 3723
3535 warn "loading config and database again"; 3724 warn "loading config and database again";
3536 cf::reload_config; 3725 cf::reload_config;
3537 3726
3538 warn "loading extensions"; 3727 warn "loading extensions";
3539 cf::load_extensions; 3728 cf::load_extensions;
3540 3729
3541 warn "reattaching attachments to objects/players"; 3730 warn "reattaching attachments to objects/players";
3542 _global_reattach; # objects, sockets 3731 _global_reattach; # objects, sockets
3543 warn "reattaching attachments to maps"; 3732 warn "reattaching attachments to maps";
3544 reattach $_ for values %MAP; 3733 reattach $_ for values %MAP;
3545 warn "reattaching attachments to players"; 3734 warn "reattaching attachments to players";
3546 reattach $_ for values %PLAYER; 3735 reattach $_ for values %PLAYER;
3547 3736
3737 warn "running post_load";
3738 (pop @POST_INIT)->(1) while @POST_INIT;
3739
3548 warn "leaving sync_job"; 3740 warn "leaving sync_job";
3549 3741
3550 1 3742 1
3551 } or do { 3743 } or do {
3552 warn $@; 3744 warn $@;
3553 warn "error while reloading, exiting."; 3745 cf::cleanup "error while reloading, exiting.";
3554 exit 1;
3555 }; 3746 };
3556 3747
3557 warn "reloaded"; 3748 warn "reloaded";
3749 --$RELOAD;
3750 }
3558}; 3751};
3559 3752
3560our $RELOAD_WATCHER; # used only during reload 3753our $RELOAD_WATCHER; # used only during reload
3561 3754
3562sub reload_perl() { 3755sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 3756 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 3757 # coro crashes during coro_state_free->destroy here.
3565 3758
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3760 do_reload_perl;
3567 undef $RELOAD_WATCHER; 3761 undef $RELOAD_WATCHER;
3568 do_reload_perl;
3569 }; 3762 };
3570} 3763}
3571 3764
3572register_command "reload" => sub { 3765register_command "reload" => sub {
3573 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
3587 3780
3588our @WAIT_FOR_TICK; 3781our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 3782our @WAIT_FOR_TICK_BEGIN;
3590 3783
3591sub wait_for_tick { 3784sub wait_for_tick {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 3785 return if tick_inhibit || $Coro::current == $Coro::main;
3594 3786
3595 my $signal = new Coro::Signal; 3787 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 3788 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 3789 $signal->wait;
3598} 3790}
3599 3791
3600sub wait_for_tick_begin { 3792sub wait_for_tick_begin {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3603 3794
3604 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 3796 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 3797 $signal->wait;
3607} 3798}
3608 3799
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3800sub tick {
3610 if ($Coro::current != $Coro::main) { 3801 if ($Coro::current != $Coro::main) {
3611 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"
3612 unless ++$bug_warning > 10; 3803 unless ++$bug_warning > 10;
3613 return; 3804 return;
3614 } 3805 }
3615 3806
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 3807 cf::server_tick; # one server iteration
3619
3620 $RUNTIME += $TICK;
3621 $NEXT_TICK = $_[0]->at;
3622 3808
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3809 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $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.;
3625 Coro::async_pool { 3811 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 3812 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 3813 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 3814 or warn "ERROR: unable to write runtime file: $!";
3629 }; 3815 };
3630 } 3816 }
3631 3817
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3634 } 3820 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 3821 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 3822 $sig->send;
3637 } 3823 }
3638 3824
3639 $LOAD = ($NOW - $tick_start) / $TICK; 3825 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 3827
3642 _post_tick; 3828 if (0) {
3643}; 3829 if ($NEXT_TICK) {
3644$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}
3645 3836
3646{ 3837{
3647 # configure BDB 3838 # configure BDB
3648 3839
3649 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3650 BDB::max_poll_reqs $TICK * 0.1; 3841 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 3842 $AnyEvent::BDB::WATCHER->priority (1);
3652 3843
3653 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | 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;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 3851
3660 cf::sync_job { 3852 cf::sync_job {
3661 eval { 3853 eval {
3687{ 3879{
3688 # configure IO::AIO 3880 # configure IO::AIO
3689 3881
3690 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 3884 undef $AnyEvent::AIO::WATCHER;
3693} 3885}
3694 3886
3695my $_log_backtrace; 3887my $_log_backtrace;
3696 3888
3697sub _log_backtrace { 3889sub _log_backtrace {
3700 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3701 3893
3702 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3705 async { 3898 async {
3706 $Coro::current->{desc} = "abt $msg"; 3899 $Coro::current->{desc} = "abt $msg";
3707 3900
3708 my @bt = fork_call { 3901 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3720 } 3913 }
3721 3914
3722 @funcs 3915 @funcs
3723 }; 3916 };
3724 3917
3725 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 3921 --$_log_backtrace;
3728 }; 3922 };
3729 } else { 3923 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines