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.404 by root, Mon Dec 17 07:27:58 2007 UTC vs.
Revision 1.454 by root, Thu Sep 25 12:14:32 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::Syck (); 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# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 74
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 76
51our %COMMAND = (); 77our %COMMAND = ();
52our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
55our %EXTCMD = (); 81our %EXTCMD = ();
56our %EXTICMD = (); 82our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
59 85
60our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 87our @EVENT;
62 88
63our $CONFDIR = confdir; 89our $CONFDIR = confdir;
64our $DATADIR = datadir; 90our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
74 104
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 107our $NEXT_TICK;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
81 109
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 110our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 111our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 112our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 113our $DB_ENV;
87 114
98# 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 ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 127
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
132
133our @POST_INIT;
104 134
105binmode STDOUT; 135binmode STDOUT;
106binmode STDERR; 136binmode STDERR;
107 137
108# read virtual server time, if available 138# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
113} 143}
114 144
115mkdir $_ 145mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 223
194 LOG llevError, $msg; 224 LOG llevError, $msg;
195 }; 225 };
196} 226}
227
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
237 warn Carp::longmess $_[0];
238 Coro::terminate
239};
240
241$SIG{__DIE__} = sub { }; #d#?
197 242
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 253for my $pkg (qw(
209 cf::global cf::attachable 254 cf::global cf::attachable
210 cf::object cf::object::player 255 cf::object cf::object::player
211 cf::client cf::player 256 cf::client cf::player
212 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
213 cf::map cf::party cf::region 259 cf::party cf::region
214)) { 260)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 262}
218 263
219$EV::DIED = sub { 264$EV::DIED = sub {
220 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
262our $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
263 308
264sub encode_json($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
265sub decode_json($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
266 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
267=item cf::lock_wait $string 326=item cf::lock_wait $string
268 327
269Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
270 329
271=item my $lock = cf::lock_acquire $string 330=item my $lock = cf::lock_acquire $string
298 return;#d# 357 return;#d#
299 }#d# 358 }#d#
300 359
301 # wait for lock, if any 360 # wait for lock, if any
302 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
303 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule; 364 Coro::schedule;
305 } 365 }
306} 366}
307 367
326 386
327 ! ! $LOCK{$key} 387 ! ! $LOCK{$key}
328} 388}
329 389
330sub freeze_mainloop { 390sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 391 tick_inhibit_inc;
332 392
333 my $guard = Coro::guard { 393 Coro::guard \&tick_inhibit_dec;
334 $TICK_WATCHER->start;
335 };
336 $TICK_WATCHER->stop;
337 $guard
338} 394}
339 395
340=item cf::periodic $interval, $cb 396=item cf::periodic $interval, $cb
341 397
342Like 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
397 } 453 }
398 } 454 }
399}; 455};
400 456
401sub get_slot($;$$) { 457sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main;
459
402 my ($time, $pri, $name) = @_; 460 my ($time, $pri, $name) = @_;
403 461
404 $time = $TICK * .6 if $time > $TICK * .6; 462 $time = $TICK * .6 if $time > $TICK * .6;
405 my $sig = new Coro::Signal; 463 my $sig = new Coro::Signal;
406 464
443 # this is the main coro, too bad, we have to block 501 # this is the main coro, too bad, we have to block
444 # till the operation succeeds, freezing the server :/ 502 # till the operation succeeds, freezing the server :/
445 503
446 LOG llevError, Carp::longmess "sync job";#d# 504 LOG llevError, Carp::longmess "sync job";#d#
447 505
448 # TODO: use suspend/resume instead
449 # (but this is cancel-safe)
450 my $freeze_guard = freeze_mainloop; 506 my $freeze_guard = freeze_mainloop;
451 507
452 my $busy = 1; 508 my $busy = 1;
453 my @res; 509 my @res;
454 510
465 } else { 521 } else {
466 EV::loop EV::LOOP_ONESHOT; 522 EV::loop EV::LOOP_ONESHOT;
467 } 523 }
468 } 524 }
469 525
470 $time = EV::time - $time; 526 my $time = EV::time - $time;
471 527
472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
474
475 $tick_start += $time; # do not account sync jobs to server load 528 $TICK_START += $time; # do not account sync jobs to server load
476 529
477 wantarray ? @res : $res[0] 530 wantarray ? @res : $res[0]
478 } else { 531 } else {
479 # we are in another coroutine, how wonderful, everything just works 532 # we are in another coroutine, how wonderful, everything just works
480 533
522 reset_signals; 575 reset_signals;
523 &$cb 576 &$cb
524 }, @args; 577 }, @args;
525 578
526 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
527} 607}
528 608
529=item $value = cf::db_get $family => $key 609=item $value = cf::db_get $family => $key
530 610
531Returns a single value from the environment database. 611Returns a single value from the environment database.
670 750
671############################################################################# 751#############################################################################
672 752
673=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
674 754
675Many 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
676attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
677to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
678 758
679In 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>
680C<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
730=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
731 811
732Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
733given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
734 814
735Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
736that 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.
737 817
738These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
739 819
740=over 4 820=over 4
968 } 1048 }
969 1049
970 0 1050 0
971} 1051}
972 1052
973=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1053=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
974 1054
975=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
976 1056
977Generate an object-specific event with the given arguments. 1057Generate an object-specific event with the given arguments.
978 1058
1031 1111
1032sub reattach { 1112sub reattach {
1033 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
1034 my ($obj) = @_; 1114 my ($obj) = @_;
1035 1115
1116 # no longer needed after getting rid of delete_package?
1036 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
1037 1118
1038 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
1039 1120
1040 @$registry = (); 1121 @$registry = ();
1041 1122
1087 utf8::decode (my $decname = $filename); 1168 utf8::decode (my $decname = $filename);
1088 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
1089 $decname, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
1090 1171
1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1092 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1094 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
1095 close $fh; 1176 aio_close $fh;
1096 1177
1097 if (@$objs) { 1178 if (@$objs) {
1098 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) {
1099 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1101 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
1102 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
1103 close $fh; 1184 aio_close $fh;
1104 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
1105 } 1186 }
1106 } else { 1187 } else {
1107 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1108 } 1189 }
1277 1358
1278 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1279 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1280 1361
1281 $ext{source} = 1362 $ext{source} =
1282 "package $pkg; use strict; use utf8;\n" 1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1283 . "#line 1 \"$path\"\n{\n" 1364 . "#line 1 \"$path\"\n{\n"
1284 . $source 1365 . $source
1285 . "\n};\n1"; 1366 . "\n};\n1";
1286 1367
1287 $todo{$base} = \%ext; 1368 $todo{$base} = \%ext;
1303 my $msg = $@ ? "$v->{path}: $@\n" 1384 my $msg = $@ ? "$v->{path}: $@\n"
1304 : "$v->{base}: extension inactive.\n"; 1385 : "$v->{base}: extension inactive.\n";
1305 1386
1306 if (exists $v->{meta}{mandatory}) { 1387 if (exists $v->{meta}{mandatory}) {
1307 warn $msg; 1388 warn $msg;
1308 warn "mandatory extension failed to load, exiting.\n"; 1389 cf::cleanup "mandatory extension failed to load, exiting.";
1309 exit 1;
1310 } 1390 }
1311 1391
1312 warn $msg; 1392 warn $msg;
1313 } 1393 }
1314 1394
1328 1408
1329=back 1409=back
1330 1410
1331=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1332 1412
1333Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1334 1414
1335=cut 1415=cut
1336 1416
1337package cf::player; 1417package cf::player;
1338 1418
1381 1461
1382sub exists($) { 1462sub exists($) {
1383 my ($login) = @_; 1463 my ($login) = @_;
1384 1464
1385 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1386 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1387} 1467}
1388 1468
1389sub find($) { 1469sub find($) {
1390 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1391 my $login = $_[0]; 1471 my $login = $_[0];
1403 my $f = new_from_file cf::object::thawer path $login 1483 my $f = new_from_file cf::object::thawer path $login
1404 or return; 1484 or return;
1405 1485
1406 my $pl = cf::player::load_pl $f 1486 my $pl = cf::player::load_pl $f
1407 or return; 1487 or return;
1488
1408 local $cf::PLAYER_LOADING{$login} = $pl; 1489 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs; 1490 $f->resolve_delayed_derefs;
1410 $cf::PLAYER{$login} = $pl 1491 $cf::PLAYER{$login} = $pl
1411 } 1492 }
1412 } 1493 }
1422 1503
1423 return if $pl->{deny_save}; 1504 return if $pl->{deny_save};
1424 1505
1425 aio_mkdir playerdir $pl, 0770; 1506 aio_mkdir playerdir $pl, 0770;
1426 $pl->{last_save} = $cf::RUNTIME; 1507 $pl->{last_save} = $cf::RUNTIME;
1508
1509 cf::get_slot 0.01;
1427 1510
1428 $pl->save_pl ($path); 1511 $pl->save_pl ($path);
1429 cf::cede_to_tick; 1512 cf::cede_to_tick;
1430} 1513}
1431 1514
1463 my ($pl) = @_; 1546 my ($pl) = @_;
1464 1547
1465 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1466 1549
1467 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1468 $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
1469 1552
1470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1471 $pl->deactivate; 1554 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1472 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1557 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1473 $pl->ns->destroy if $pl->ns; 1558 $pl->ns->destroy if $pl->ns;
1474 1559
1475 my $path = playerdir $pl; 1560 my $path = playerdir $pl;
1476 my $temp = "$path~$cf::RUNTIME~deleting~"; 1561 my $temp = "$path~$cf::RUNTIME~deleting~";
1515 1600
1516 for my $login (@$dirs) { 1601 for my $login (@$dirs) {
1517 my $path = path $login; 1602 my $path = path $login;
1518 1603
1519 # a .pst is a dead give-away for a valid player 1604 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") { 1605 # if no pst file found, open and chekc for blocked users
1606 if (aio_stat "$path.pst") {
1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1607 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1522 aio_read $fh, 0, 512, my $buf, 0 or next; 1608 aio_read $fh, 0, 512, my $buf, 0 or next;
1523 $buf !~ /^password -------------$/m or next; # official not-valid tag 1609 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 } 1610 }
1525 1611
1556 } 1642 }
1557 1643
1558 \@paths 1644 \@paths
1559} 1645}
1560 1646
1561=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1562 1648
1563Expand crossfire pod fragments into protocol xml. 1649Expand deliantra pod fragments into protocol xml.
1564
1565=cut
1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1578sub expand_cfpod {
1579 my ($self, $pod) = @_;
1580
1581 my $xml;
1582
1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1586
1587 $group =~ s/&/&amp;/g;
1588 $group =~ s/</&lt;/g;
1589
1590 $xml .= $group;
1591 } elsif ($pod =~ m%\G
1592 ([BCGHITU])
1593 <
1594 (?:
1595 ([^<>]*) (?{ $group = $^N })
1596 | < $interior >
1597 )
1598 >
1599 %gcsx
1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1620 "")
1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1632
1633 for ($xml) {
1634 # create single paragraphs (very hackish)
1635 s/(?<=\S)\n(?=\w)/ /g;
1636
1637 # compress some whitespace
1638 s/\s+\n/\n/g; # ws line-ends
1639 s/\n\n+/\n/g; # double lines
1640 s/^\n+//; # beginning lines
1641 s/\n+$//; # ending lines
1642 }
1643
1644 $xml
1645}
1646
1647no re 'eval';
1648
1649sub hintmode {
1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1651 $_[0]{hintmode}
1652}
1653 1650
1654=item $player->ext_reply ($msgid, @msg) 1651=item $player->ext_reply ($msgid, @msg)
1655 1652
1656Sends an ext reply to the player. 1653Sends an ext reply to the player.
1657 1654
1724our $MAX_RESET = 3600; 1721our $MAX_RESET = 3600;
1725our $DEFAULT_RESET = 3000; 1722our $DEFAULT_RESET = 3000;
1726 1723
1727sub generate_random_map { 1724sub generate_random_map {
1728 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
1729 # mit "rum" bekleckern, nicht 1729 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1730 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1855 1855
1856# the temporary/swap location 1856# the temporary/swap location
1857sub save_path { 1857sub save_path {
1858 my ($self) = @_; 1858 my ($self) = @_;
1859 1859
1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861 "$TMPDIR/$path.map" 1861 "$TMPDIR/$path.map"
1862} 1862}
1863 1863
1864# the unique path, undef == no special unique path 1864# the unique path, undef == no special unique path
1865sub uniq_path { 1865sub uniq_path {
1866 my ($self) = @_; 1866 my ($self) = @_;
1867 1867
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1869 "$UNIQUEDIR/$path"
1870} 1870}
1871 1871
1872# and all this just because we cannot iterate over 1872# and all this just because we cannot iterate over
1873# all maps in C++... 1873# all maps in C++...
1971 1971
1972 cf::lock_wait "map_data:$path";#d#remove 1972 cf::lock_wait "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1974 1974
1975 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 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";
1978 1978
1979 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1980 or return; 1980 or return;
1981 1981
1982 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1985 or return; 1985 or return;
1986 1986
1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1988 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1989 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard2;
1990 undef $guard1; 1991 undef $guard1;
1991 undef $guard2;
1992 $map->reset; 1992 $map->reset;
1993 return find $path; 1993 return find $path;
1994 } 1994 }
1995 1995
1996 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2024 $f->skip_block;
2025 $self->_load_objects ($f) 2025 $self->_load_objects ($f)
2026 or return; 2026 or return;
2027 2027
2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->post_load_original
2029 if delete $self->{load_original}; 2029 if delete $self->{load_original};
2030 2030
2031 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2032 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2033 unless (aio_stat $uniq) {
2059 } 2059 }
2060 2060
2061 $self->{last_save} = $cf::RUNTIME; 2061 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2062 $self->last_access ($cf::RUNTIME);
2063 2063
2064 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2065 }
2066 2066
2067 $self->post_load; 2067 $self->post_load;
2068} 2068}
2069 2069
2127 my ($path, $origin, $load) = @_; 2127 my ($path, $origin, $load) = @_;
2128 2128
2129 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
2130 2130
2131 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133 } 2133 }
2134 2134
2135 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
2136 2136
2137 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2174 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save"; 2175 $Coro::current->{desc} = "map player save";
2176 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2177 }; 2177 };
2178 2178
2179 cf::get_slot 0.02;
2180
2179 if ($uniq) { 2181 if ($uniq) {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2183 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2182 } else { 2184 } else {
2183 $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);
2191 $self->save; 2193 $self->save;
2192 2194
2193 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2195 my $lock = cf::lock_acquire "map_data:$self->{path}";
2194 2196
2195 return if $self->players; 2197 return if $self->players;
2196 return if $self->in_memory != cf::MAP_IN_MEMORY; 2198 return if $self->in_memory != cf::MAP_ACTIVE;
2197 return if $self->{deny_save}; 2199 return if $self->{deny_save};
2198 2200
2199 $self->in_memory (cf::MAP_SWAPPED); 2201 $self->in_memory (cf::MAP_SWAPPED);
2200 2202
2201 $self->deactivate; 2203 $self->deactivate;
2319 2321
2320sub unique_maps() { 2322sub unique_maps() {
2321 [ 2323 [
2322 map { 2324 map {
2323 utf8::decode $_; 2325 utf8::decode $_;
2324 /\.map$/ 2326 s/\.map$//; # TODO future compatibility hack
2327 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2328 ? ()
2325 ? normalise $_ 2329 : normalise $_
2326 : ()
2327 } @{ aio_readdir $UNIQUEDIR or [] } 2330 } @{ aio_readdir $UNIQUEDIR or [] }
2328 ] 2331 ]
2329} 2332}
2330 2333
2331package cf;
2332
2333=back 2334=back
2334 2335
2335=head3 cf::object 2336=head3 cf::object
2336 2337
2337=cut 2338=cut
2340 2341
2341=over 4 2342=over 4
2342 2343
2343=item $ob->inv_recursive 2344=item $ob->inv_recursive
2344 2345
2345Returns 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.
2346 2348
2347=cut 2349=cut
2348 2350
2349sub inv_recursive_; 2351sub inv_recursive_;
2350sub inv_recursive_ { 2352sub inv_recursive_ {
2355 inv_recursive_ inv $_[0] 2357 inv_recursive_ inv $_[0]
2356} 2358}
2357 2359
2358=item $ref = $ob->ref 2360=item $ref = $ob->ref
2359 2361
2360creates 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.
2361 2363
2362=item $ob = cf::object::deref ($refstring) 2364=item $ob = cf::object::deref ($refstring)
2363 2365
2364returns 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,
2365even if the object actually exists. May block. 2367even if the object actually exists. May block.
2397can 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
2398dialogue with the given NPC character. 2400dialogue with the given NPC character.
2399 2401
2400=cut 2402=cut
2401 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
2402# rough implementation of a future "reply" method that works 2418# rough implementation of a future "reply" method that works
2403# with dialog boxes. 2419# with dialog boxes.
2404#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
2405sub cf::object::player::reply($$$;$) { 2421sub cf::object::player::reply($$$;$) {
2406 my ($self, $npc, $msg, $flags) = @_; 2422 my ($self, $npc, $msg, $flags) = @_;
2417 my $dialog = $pl->{npc_dialog}; 2433 my $dialog = $pl->{npc_dialog};
2418 $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));
2419 2435
2420 } else { 2436 } else {
2421 $msg = $npc->name . " says: $msg" if $npc; 2437 $msg = $npc->name . " says: $msg" if $npc;
2422 $self->message ($msg, $flags); 2438 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2423 } 2439 }
2424 } 2440 }
2425} 2441}
2426 2442
2427=item $object->send_msg ($channel, $msg, $color, [extra...]) 2443=item $object->send_msg ($channel, $msg, $color, [extra...])
2452 2468
2453=item $player_object->enter_link 2469=item $player_object->enter_link
2454 2470
2455Freezes 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}>).
2456 2472
2457The 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.
2458I<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.
2459 2477
2460Will never block. 2478Will never block.
2461 2479
2462=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2463 2481
2521 2539
2522 $map->load; 2540 $map->load;
2523 $map->load_neighbours; 2541 $map->load_neighbours;
2524 2542
2525 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive; 2545 $self->activate_recursive;
2527 2546
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2530} 2549}
2534Moves 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
2535her, loading and preparing them map, calling the provided $check callback 2554her, loading and preparing them map, calling the provided $check callback
2536that 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
2537the 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
2538be 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 >>.
2539 2561
2540=cut 2562=cut
2541 2563
2542our $GOTOGEN; 2564our $GOTOGEN;
2543 2565
2622} 2644}
2623 2645
2624sub prepare_random_map { 2646sub prepare_random_map {
2625 my ($exit) = @_; 2647 my ($exit) = @_;
2626 2648
2627 my $guard = cf::lock_acquire "exit_prepare:$exit";
2628
2629 # all this does is basically replace the /! path by 2649 # all this does is basically replace the /! path by
2630 # a new random map path (?random/...) with a seed 2650 # a new random map path (?random/...) with a seed
2631 # that depends on the exit object 2651 # that depends on the exit object
2632 2652
2633 my $rmp = parse_random_map_params $exit->msg; 2653 my $rmp = parse_random_map_params $exit->msg;
2635 if ($exit->map) { 2655 if ($exit->map) {
2636 $rmp->{region} = $exit->region->name; 2656 $rmp->{region} = $exit->region->name;
2637 $rmp->{origin_map} = $exit->map->path; 2657 $rmp->{origin_map} = $exit->map->path;
2638 $rmp->{origin_x} = $exit->x; 2658 $rmp->{origin_x} = $exit->x;
2639 $rmp->{origin_y} = $exit->y; 2659 $rmp->{origin_y} = $exit->y;
2660
2661 $exit->map->touch;
2640 } 2662 }
2641 2663
2642 $rmp->{random_seed} ||= $exit->random_seed; 2664 $rmp->{random_seed} ||= $exit->random_seed;
2643 2665
2644 my $data = cf::encode_json $rmp; 2666 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645 my $md5 = Digest::MD5::md5_hex $data; 2667 my $md5 = Digest::MD5::md5_hex $data;
2646 my $meta = "$RANDOMDIR/$md5.meta"; 2668 my $meta = "$RANDOMDIR/$md5.meta";
2647 2669
2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2670 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649 aio_write $fh, 0, (length $data), $data, 0; 2671 aio_write $fh, 0, (length $data), $data, 0;
2650 undef $fh; 2672 undef $fh;
2651 aio_rename "$meta~", $meta; 2673 aio_rename "$meta~", $meta;
2652 2674
2675 my $slaying = "?random/$md5";
2676
2677 if ($exit->valid) {
2653 $exit->slaying ("?random/$md5"); 2678 $exit->slaying ("?random/$md5");
2654 $exit->msg (undef); 2679 $exit->msg (undef);
2680 }
2655 } 2681 }
2656} 2682}
2657 2683
2658sub cf::object::player::enter_exit { 2684sub cf::object::player::enter_exit {
2659 my ($self, $exit) = @_; 2685 my ($self, $exit) = @_;
2660 2686
2661 return unless $self->type == cf::PLAYER; 2687 return unless $self->type == cf::PLAYER;
2662 2688
2663 if ($exit->slaying eq "/!") {
2664 #TODO: this should de-fi-ni-te-ly not be a sync-job
2665 # the problem is that $exit might not survive long enough
2666 # so it needs to be done right now, right here
2667 cf::sync_job { prepare_random_map $exit };
2668 }
2669
2670 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2671 my $hp = $exit->stats->hp;
2672 my $sp = $exit->stats->sp;
2673
2674 $self->enter_link; 2689 $self->enter_link;
2675 2690
2676 # if exit is damned, update players death & WoR home-position
2677 $self->contr->savebed ($slaying, $hp, $sp)
2678 if $exit->flag (FLAG_DAMNED);
2679
2680 (async { 2691 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2692 $Coro::current->{desc} = "enter_exit";
2682 2693
2683 $self->deactivate_recursive; # just to be sure
2684 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
2685 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($map, $x, $y);
2686 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
2687 1; 2715 1
2688 }) { 2716 }) {
2689 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2690 . "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. "
2691 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2692 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2693 2721
2694 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
2760 id => "infobox", 2788 id => "infobox",
2761 title => "Body Parts", 2789 title => "Body Parts",
2762 reply => undef, 2790 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available", 2791 tooltip => "Shows which body parts you posess and are available",
2764 }, 2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2765 "c/uptime" => { 2799 "c/uptime" => {
2766 id => "infobox", 2800 id => "infobox",
2767 title => "Uptime", 2801 title => "Uptime",
2768 reply => undef, 2802 reply => undef,
2769 tooltip => "How long the server has been running since last restart", 2803 tooltip => "How long the server has been running since last restart",
2772 id => "infobox", 2806 id => "infobox",
2773 title => "Map Info", 2807 title => "Map Info",
2774 reply => undef, 2808 reply => undef,
2775 tooltip => "Information related to the maps", 2809 tooltip => "Information related to the maps",
2776 }, 2810 },
2811 "c/party" => {
2812 id => "party",
2813 title => "Party",
2814 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party",
2816 },
2777); 2817);
2778 2818
2779sub cf::client::send_msg { 2819sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2781 2821
2782 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2783 2824
2784 $color &= cf::NDI_CLIENT_MASK; # just in case... 2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785 2826
2786 # check predefined channels, for the benefit of C 2827 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) { 2828 if ($CHANNEL{$channel}) {
2808 if ($self->can_msg) { 2849 if ($self->can_msg) {
2809 # default colour, mask it out 2850 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF; 2852 if $color & cf::NDI_DEF;
2812 2853
2813 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2814 [$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);
2815 } else { 2870 } else {
2816 if ($color >= 0) { 2871 if ($color >= 0) {
2817 # replace some tags by gcfclient-compatible ones 2872 # replace some tags by gcfclient-compatible ones
2818 for ($msg) { 2873 for ($msg) {
2819 1 while 2874 1 while
3018 3073
3019The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
3020 3075
3021 cf::object 3076 cf::object
3022 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
3023 insert remove name archname title slaying race decrease_ob_nr 3078 insert remove name archname title slaying race decrease split
3024 3079
3025 cf::object::player 3080 cf::object::player
3026 player 3081 player
3027 3082
3028 cf::player 3083 cf::player
3033 3088
3034=cut 3089=cut
3035 3090
3036for ( 3091for (
3037 ["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
3038 insert remove inv name archname title slaying race 3093 insert remove inv nrof name archname title slaying race
3039 decrease_ob_nr destroy)], 3094 decrease split destroy change_exp)],
3040 ["cf::object::player" => qw(player)], 3095 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3096 ["cf::player" => qw(peaceful)],
3042 ["cf::map" => qw(trigger)], 3097 ["cf::map" => qw(trigger)],
3043) { 3098) {
3044 no strict 'refs'; 3099 no strict 'refs';
3149 { 3204 {
3150 my $faces = $facedata->{faceinfo}; 3205 my $faces = $facedata->{faceinfo};
3151 3206
3152 while (my ($face, $info) = each %$faces) { 3207 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3208 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209
3154 cf::face::set_visibility $idx, $info->{visibility}; 3210 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3211 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3158 3214
3159 cf::cede_to_tick; 3215 cf::cede_to_tick;
3160 } 3216 }
3161 3217
3162 while (my ($face, $info) = each %$faces) { 3218 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3219 next unless $info->{smooth};
3220
3164 my $idx = cf::face::find $face 3221 my $idx = cf::face::find $face
3165 or next; 3222 or next;
3223
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3224 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3225 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3227 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3228 warn "smooth face '$info->{smooth}' not found for face '$face'";
3188 { 3246 {
3189 # TODO: for gcfclient pleasure, we should give resources 3247 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index. 3248 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3249 my $res = $facedata->{resource};
3192 3250
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3251 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3253 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data; 3254 my $data;
3198 3255
3199 if ($info->{type} & 1) { 3256 if ($info->{type} & 1) {
3200 # prepend meta info 3257 # prepend meta info
3201 3258
3202 my $meta = $enc->encode ({ 3259 my $meta = $enc->encode ({
3203 name => $name, 3260 name => $name,
3204 %{ $info->{meta} || {} }, 3261 %{ $info->{meta} || {} },
3205 }); 3262 });
3206 3263
3207 $data = pack "(w/a*)*", $meta, $info->{data}; 3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type};
3208 } else { 3271 } else {
3209 $data = $info->{data}; 3272 $RESOURCE{$name} = $info;
3210 } 3273 }
3211 3274
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
3215 cf::cede_to_tick; 3275 cf::cede_to_tick;
3216 } 3276 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
3235 } 3277 }
3278
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3280
3237 1 3281 1
3238} 3282}
3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3239 3303
3240register_exticmd fx_want => sub { 3304register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3305 my ($ns, $want) = @_;
3242 3306
3243 while (my ($k, $v) = each %$want) { 3307 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3308 $ns->fx_want ($k, $v);
3245 } 3309 }
3246}; 3310};
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}
3247 3321
3248sub reload_regions { 3322sub reload_regions {
3249 # 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
3250 # for this (global event?) 3324 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3325 %ext::player_env::MUSIC_FACE_CACHE = ();
3265} 3339}
3266 3340
3267sub reload_archetypes { 3341sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3342 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3343 or die "unable to load archetypes\n";
3270 #d# NEED to laod twice to resolve forward references
3271 # this really needs to be done in an extra post-pass
3272 # (which needs to be synchronous, so solve it differently)
3273 load_resource_file "$DATADIR/archetypes"
3274 or die "unable to load archetypes\n";
3275} 3344}
3276 3345
3277sub reload_treasures { 3346sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3347 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3348 or die "unable to load treasurelists\n";
3280} 3349}
3281 3350
3282sub reload_resources { 3351sub reload_resources {
3283 warn "reloading resource files...\n"; 3352 warn "reloading resource files...\n";
3284 3353
3354 reload_facedata;
3355 reload_archetypes;
3285 reload_regions; 3356 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3357 reload_treasures;
3290 3358
3291 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
3292}
3293
3294sub init {
3295 reload_resources;
3296} 3360}
3297 3361
3298sub reload_config { 3362sub reload_config {
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3364 or return;
3301 3365
3302 local $/; 3366 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3367 *CFG = YAML::Load <$fh>;
3304 3368
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3370
3307 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3308 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3314 }; 3378 };
3315 warn $@ if $@; 3379 warn $@ if $@;
3316 } 3380 }
3317} 3381}
3318 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
3319sub 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
3320 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
3321 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
3322 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#
3323 (async { 3421 (async {
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3423 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
3327 }; 3425 };
3328 3426
3427 evthread_start IO::AIO::poll_fileno;
3428
3429 cf::sync_job {
3430 reload_resources;
3329 reload_config; 3431 reload_config;
3330 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
3331 load_extensions; 3445 load_extensions;
3332 3446
3333 $TICK_WATCHER->start; 3447 utime time, time, $RUNTIMEFILE;
3334 $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
3335 EV::loop; 3455 EV::loop;
3336} 3456}
3337 3457
3338############################################################################# 3458#############################################################################
3339# initialisation and cleanup 3459# initialisation and cleanup
3346 cf::cleanup "SIG$signal"; 3466 cf::cleanup "SIG$signal";
3347 }; 3467 };
3348 } 3468 }
3349} 3469}
3350 3470
3351sub write_runtime { 3471sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime";
3353
3354 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
3356 3474
3357 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3358 3476
3359 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
3360 3478
3361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3362 or return; 3480 or return;
3363 3481
3364 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
3365 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
3366 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
3376 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
3377 3495
3378 close $fh 3496 close $fh
3379 or return; 3497 or return;
3380 3498
3381 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3382 and return; 3500 and return;
3383 3501
3384 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
3385 3503
3386 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_seq uuid_cur;
3522
3523 if ($value < 1024) {
3524 warn "cowardly refusing to write low uuid value ($value)!\n";
3525 return;
3526 }
3527
3528 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0;
3530
3531 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3532 and return;
3533
3534 # always fsync - this file is important
3535 aio_fsync $fh
3536 and return;
3537
3538 close $fh
3539 or return;
3540
3541 aio_rename "$uuid~", $uuid
3542 and return;
3543
3544 warn "uuid file written ($value).\n";
3545
3546 1
3547
3548}
3549
3550sub write_uuid($$) {
3551 my ($skip, $sync) = @_;
3552
3553 $sync ? write_uuid_sync $skip
3554 : async { write_uuid_sync $skip };
3387} 3555}
3388 3556
3389sub emergency_save() { 3557sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3558 my $freeze_guard = cf::freeze_mainloop;
3391 3559
3413 warn "end emergency map save\n"; 3581 warn "end emergency map save\n";
3414 3582
3415 warn "begin emergency database checkpoint\n"; 3583 warn "begin emergency database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3584 BDB::db_env_txn_checkpoint $DB_ENV;
3417 warn "end emergency database checkpoint\n"; 3585 warn "end emergency database checkpoint\n";
3586
3587 warn "begin write uuid\n";
3588 write_uuid_sync 1;
3589 warn "end write uuid\n";
3418 }; 3590 };
3419 3591
3420 warn "leave emergency perl save\n"; 3592 warn "leave emergency perl save\n";
3421} 3593}
3422 3594
3423sub post_cleanup { 3595sub post_cleanup {
3424 my ($make_core) = @_; 3596 my ($make_core) = @_;
3425 3597
3426 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
3427 if $make_core; 3599 if $make_core;
3600
3601 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$;
3603}
3604
3605# a safer delete_package, copied from Symbol
3606sub clear_package($) {
3607 my $pkg = shift;
3608
3609 # expand to full symbol table name if needed
3610 unless ($pkg =~ /^main::.*::$/) {
3611 $pkg = "main$pkg" if $pkg =~ /^::/;
3612 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3613 $pkg .= '::' unless $pkg =~ /::$/;
3614 }
3615
3616 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3617 my $stem_symtab = *{$stem}{HASH};
3618
3619 defined $stem_symtab and exists $stem_symtab->{$leaf}
3620 or return;
3621
3622 # clear all symbols
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 }
3628 warn "cleared package $pkg\n";#d#
3428} 3629}
3429 3630
3430sub do_reload_perl() { 3631sub do_reload_perl() {
3431 # can/must only be called in main 3632 # can/must only be called in main
3432 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
3433 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
3434 return; 3635 return;
3435 } 3636 }
3436 3637
3638 return if $RELOAD++;
3639
3640 while ($RELOAD) {
3437 warn "reloading..."; 3641 warn "reloading...";
3438 3642
3439 warn "entering sync_job"; 3643 warn "entering sync_job";
3440 3644
3441 cf::sync_job { 3645 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3646 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3647 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
3445 3649
3446 warn "syncing database to disk"; 3650 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3651 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3652
3449 # if anything goes wrong in here, we should simply crash as we already saved 3653 # if anything goes wrong in here, we should simply crash as we already saved
3450 3654
3451 warn "flushing outstanding aio requests"; 3655 warn "flushing outstanding aio requests";
3452 for (;;) {
3453 BDB::flush;
3454 IO::AIO::flush;
3455 Coro::cede_notself;
3456 last unless IO::AIO::nreqs || BDB::nreqs; 3656 while (IO::AIO::nreqs || BDB::nreqs) {
3457 warn "iterate..."; 3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3458 }
3459
3460 ++$RELOAD;
3461
3462 warn "cancelling all extension coros";
3463 $_->cancel for values %EXT_CORO;
3464 %EXT_CORO = ();
3465
3466 warn "removing commands";
3467 %COMMAND = ();
3468
3469 warn "removing ext/exti commands";
3470 %EXTCMD = ();
3471 %EXTICMD = ();
3472
3473 warn "unloading/nuking all extensions";
3474 for my $pkg (@EXTS) {
3475 warn "... unloading $pkg";
3476
3477 if (my $cb = $pkg->can ("unload")) {
3478 eval {
3479 $cb->($pkg);
3480 1
3481 } or warn "$pkg unloaded, but with errors: $@";
3482 } 3658 }
3483 3659
3484 warn "... nuking $pkg"; 3660 warn "cancelling all extension coros";
3485 Symbol::delete_package $pkg; 3661 $_->cancel for values %EXT_CORO;
3486 } 3662 %EXT_CORO = ();
3487 3663
3488 warn "unloading all perl modules loaded from $LIBDIR"; 3664 warn "removing commands";
3489 while (my ($k, $v) = each %INC) { 3665 %COMMAND = ();
3490 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3491 3666
3667 warn "removing ext/exti commands";
3668 %EXTCMD = ();
3669 %EXTICMD = ();
3670
3671 warn "unloading/nuking all extensions";
3672 for my $pkg (@EXTS) {
3492 warn "... unloading $k"; 3673 warn "... unloading $pkg";
3493 delete $INC{$k};
3494 3674
3495 $k =~ s/\.pm$//;
3496 $k =~ s/\//::/g;
3497
3498 if (my $cb = $k->can ("unload_module")) { 3675 if (my $cb = $pkg->can ("unload")) {
3676 eval {
3499 $cb->(); 3677 $cb->($pkg);
3678 1
3679 } or warn "$pkg unloaded, but with errors: $@";
3680 }
3681
3682 warn "... clearing $pkg";
3683 clear_package $pkg;
3500 } 3684 }
3501 3685
3502 Symbol::delete_package $k; 3686 warn "unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689
3690 warn "... unloading $k";
3691 delete $INC{$k};
3692
3693 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g;
3695
3696 if (my $cb = $k->can ("unload_module")) {
3697 $cb->();
3698 }
3699
3700 clear_package $k;
3503 } 3701 }
3504 3702
3505 warn "getting rid of safe::, as good as possible"; 3703 warn "getting rid of safe::, as good as possible";
3506 Symbol::delete_package "safe::$_" 3704 clear_package "safe::$_"
3507 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3508 3706
3509 warn "unloading cf.pm \"a bit\""; 3707 warn "unloading cf.pm \"a bit\"";
3510 delete $INC{"cf.pm"}; 3708 delete $INC{"cf.pm"};
3511 delete $INC{"cf/pod.pm"}; 3709 delete $INC{"cf/pod.pm"};
3512 3710
3513 # don't, removes xs symbols, too, 3711 # don't, removes xs symbols, too,
3514 # and global variables created in xs 3712 # and global variables created in xs
3515 #Symbol::delete_package __PACKAGE__; 3713 #clear_package __PACKAGE__;
3516 3714
3517 warn "unload completed, starting to reload now"; 3715 warn "unload completed, starting to reload now";
3518 3716
3519 warn "reloading cf.pm"; 3717 warn "reloading cf.pm";
3520 require cf; 3718 require cf;
3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3522 3720
3523 warn "loading config and database again"; 3721 warn "loading config and database again";
3524 cf::reload_config; 3722 cf::reload_config;
3525 3723
3526 warn "loading extensions"; 3724 warn "loading extensions";
3527 cf::load_extensions; 3725 cf::load_extensions;
3528 3726
3529 warn "reattaching attachments to objects/players"; 3727 warn "reattaching attachments to objects/players";
3530 _global_reattach; # objects, sockets 3728 _global_reattach; # objects, sockets
3531 warn "reattaching attachments to maps"; 3729 warn "reattaching attachments to maps";
3532 reattach $_ for values %MAP; 3730 reattach $_ for values %MAP;
3533 warn "reattaching attachments to players"; 3731 warn "reattaching attachments to players";
3534 reattach $_ for values %PLAYER; 3732 reattach $_ for values %PLAYER;
3535 3733
3734 warn "running post_load";
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736
3536 warn "leaving sync_job"; 3737 warn "leaving sync_job";
3537 3738
3538 1 3739 1
3539 } or do { 3740 } or do {
3540 warn $@; 3741 warn $@;
3541 warn "error while reloading, exiting."; 3742 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3743 };
3544 3744
3545 warn "reloaded"; 3745 warn "reloaded";
3746 --$RELOAD;
3747 }
3546}; 3748};
3547 3749
3548our $RELOAD_WATCHER; # used only during reload 3750our $RELOAD_WATCHER; # used only during reload
3549 3751
3550sub reload_perl() { 3752sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3753 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3754 # coro crashes during coro_state_free->destroy here.
3553 3755
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3758 undef $RELOAD_WATCHER;
3556 do_reload_perl;
3557 }; 3759 };
3558} 3760}
3559 3761
3560register_command "reload" => sub { 3762register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3763 my ($who, $arg) = @_;
3575 3777
3576our @WAIT_FOR_TICK; 3778our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3779our @WAIT_FOR_TICK_BEGIN;
3578 3780
3579sub wait_for_tick { 3781sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3782 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3783
3583 my $signal = new Coro::Signal; 3784 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3785 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3786 $signal->wait;
3586} 3787}
3587 3788
3588sub wait_for_tick_begin { 3789sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3790 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3791
3592 my $signal = new Coro::Signal; 3792 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3793 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3794 $signal->wait;
3595} 3795}
3596 3796
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3797sub tick {
3598 if ($Coro::current != $Coro::main) { 3798 if ($Coro::current != $Coro::main) {
3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3799 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3600 unless ++$bug_warning > 10; 3800 unless ++$bug_warning > 10;
3601 return; 3801 return;
3602 } 3802 }
3603 3803
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3804 cf::server_tick; # one server iteration
3607
3608 $RUNTIME += $TICK;
3609 $NEXT_TICK = $_[0]->at;
3610 3805
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3806 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3808 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3809 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3810 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3811 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3812 };
3618 } 3813 }
3619 3814
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3622 } 3817 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 3818 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 3819 $sig->send;
3625 } 3820 }
3626 3821
3627 $LOAD = ($NOW - $tick_start) / $TICK; 3822 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3823 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 3824
3630 _post_tick; 3825 if (0) {
3631}; 3826 if ($NEXT_TICK) {
3632$TICK_WATCHER->priority (EV::MAXPRI); 3827 my $jitter = $TICK_START - $NEXT_TICK;
3828 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3829 warn "jitter $JITTER\n";#d#
3830 }
3831 }
3832}
3633 3833
3634{ 3834{
3635 # configure BDB 3835 # configure BDB
3636 3836
3637 BDB::min_parallel 8; 3837 BDB::min_parallel 8;
3638 BDB::max_poll_reqs $TICK * 0.1; 3838 BDB::max_poll_reqs $TICK * 0.1;
3639 $Coro::BDB::WATCHER->priority (1); 3839 $AnyEvent::BDB::WATCHER->priority (1);
3640 3840
3641 unless ($DB_ENV) { 3841 unless ($DB_ENV) {
3642 $DB_ENV = BDB::db_env_create; 3842 $DB_ENV = BDB::db_env_create;
3643 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3843 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3644 | BDB::LOG_AUTOREMOVE, 1); 3844 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3845 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3645 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3846 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3646 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3847 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3647 3848
3648 cf::sync_job { 3849 cf::sync_job {
3649 eval { 3850 eval {
3675{ 3876{
3676 # configure IO::AIO 3877 # configure IO::AIO
3677 3878
3678 IO::AIO::min_parallel 8; 3879 IO::AIO::min_parallel 8;
3679 IO::AIO::max_poll_time $TICK * 0.1; 3880 IO::AIO::max_poll_time $TICK * 0.1;
3680 $Coro::AIO::WATCHER->priority (1); 3881 undef $AnyEvent::AIO::WATCHER;
3681} 3882}
3682 3883
3683my $_log_backtrace; 3884my $_log_backtrace;
3684 3885
3685sub _log_backtrace { 3886sub _log_backtrace {
3688 $msg =~ s/\n//; 3889 $msg =~ s/\n//;
3689 3890
3690 # limit the # of concurrent backtraces 3891 # limit the # of concurrent backtraces
3691 if ($_log_backtrace < 2) { 3892 if ($_log_backtrace < 2) {
3692 ++$_log_backtrace; 3893 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg;
3693 async { 3895 async {
3694 $Coro::current->{desc} = "abt $msg"; 3896 $Coro::current->{desc} = "abt $msg";
3695 3897
3696 my @bt = fork_call { 3898 my @bt = fork_call {
3697 @addr = map { sprintf "%x", $_ } @addr; 3899 @addr = map { sprintf "%x", $_ } @addr;
3708 } 3910 }
3709 3911
3710 @funcs 3912 @funcs
3711 }; 3913 };
3712 3914
3713 LOG llevInfo, "[ABT] $msg\n"; 3915 LOG llevInfo, "[ABT] $perl_bt\n";
3916 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3714 LOG llevInfo, "[ABT] $_\n" for @bt; 3917 LOG llevInfo, "[ABT] $_\n" for @bt;
3715 --$_log_backtrace; 3918 --$_log_backtrace;
3716 }; 3919 };
3717 } else { 3920 } else {
3718 LOG llevInfo, "[ABT] $msg\n"; 3921 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines