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.386 by root, Mon Oct 15 17:50:27 2007 UTC vs.
Revision 1.445 by root, Wed Sep 10 18:18:10 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 Event; 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.1 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 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;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.51 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::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
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 69
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
52our %COMMAND = (); 74our %COMMAND = ();
59our %EXT_MAP = (); # pluggable maps 81our %EXT_MAP = (); # pluggable maps
60 82
61our $RELOAD; # number of reloads so far 83our $RELOAD; # number of reloads so far
62our @EVENT; 84our @EVENT;
63 85
64our $CONFDIR = confdir; 86our $CONFDIR = confdir;
65our $DATADIR = datadir; 87our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 88our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 89our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 90our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 91our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime";
99
100our %RESOURCE;
75 101
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 104our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 105our $USE_FSYNC = 1; # use fsync to write maps - default off
83 106
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 107our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 108our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 109our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 110our $DB_ENV;
89 111
90our %CFG; 112our %CFG;
91 113
92our $UPTIME; $UPTIME ||= time; 114our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 115our $RUNTIME;
116our $NOW;
94 117
95our (%PLAYER, %PLAYER_LOADING); # all users 118our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 119our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 120our $LINK_MAP; # the special {link} map, which is always available
98 121
99# used to convert map paths into valid unix filenames by replacing / by ∕ 122# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 123our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 124
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 125our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 126our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 128our $TICK_START; # for load detecting purposes
105 129
106binmode STDOUT; 130binmode STDOUT;
107binmode STDERR; 131binmode STDERR;
108 132
109# read virtual server time, if available 133# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 134unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 135 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 136 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 137 $RUNTIME = <$fh> + 0.;
114} 138}
115 139
116mkdir $_ 140mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
162 186
163The raw value load value from the last tick. 187The raw value load value from the last tick.
164 188
165=item %cf::CFG 189=item %cf::CFG
166 190
167Configuration for the server, loaded from C</etc/crossfire/config>, or 191Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 192from wherever your confdir points to.
169 193
170=item cf::wait_for_tick, cf::wait_for_tick_begin 194=item cf::wait_for_tick, cf::wait_for_tick_begin
171 195
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 196These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 217 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 218
195 LOG llevError, $msg; 219 LOG llevError, $msg;
196 }; 220 };
197} 221}
222
223$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "=="
225
226 if ($Coro::current == $Coro::main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d#
229 }#d#
230
231 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate
234};
235
236$SIG{__DIE__} = sub { }; #d#?
198 237
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 248for my $pkg (qw(
210 cf::global cf::attachable 249 cf::global cf::attachable
211 cf::object cf::object::player 250 cf::object cf::object::player
212 cf::client cf::player 251 cf::client cf::player
213 cf::arch cf::living 252 cf::arch cf::living
253 cf::map cf::mapspace
214 cf::map cf::party cf::region 254 cf::party cf::region
215)) { 255)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 257}
219 258
220$Event::DIED = sub { 259$EV::DIED = sub {
221 warn "error in event callback: @_"; 260 warn "error in event callback: @_";
222}; 261};
223 262
224############################################################################# 263#############################################################################
225 264
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 287 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 288 $d
250 } || "[unable to dump $_[0]: '$@']"; 289 } || "[unable to dump $_[0]: '$@']";
251} 290}
252 291
253=item $ref = cf::from_json $json 292=item $ref = cf::decode_json $json
254 293
255Converts a JSON string into the corresponding perl data structure. 294Converts a JSON string into the corresponding perl data structure.
256 295
257=item $json = cf::to_json $ref 296=item $json = cf::encode_json $ref
258 297
259Converts a perl data structure into its JSON representation. 298Converts a perl data structure into its JSON representation.
260 299
261=cut 300=cut
262 301
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 303
265sub to_json ($) { $json_coder->encode ($_[0]) } 304sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 305sub decode_json($) { $json_coder->decode ($_[0]) }
267 306
268=item cf::lock_wait $string 307=item cf::lock_wait $string
269 308
270Wait until the given lock is available. See cf::lock_acquire. 309Wait until the given lock is available. See cf::lock_acquire.
271 310
327 366
328 ! ! $LOCK{$key} 367 ! ! $LOCK{$key}
329} 368}
330 369
331sub freeze_mainloop { 370sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 371 tick_inhibit_inc;
333 372
334 my $guard = Coro::guard { 373 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 374}
336 }; 375
337 $TICK_WATCHER->stop; 376=item cf::periodic $interval, $cb
338 $guard 377
378Like EV::periodic, but randomly selects a starting point so that the actions
379get spread over timer.
380
381=cut
382
383sub periodic($$) {
384 my ($interval, $cb) = @_;
385
386 my $start = rand List::Util::min 180, $interval;
387
388 EV::periodic $start, $interval, 0, $cb
339} 389}
340 390
341=item cf::get_slot $time[, $priority[, $name]] 391=item cf::get_slot $time[, $priority[, $name]]
342 392
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 393Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 433 }
384 } 434 }
385}; 435};
386 436
387sub get_slot($;$$) { 437sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main;
439
388 my ($time, $pri, $name) = @_; 440 my ($time, $pri, $name) = @_;
389 441
390 $time = $TICK * .6 if $time > $TICK * .6; 442 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 443 my $sig = new Coro::Signal;
392 444
406 458
407BEGIN { *async = \&Coro::async_pool } 459BEGIN { *async = \&Coro::async_pool }
408 460
409=item cf::sync_job { BLOCK } 461=item cf::sync_job { BLOCK }
410 462
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 463The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 464is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 465partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 466acceptable.
415 467
416If it must be done, put the blocking parts into C<sync_job>. This will run 468If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 469the given BLOCK in another coroutine while waiting for the result. The
422 474
423sub sync_job(&) { 475sub sync_job(&) {
424 my ($job) = @_; 476 my ($job) = @_;
425 477
426 if ($Coro::current == $Coro::main) { 478 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 479 my $time = EV::time;
428 480
429 # this is the main coro, too bad, we have to block 481 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 482 # till the operation succeeds, freezing the server :/
431 483
432 LOG llevError, Carp::longmess "sync job";#d# 484 LOG llevError, Carp::longmess "sync job";#d#
433 485
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 486 my $freeze_guard = freeze_mainloop;
437 487
438 my $busy = 1; 488 my $busy = 1;
439 my @res; 489 my @res;
440 490
444 warn $@ if $@; 494 warn $@ if $@;
445 undef $busy; 495 undef $busy;
446 })->prio (Coro::PRIO_MAX); 496 })->prio (Coro::PRIO_MAX);
447 497
448 while ($busy) { 498 while ($busy) {
449 Coro::cede or Event::one_event; 499 if (Coro::nready) {
500 Coro::cede_notself;
501 } else {
502 EV::loop EV::LOOP_ONESHOT;
450 } 503 }
504 }
451 505
452 $time = Event::time - $time; 506 my $time = EV::time - $time;
453 507
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 508 $TICK_START += $time; # do not account sync jobs to server load
458 509
459 wantarray ? @res : $res[0] 510 wantarray ? @res : $res[0]
460 } else { 511 } else {
461 # we are in another coroutine, how wonderful, everything just works 512 # we are in another coroutine, how wonderful, everything just works
462 513
487=item fork_call { }, $args 538=item fork_call { }, $args
488 539
489Executes the given code block with the given arguments in a seperate 540Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 541process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 542Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 543never block itself or use any form of event handling.
493 544
494=cut 545=cut
495 546
496sub fork_call(&@) { 547sub fork_call(&@) {
497 my ($cb, @args) = @_; 548 my ($cb, @args) = @_;
504 reset_signals; 555 reset_signals;
505 &$cb 556 &$cb
506 }, @args; 557 }, @args;
507 558
508 wantarray ? @res : $res[-1] 559 wantarray ? @res : $res[-1]
560}
561
562=item $coin = coin_from_name $name
563
564=cut
565
566our %coin_alias = (
567 "silver" => "silvercoin",
568 "silvercoin" => "silvercoin",
569 "silvercoins" => "silvercoin",
570 "gold" => "goldcoin",
571 "goldcoin" => "goldcoin",
572 "goldcoins" => "goldcoin",
573 "platinum" => "platinacoin",
574 "platinumcoin" => "platinacoin",
575 "platinumcoins" => "platinacoin",
576 "platina" => "platinacoin",
577 "platinacoin" => "platinacoin",
578 "platinacoins" => "platinacoin",
579 "royalty" => "royalty",
580 "royalties" => "royalty",
581);
582
583sub coin_from_name($) {
584 $coin_alias{$_[0]}
585 ? cf::arch::find $coin_alias{$_[0]}
586 : undef
509} 587}
510 588
511=item $value = cf::db_get $family => $key 589=item $value = cf::db_get $family => $key
512 590
513Returns a single value from the environment database. 591Returns a single value from the environment database.
658attach callbacks/event handlers (a collection of which is called an "attachment") 736attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 737to it. All such attachable objects support the following methods.
660 738
661In the following description, CLASS can be any of C<global>, C<object> 739In the following description, CLASS can be any of C<global>, C<object>
662C<player>, C<client> or C<map> (i.e. the attachable objects in 740C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 741Deliantra).
664 742
665=over 4 743=over 4
666 744
667=item $attachable->attach ($attachment, key => $value...) 745=item $attachable->attach ($attachment, key => $value...)
668 746
950 } 1028 }
951 1029
952 0 1030 0
953} 1031}
954 1032
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1033=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1034
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1035=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1036
959Generate an object-specific event with the given arguments. 1037Generate an object-specific event with the given arguments.
960 1038
1013 1091
1014sub reattach { 1092sub reattach {
1015 # basically do the same as instantiate, without calling instantiate 1093 # basically do the same as instantiate, without calling instantiate
1016 my ($obj) = @_; 1094 my ($obj) = @_;
1017 1095
1096 # no longer needed after getting rid of delete_package?
1018 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1097 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1019 1098
1020 my $registry = $obj->registry; 1099 my $registry = $obj->registry;
1021 1100
1022 @$registry = (); 1101 @$registry = ();
1023 1102
1038cf::attachable->attach ( 1117cf::attachable->attach (
1039 prio => -1000000, 1118 prio => -1000000,
1040 on_instantiate => sub { 1119 on_instantiate => sub {
1041 my ($obj, $data) = @_; 1120 my ($obj, $data) = @_;
1042 1121
1043 $data = from_json $data; 1122 $data = decode_json $data;
1044 1123
1045 for (@$data) { 1124 for (@$data) {
1046 my ($name, $args) = @$_; 1125 my ($name, $args) = @$_;
1047 1126
1048 $obj->attach ($name, %{$args || {} }); 1127 $obj->attach ($name, %{$args || {} });
1069 utf8::decode (my $decname = $filename); 1148 utf8::decode (my $decname = $filename);
1070 warn sprintf "saving %s (%d,%d)\n", 1149 warn sprintf "saving %s (%d,%d)\n",
1071 $decname, length $$rdata, scalar @$objs; 1150 $decname, length $$rdata, scalar @$objs;
1072 1151
1073 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1074 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1075 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1076 aio_fsync $fh if $cf::USE_FSYNC; 1155 aio_fsync $fh if $cf::USE_FSYNC;
1077 close $fh; 1156 aio_close $fh;
1078 1157
1079 if (@$objs) { 1158 if (@$objs) {
1080 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1081 chmod SAVE_MODE, $fh; 1160 aio_chmod $fh, SAVE_MODE;
1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1083 aio_write $fh, 0, (length $data), $data, 0; 1162 aio_write $fh, 0, (length $data), $data, 0;
1084 aio_fsync $fh if $cf::USE_FSYNC; 1163 aio_fsync $fh if $cf::USE_FSYNC;
1085 close $fh; 1164 aio_close $fh;
1086 aio_rename "$filename.pst~", "$filename.pst"; 1165 aio_rename "$filename.pst~", "$filename.pst";
1087 } 1166 }
1088 } else { 1167 } else {
1089 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1090 } 1169 }
1118 1197
1119 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
1120 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
1121 or return; 1200 or return;
1122 1201
1123 my $st = eval { Coro::Storable::thaw $av } 1202 my $st = eval { Coro::Storable::thaw $av };
1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs}; 1203 $av = $st->{objs};
1126 } 1204 }
1127 1205
1128 utf8::decode (my $decname = $filename); 1206 utf8::decode (my $decname = $filename);
1129 warn sprintf "loading %s (%d,%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
1260 1338
1261 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1262 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1263 1341
1264 $ext{source} = 1342 $ext{source} =
1265 "package $pkg; use strict; use utf8;\n" 1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1266 . "#line 1 \"$path\"\n{\n" 1344 . "#line 1 \"$path\"\n{\n"
1267 . $source 1345 . $source
1268 . "\n};\n1"; 1346 . "\n};\n1";
1269 1347
1270 $todo{$base} = \%ext; 1348 $todo{$base} = \%ext;
1286 my $msg = $@ ? "$v->{path}: $@\n" 1364 my $msg = $@ ? "$v->{path}: $@\n"
1287 : "$v->{base}: extension inactive.\n"; 1365 : "$v->{base}: extension inactive.\n";
1288 1366
1289 if (exists $v->{meta}{mandatory}) { 1367 if (exists $v->{meta}{mandatory}) {
1290 warn $msg; 1368 warn $msg;
1291 warn "mandatory extension failed to load, exiting.\n"; 1369 cf::cleanup "mandatory extension failed to load, exiting.";
1292 exit 1;
1293 } 1370 }
1294 1371
1295 warn $msg; 1372 warn $msg;
1296 } 1373 }
1297 1374
1386 my $f = new_from_file cf::object::thawer path $login 1463 my $f = new_from_file cf::object::thawer path $login
1387 or return; 1464 or return;
1388 1465
1389 my $pl = cf::player::load_pl $f 1466 my $pl = cf::player::load_pl $f
1390 or return; 1467 or return;
1468
1391 local $cf::PLAYER_LOADING{$login} = $pl; 1469 local $cf::PLAYER_LOADING{$login} = $pl;
1392 $f->resolve_delayed_derefs; 1470 $f->resolve_delayed_derefs;
1393 $cf::PLAYER{$login} = $pl 1471 $cf::PLAYER{$login} = $pl
1394 } 1472 }
1395 } 1473 }
1405 1483
1406 return if $pl->{deny_save}; 1484 return if $pl->{deny_save};
1407 1485
1408 aio_mkdir playerdir $pl, 0770; 1486 aio_mkdir playerdir $pl, 0770;
1409 $pl->{last_save} = $cf::RUNTIME; 1487 $pl->{last_save} = $cf::RUNTIME;
1488
1489 cf::get_slot 0.01;
1410 1490
1411 $pl->save_pl ($path); 1491 $pl->save_pl ($path);
1412 cf::cede_to_tick; 1492 cf::cede_to_tick;
1413} 1493}
1414 1494
1446 my ($pl) = @_; 1526 my ($pl) = @_;
1447 1527
1448 my $name = $pl->ob->name; 1528 my $name = $pl->ob->name;
1449 1529
1450 $pl->{deny_save} = 1; 1530 $pl->{deny_save} = 1;
1451 $pl->password ("*"); # this should lock out the player until we nuked the dir 1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1452 1532
1453 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1454 $pl->deactivate; 1534 $pl->deactivate;
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1455 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1537 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1456 $pl->ns->destroy if $pl->ns; 1538 $pl->ns->destroy if $pl->ns;
1457 1539
1458 my $path = playerdir $pl; 1540 my $path = playerdir $pl;
1459 my $temp = "$path~$cf::RUNTIME~deleting~"; 1541 my $temp = "$path~$cf::RUNTIME~deleting~";
1498 1580
1499 for my $login (@$dirs) { 1581 for my $login (@$dirs) {
1500 my $path = path $login; 1582 my $path = path $login;
1501 1583
1502 # a .pst is a dead give-away for a valid player 1584 # a .pst is a dead give-away for a valid player
1503 unless (-e "$path.pst") { 1585 # if no pst file found, open and chekc for blocked users
1586 if (aio_stat "$path.pst") {
1504 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1587 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1505 aio_read $fh, 0, 512, my $buf, 0 or next; 1588 aio_read $fh, 0, 512, my $buf, 0 or next;
1506 $buf !~ /^password -------------$/m or next; # official not-valid tag 1589 $buf !~ /^password -------------$/m or next; # official not-valid tag
1507 } 1590 }
1508 1591
1543 1626
1544=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1545 1628
1546Expand crossfire pod fragments into protocol xml. 1629Expand crossfire pod fragments into protocol xml.
1547 1630
1548=cut
1549
1550sub expand_cfpod {
1551 ((my $self), (local $_)) = @_;
1552
1553 # escape & and <
1554 s/&/&amp;/g;
1555 s/(?<![BIUGHT])</&lt;/g;
1556
1557 # this is buggy, it needs to properly take care of nested <'s
1558
1559 1 while
1560 # replace B<>, I<>, U<> etc.
1561 s/B<([^\>]*)>/<b>$1<\/b>/
1562 || s/I<([^\>]*)>/<i>$1<\/i>/
1563 || s/U<([^\>]*)>/<u>$1<\/u>/
1564 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1565 # replace G<male|female> tags
1566 || s{G<([^>|]*)\|([^>]*)>}{
1567 $self->gender ? $2 : $1
1568 }ge
1569 # replace H<hint text>
1570 || s{H<([^\>]*)>}
1571 {
1572 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1573 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1574 "")
1575 [$self->{hintmode}]
1576 }ge;
1577
1578 # create single paragraphs (very hackish)
1579 s/(?<=\S)\n(?=\w)/ /g;
1580
1581 # compress some whitespace
1582 s/\s+\n/\n/g; # ws line-ends
1583 s/\n\n+/\n/g; # double lines
1584 s/^\n+//; # beginning lines
1585 s/\n+$//; # ending lines
1586
1587 $_
1588}
1589
1590sub hintmode {
1591 $_[0]{hintmode} = $_[1] if @_ > 1;
1592 $_[0]{hintmode}
1593}
1594
1595=item $player->ext_reply ($msgid, @msg) 1631=item $player->ext_reply ($msgid, @msg)
1596 1632
1597Sends an ext reply to the player. 1633Sends an ext reply to the player.
1598 1634
1599=cut 1635=cut
1665our $MAX_RESET = 3600; 1701our $MAX_RESET = 3600;
1666our $DEFAULT_RESET = 3000; 1702our $DEFAULT_RESET = 3000;
1667 1703
1668sub generate_random_map { 1704sub generate_random_map {
1669 my ($self, $rmp) = @_; 1705 my ($self, $rmp) = @_;
1706
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708
1670 # mit "rum" bekleckern, nicht 1709 # mit "rum" bekleckern, nicht
1671 $self->_create_random_map ( 1710 $self->_create_random_map (
1672 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1673 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1674 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1796 1835
1797# the temporary/swap location 1836# the temporary/swap location
1798sub save_path { 1837sub save_path {
1799 my ($self) = @_; 1838 my ($self) = @_;
1800 1839
1801 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1840 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1802 "$TMPDIR/$path.map" 1841 "$TMPDIR/$path.map"
1803} 1842}
1804 1843
1805# the unique path, undef == no special unique path 1844# the unique path, undef == no special unique path
1806sub uniq_path { 1845sub uniq_path {
1807 my ($self) = @_; 1846 my ($self) = @_;
1808 1847
1809 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1810 "$UNIQUEDIR/$path" 1849 "$UNIQUEDIR/$path"
1811} 1850}
1812 1851
1813# and all this just because we cannot iterate over 1852# and all this just because we cannot iterate over
1814# all maps in C++... 1853# all maps in C++...
1912 1951
1913 cf::lock_wait "map_data:$path";#d#remove 1952 cf::lock_wait "map_data:$path";#d#remove
1914 cf::lock_wait "map_find:$path"; 1953 cf::lock_wait "map_find:$path";
1915 1954
1916 $cf::MAP{$path} || do { 1955 $cf::MAP{$path} || do {
1917 my $guard1 = cf::lock_acquire "map_find:$path";
1918 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1919 1958
1920 my $map = new_from_path cf::map $path 1959 my $map = new_from_path cf::map $path
1921 or return; 1960 or return;
1922 1961
1923 $map->{last_save} = $cf::RUNTIME; 1962 $map->{last_save} = $cf::RUNTIME;
1926 or return; 1965 or return;
1927 1966
1928 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1967 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1929 # doing this can freeze the server in a sync job, obviously 1968 # doing this can freeze the server in a sync job, obviously
1930 #$cf::WAIT_FOR_TICK->wait; 1969 #$cf::WAIT_FOR_TICK->wait;
1970 undef $guard2;
1931 undef $guard1; 1971 undef $guard1;
1932 undef $guard2;
1933 $map->reset; 1972 $map->reset;
1934 return find $path; 1973 return find $path;
1935 } 1974 }
1936 1975
1937 $cf::MAP{$path} = $map 1976 $cf::MAP{$path} = $map
1964 my $f = new_from_file cf::object::thawer $self->{load_path}; 2003 my $f = new_from_file cf::object::thawer $self->{load_path};
1965 $f->skip_block; 2004 $f->skip_block;
1966 $self->_load_objects ($f) 2005 $self->_load_objects ($f)
1967 or return; 2006 or return;
1968 2007
1969 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2008 $self->post_load_original
1970 if delete $self->{load_original}; 2009 if delete $self->{load_original};
1971 2010
1972 if (my $uniq = $self->uniq_path) { 2011 if (my $uniq = $self->uniq_path) {
1973 utf8::encode $uniq; 2012 utf8::encode $uniq;
1974 unless (aio_stat $uniq) { 2013 unless (aio_stat $uniq) {
2000 } 2039 }
2001 2040
2002 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
2003 $self->last_access ($cf::RUNTIME); 2042 $self->last_access ($cf::RUNTIME);
2004 2043
2005 $self->in_memory (cf::MAP_IN_MEMORY); 2044 $self->in_memory (cf::MAP_ACTIVE);
2006 } 2045 }
2007 2046
2008 $self->post_load; 2047 $self->post_load;
2009} 2048}
2010 2049
2068 my ($path, $origin, $load) = @_; 2107 my ($path, $origin, $load) = @_;
2069 2108
2070 $path = normalise $path, $origin && $origin->{path}; 2109 $path = normalise $path, $origin && $origin->{path};
2071 2110
2072 if (my $map = $cf::MAP{$path}) { 2111 if (my $map = $cf::MAP{$path}) {
2073 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2074 } 2113 }
2075 2114
2076 $MAP_PREFETCH{$path} |= $load; 2115 $MAP_PREFETCH{$path} |= $load;
2077 2116
2078 $MAP_PREFETCHER ||= cf::async { 2117 $MAP_PREFETCHER ||= cf::async {
2115 cf::async { 2154 cf::async {
2116 $Coro::current->{desc} = "map player save"; 2155 $Coro::current->{desc} = "map player save";
2117 $_->contr->save for $self->players; 2156 $_->contr->save for $self->players;
2118 }; 2157 };
2119 2158
2159 cf::get_slot 0.02;
2160
2120 if ($uniq) { 2161 if ($uniq) {
2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2122 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2163 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2123 } else { 2164 } else {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2132 $self->save; 2173 $self->save;
2133 2174
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2175 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2176
2136 return if $self->players; 2177 return if $self->players;
2137 return if $self->in_memory != cf::MAP_IN_MEMORY; 2178 return if $self->in_memory != cf::MAP_ACTIVE;
2138 return if $self->{deny_save}; 2179 return if $self->{deny_save};
2139 2180
2140 $self->in_memory (cf::MAP_SWAPPED); 2181 $self->in_memory (cf::MAP_SWAPPED);
2141 2182
2142 $self->deactivate; 2183 $self->deactivate;
2260 2301
2261sub unique_maps() { 2302sub unique_maps() {
2262 [ 2303 [
2263 map { 2304 map {
2264 utf8::decode $_; 2305 utf8::decode $_;
2265 /\.map$/ 2306 s/\.map$//; # TODO future compatibility hack
2307 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2308 ? ()
2266 ? normalise $_ 2309 : normalise $_
2267 : ()
2268 } @{ aio_readdir $UNIQUEDIR or [] } 2310 } @{ aio_readdir $UNIQUEDIR or [] }
2269 ] 2311 ]
2270} 2312}
2271 2313
2272package cf;
2273
2274=back 2314=back
2275 2315
2276=head3 cf::object 2316=head3 cf::object
2277 2317
2278=cut 2318=cut
2281 2321
2282=over 4 2322=over 4
2283 2323
2284=item $ob->inv_recursive 2324=item $ob->inv_recursive
2285 2325
2286Returns the inventory of the object _and_ their inventories, recursively. 2326Returns the inventory of the object I<and> their inventories, recursively,
2327but I<not> the object itself.
2287 2328
2288=cut 2329=cut
2289 2330
2290sub inv_recursive_; 2331sub inv_recursive_;
2291sub inv_recursive_ { 2332sub inv_recursive_ {
2296 inv_recursive_ inv $_[0] 2337 inv_recursive_ inv $_[0]
2297} 2338}
2298 2339
2299=item $ref = $ob->ref 2340=item $ref = $ob->ref
2300 2341
2301creates and returns a persistent reference to an objetc that can be stored as a string. 2342Creates and returns a persistent reference to an object that can be stored as a string.
2302 2343
2303=item $ob = cf::object::deref ($refstring) 2344=item $ob = cf::object::deref ($refstring)
2304 2345
2305returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2346returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2306even if the object actually exists. May block. 2347even if the object actually exists. May block.
2338can be C<undef>. Does the right thing when the player is currently in a 2379can be C<undef>. Does the right thing when the player is currently in a
2339dialogue with the given NPC character. 2380dialogue with the given NPC character.
2340 2381
2341=cut 2382=cut
2342 2383
2384our $SAY_CHANNEL = {
2385 id => "say",
2386 title => "Map",
2387 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2389};
2390
2391our $CHAT_CHANNEL = {
2392 id => "chat",
2393 title => "Chat",
2394 reply => "chat ",
2395 tooltip => "Player chat and shouts, global to the server.",
2396};
2397
2343# rough implementation of a future "reply" method that works 2398# rough implementation of a future "reply" method that works
2344# with dialog boxes. 2399# with dialog boxes.
2345#TODO: the first argument must go, split into a $npc->reply_to ( method 2400#TODO: the first argument must go, split into a $npc->reply_to ( method
2346sub cf::object::player::reply($$$;$) { 2401sub cf::object::player::reply($$$;$) {
2347 my ($self, $npc, $msg, $flags) = @_; 2402 my ($self, $npc, $msg, $flags) = @_;
2358 my $dialog = $pl->{npc_dialog}; 2413 my $dialog = $pl->{npc_dialog};
2359 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2414 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2360 2415
2361 } else { 2416 } else {
2362 $msg = $npc->name . " says: $msg" if $npc; 2417 $msg = $npc->name . " says: $msg" if $npc;
2363 $self->message ($msg, $flags); 2418 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2364 } 2419 }
2365 } 2420 }
2366} 2421}
2367 2422
2368=item $object->send_msg ($channel, $msg, $color, [extra...]) 2423=item $object->send_msg ($channel, $msg, $color, [extra...])
2475Moves the player to the given map-path and coordinates by first freezing 2530Moves the player to the given map-path and coordinates by first freezing
2476her, loading and preparing them map, calling the provided $check callback 2531her, loading and preparing them map, calling the provided $check callback
2477that has to return the map if sucecssful, and then unfreezes the player on 2532that has to return the map if sucecssful, and then unfreezes the player on
2478the new (success) or old (failed) map position. In either case, $done will 2533the new (success) or old (failed) map position. In either case, $done will
2479be called at the end of this process. 2534be called at the end of this process.
2535
2536Note that $check will be called with a potentially non-loaded map, so if
2537it needs a loaded map it has to call C<< ->load >>.
2480 2538
2481=cut 2539=cut
2482 2540
2483our $GOTOGEN; 2541our $GOTOGEN;
2484 2542
2563} 2621}
2564 2622
2565sub prepare_random_map { 2623sub prepare_random_map {
2566 my ($exit) = @_; 2624 my ($exit) = @_;
2567 2625
2568 my $guard = cf::lock_acquire "exit_prepare:$exit";
2569
2570 # all this does is basically replace the /! path by 2626 # all this does is basically replace the /! path by
2571 # a new random map path (?random/...) with a seed 2627 # a new random map path (?random/...) with a seed
2572 # that depends on the exit object 2628 # that depends on the exit object
2573 2629
2574 my $rmp = parse_random_map_params $exit->msg; 2630 my $rmp = parse_random_map_params $exit->msg;
2576 if ($exit->map) { 2632 if ($exit->map) {
2577 $rmp->{region} = $exit->region->name; 2633 $rmp->{region} = $exit->region->name;
2578 $rmp->{origin_map} = $exit->map->path; 2634 $rmp->{origin_map} = $exit->map->path;
2579 $rmp->{origin_x} = $exit->x; 2635 $rmp->{origin_x} = $exit->x;
2580 $rmp->{origin_y} = $exit->y; 2636 $rmp->{origin_y} = $exit->y;
2637
2638 $exit->map->touch;
2581 } 2639 }
2582 2640
2583 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2584 2642
2585 my $data = cf::to_json $rmp; 2643 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2586 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2587 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2588 2646
2589 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2590 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
2591 undef $fh; 2649 undef $fh;
2592 aio_rename "$meta~", $meta; 2650 aio_rename "$meta~", $meta;
2593 2651
2652 my $slaying = "?random/$md5";
2653
2654 if ($exit->valid) {
2594 $exit->slaying ("?random/$md5"); 2655 $exit->slaying ("?random/$md5");
2595 $exit->msg (undef); 2656 $exit->msg (undef);
2657 }
2596 } 2658 }
2597} 2659}
2598 2660
2599sub cf::object::player::enter_exit { 2661sub cf::object::player::enter_exit {
2600 my ($self, $exit) = @_; 2662 my ($self, $exit) = @_;
2601 2663
2602 return unless $self->type == cf::PLAYER; 2664 return unless $self->type == cf::PLAYER;
2603 2665
2604 if ($exit->slaying eq "/!") {
2605 #TODO: this should de-fi-ni-te-ly not be a sync-job
2606 # the problem is that $exit might not survive long enough
2607 # so it needs to be done right now, right here
2608 cf::sync_job { prepare_random_map $exit };
2609 }
2610
2611 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2612 my $hp = $exit->stats->hp;
2613 my $sp = $exit->stats->sp;
2614
2615 $self->enter_link; 2666 $self->enter_link;
2616 2667
2617 # if exit is damned, update players death & WoR home-position
2618 $self->contr->savebed ($slaying, $hp, $sp)
2619 if $exit->flag (FLAG_DAMNED);
2620
2621 (async { 2668 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2669 $Coro::current->{desc} = "enter_exit";
2623 2670
2624 $self->deactivate_recursive; # just to be sure
2625 unless (eval { 2671 unless (eval {
2672 $self->deactivate_recursive; # just to be sure
2673
2674 # random map handling
2675 {
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 prepare_random_map $exit
2679 if $exit->slaying eq "/!";
2680 }
2681
2682 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2683 my $x = $exit->stats->hp;
2684 my $y = $exit->stats->sp;
2685
2626 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($map, $x, $y);
2627 2687
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED);
2691
2628 1; 2692 1
2629 }) { 2693 }) {
2630 $self->message ("Something went wrong deep within the crossfire server. " 2694 $self->message ("Something went wrong deep within the crossfire server. "
2631 . "I'll try to bring you back to the map you were before. " 2695 . "I'll try to bring you back to the map you were before. "
2632 . "Please report this to the dungeon master!", 2696 . "Please report this to the dungeon master!",
2633 cf::NDI_UNIQUE | cf::NDI_RED); 2697 cf::NDI_UNIQUE | cf::NDI_RED);
2663the message, with C<log> being the default. If C<$color> is negative, suppress 2727the message, with C<log> being the default. If C<$color> is negative, suppress
2664the message unless the client supports the msg packet. 2728the message unless the client supports the msg packet.
2665 2729
2666=cut 2730=cut
2667 2731
2732# non-persistent channels (usually the info channel)
2668our %CHANNEL = ( 2733our %CHANNEL = (
2669 "c/identify" => { 2734 "c/identify" => {
2670 id => "infobox", 2735 id => "infobox",
2671 title => "Identify", 2736 title => "Identify",
2672 reply => undef, 2737 reply => undef,
2676 id => "infobox", 2741 id => "infobox",
2677 title => "Examine", 2742 title => "Examine",
2678 reply => undef, 2743 reply => undef,
2679 tooltip => "Signs and other items you examined", 2744 tooltip => "Signs and other items you examined",
2680 }, 2745 },
2746 "c/book" => {
2747 id => "infobox",
2748 title => "Book",
2749 reply => undef,
2750 tooltip => "The contents of a note or book",
2751 },
2681 "c/lookat" => { 2752 "c/lookat" => {
2682 id => "infobox", 2753 id => "infobox",
2683 title => "Look", 2754 title => "Look",
2684 reply => undef, 2755 reply => undef,
2685 tooltip => "What you saw there", 2756 tooltip => "What you saw there",
2686 }, 2757 },
2758 "c/who" => {
2759 id => "infobox",
2760 title => "Players",
2761 reply => undef,
2762 tooltip => "Shows players who are currently online",
2763 },
2764 "c/body" => {
2765 id => "infobox",
2766 title => "Body Parts",
2767 reply => undef,
2768 tooltip => "Shows which body parts you posess and are available",
2769 },
2770 "c/uptime" => {
2771 id => "infobox",
2772 title => "Uptime",
2773 reply => undef,
2774 tooltip => "How long the server has been running since last restart",
2775 },
2776 "c/mapinfo" => {
2777 id => "infobox",
2778 title => "Map Info",
2779 reply => undef,
2780 tooltip => "Information related to the maps",
2781 },
2782 "c/party" => {
2783 id => "party",
2784 title => "Party",
2785 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party",
2787 },
2687); 2788);
2688 2789
2689sub cf::client::send_msg { 2790sub cf::client::send_msg {
2690 my ($self, $channel, $msg, $color, @extra) = @_; 2791 my ($self, $channel, $msg, $color, @extra) = @_;
2691 2792
2718 if ($self->can_msg) { 2819 if ($self->can_msg) {
2719 # default colour, mask it out 2820 # default colour, mask it out
2720 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2721 if $color & cf::NDI_DEF; 2822 if $color & cf::NDI_DEF;
2722 2823
2723 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2824 my $pkt = "msg "
2825 . $self->{json_coder}->encode (
2724 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 );
2828
2829 # try lzf for large packets
2830 $pkt = "lzf " . Compress::LZF::compress $pkt
2831 if 1024 <= length $pkt and $self->{can_lzf};
2832
2833 # split very large packets
2834 if (8192 < length $pkt and $self->{can_lzf}) {
2835 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2836 $pkt = "frag";
2837 }
2838
2839 $self->send_packet ($pkt);
2725 } else { 2840 } else {
2726 if ($color >= 0) { 2841 if ($color >= 0) {
2727 # replace some tags by gcfclient-compatible ones 2842 # replace some tags by gcfclient-compatible ones
2728 for ($msg) { 2843 for ($msg) {
2729 1 while 2844 1 while
2928 3043
2929The following functions and methods are available within a safe environment: 3044The following functions and methods are available within a safe environment:
2930 3045
2931 cf::object 3046 cf::object
2932 contr pay_amount pay_player map x y force_find force_add destroy 3047 contr pay_amount pay_player map x y force_find force_add destroy
2933 insert remove name archname title slaying race decrease_ob_nr 3048 insert remove name archname title slaying race decrease split
2934 3049
2935 cf::object::player 3050 cf::object::player
2936 player 3051 player
2937 3052
2938 cf::player 3053 cf::player
2943 3058
2944=cut 3059=cut
2945 3060
2946for ( 3061for (
2947 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3062 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2948 insert remove inv name archname title slaying race 3063 insert remove inv nrof name archname title slaying race
2949 decrease_ob_nr destroy)], 3064 decrease split destroy change_exp)],
2950 ["cf::object::player" => qw(player)], 3065 ["cf::object::player" => qw(player)],
2951 ["cf::player" => qw(peaceful)], 3066 ["cf::player" => qw(peaceful)],
2952 ["cf::map" => qw(trigger)], 3067 ["cf::map" => qw(trigger)],
2953) { 3068) {
2954 no strict 'refs'; 3069 no strict 'refs';
3059 { 3174 {
3060 my $faces = $facedata->{faceinfo}; 3175 my $faces = $facedata->{faceinfo};
3061 3176
3062 while (my ($face, $info) = each %$faces) { 3177 while (my ($face, $info) = each %$faces) {
3063 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3178 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3179
3064 cf::face::set_visibility $idx, $info->{visibility}; 3180 cf::face::set_visibility $idx, $info->{visibility};
3065 cf::face::set_magicmap $idx, $info->{magicmap}; 3181 cf::face::set_magicmap $idx, $info->{magicmap};
3066 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3182 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3067 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3183 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3068 3184
3069 cf::cede_to_tick; 3185 cf::cede_to_tick;
3070 } 3186 }
3071 3187
3072 while (my ($face, $info) = each %$faces) { 3188 while (my ($face, $info) = each %$faces) {
3073 next unless $info->{smooth}; 3189 next unless $info->{smooth};
3190
3074 my $idx = cf::face::find $face 3191 my $idx = cf::face::find $face
3075 or next; 3192 or next;
3193
3076 if (my $smooth = cf::face::find $info->{smooth}) { 3194 if (my $smooth = cf::face::find $info->{smooth}) {
3077 cf::face::set_smooth $idx, $smooth; 3195 cf::face::set_smooth $idx, $smooth;
3078 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3196 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3079 } else { 3197 } else {
3080 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3198 warn "smooth face '$info->{smooth}' not found for face '$face'";
3098 { 3216 {
3099 # TODO: for gcfclient pleasure, we should give resources 3217 # TODO: for gcfclient pleasure, we should give resources
3100 # that gcfclient doesn't grok a >10000 face index. 3218 # that gcfclient doesn't grok a >10000 face index.
3101 my $res = $facedata->{resource}; 3219 my $res = $facedata->{resource};
3102 3220
3103 my $soundconf = delete $res->{"res/sound.conf"};
3104
3105 while (my ($name, $info) = each %$res) { 3221 while (my ($name, $info) = each %$res) {
3222 if (defined $info->{type}) {
3106 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3223 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3107 my $data; 3224 my $data;
3108 3225
3109 if ($info->{type} & 1) { 3226 if ($info->{type} & 1) {
3110 # prepend meta info 3227 # prepend meta info
3111 3228
3112 my $meta = $enc->encode ({ 3229 my $meta = $enc->encode ({
3113 name => $name, 3230 name => $name,
3114 %{ $info->{meta} || {} }, 3231 %{ $info->{meta} || {} },
3115 }); 3232 });
3116 3233
3117 $data = pack "(w/a*)*", $meta, $info->{data}; 3234 $data = pack "(w/a*)*", $meta, $info->{data};
3235 } else {
3236 $data = $info->{data};
3237 }
3238
3239 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3240 cf::face::set_type $idx, $info->{type};
3118 } else { 3241 } else {
3119 $data = $info->{data}; 3242 $RESOURCE{$name} = $info;
3120 } 3243 }
3121 3244
3122 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3123 cf::face::set_type $idx, $info->{type};
3124
3125 cf::cede_to_tick; 3245 cf::cede_to_tick;
3126 } 3246 }
3127
3128 if ($soundconf) {
3129 $soundconf = $enc->decode (delete $soundconf->{data});
3130
3131 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3132 my $sound = $soundconf->{compat}[$_]
3133 or next;
3134
3135 my $face = cf::face::find "sound/$sound->[1]";
3136 cf::sound::set $sound->[0] => $face;
3137 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3138 }
3139
3140 while (my ($k, $v) = each %{$soundconf->{event}}) {
3141 my $face = cf::face::find "sound/$v";
3142 cf::sound::set $k => $face;
3143 }
3144 }
3145 } 3247 }
3248
3249 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3146 3250
3147 1 3251 1
3148} 3252}
3253
3254cf::global->attach (on_resource_update => sub {
3255 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3256 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3257
3258 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3259 my $sound = $soundconf->{compat}[$_]
3260 or next;
3261
3262 my $face = cf::face::find "sound/$sound->[1]";
3263 cf::sound::set $sound->[0] => $face;
3264 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3265 }
3266
3267 while (my ($k, $v) = each %{$soundconf->{event}}) {
3268 my $face = cf::face::find "sound/$v";
3269 cf::sound::set $k => $face;
3270 }
3271 }
3272});
3149 3273
3150register_exticmd fx_want => sub { 3274register_exticmd fx_want => sub {
3151 my ($ns, $want) = @_; 3275 my ($ns, $want) = @_;
3152 3276
3153 while (my ($k, $v) = each %$want) { 3277 while (my ($k, $v) = each %$want) {
3154 $ns->fx_want ($k, $v); 3278 $ns->fx_want ($k, $v);
3155 } 3279 }
3156}; 3280};
3281
3282sub load_resource_file($) {
3283 my $guard = lock_acquire "load_resource_file";
3284
3285 my $status = load_resource_file_ $_[0];
3286 get_slot 0.1, 100;
3287 cf::arch::commit_load;
3288
3289 $status
3290}
3157 3291
3158sub reload_regions { 3292sub reload_regions {
3159 # HACK to clear player env face cache, we need some signal framework 3293 # HACK to clear player env face cache, we need some signal framework
3160 # for this (global event?) 3294 # for this (global event?)
3161 %ext::player_env::MUSIC_FACE_CACHE = (); 3295 %ext::player_env::MUSIC_FACE_CACHE = ();
3175} 3309}
3176 3310
3177sub reload_archetypes { 3311sub reload_archetypes {
3178 load_resource_file "$DATADIR/archetypes" 3312 load_resource_file "$DATADIR/archetypes"
3179 or die "unable to load archetypes\n"; 3313 or die "unable to load archetypes\n";
3180 #d# NEED to laod twice to resolve forward references
3181 # this really needs to be done in an extra post-pass
3182 # (which needs to be synchronous, so solve it differently)
3183 load_resource_file "$DATADIR/archetypes"
3184 or die "unable to load archetypes\n";
3185} 3314}
3186 3315
3187sub reload_treasures { 3316sub reload_treasures {
3188 load_resource_file "$DATADIR/treasures" 3317 load_resource_file "$DATADIR/treasures"
3189 or die "unable to load treasurelists\n"; 3318 or die "unable to load treasurelists\n";
3190} 3319}
3191 3320
3192sub reload_resources { 3321sub reload_resources {
3193 warn "reloading resource files...\n"; 3322 warn "reloading resource files...\n";
3194 3323
3324 reload_facedata;
3325 reload_archetypes;
3195 reload_regions; 3326 reload_regions;
3196 reload_facedata;
3197 #reload_archetypes;#d#
3198 reload_archetypes;
3199 reload_treasures; 3327 reload_treasures;
3200 3328
3201 warn "finished reloading resource files\n"; 3329 warn "finished reloading resource files\n";
3202} 3330}
3203 3331
3204sub init { 3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3205 reload_resources; 3337 reload_resources;
3206} 3338}
3207 3339
3208sub reload_config { 3340sub reload_config {
3209 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
3210 or return; 3342 or return;
3211 3343
3212 local $/; 3344 local $/;
3213 *CFG = YAML::Syck::Load <$fh>; 3345 *CFG = YAML::Load <$fh>;
3214 3346
3215 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3216 3348
3217 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3218 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3224 }; 3356 };
3225 warn $@ if $@; 3357 warn $@ if $@;
3226 } 3358 }
3227} 3359}
3228 3360
3361sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!";
3364 flock $fh, &Fcntl::LOCK_EX
3365 or die "$PIDFILE: flock: $!";
3366 $fh
3367}
3368
3369# make sure only one server instance is running at any one time
3370sub atomic {
3371 my $fh = pidfile;
3372
3373 my $pid = <$fh>;
3374 kill 9, $pid if $pid > 0;
3375
3376 seek $fh, 0, 0;
3377 print $fh $$;
3378}
3379
3229sub main { 3380sub main {
3381 atomic;
3382
3230 # we must not ever block the main coroutine 3383 # we must not ever block the main coroutine
3231 local $Coro::idle = sub { 3384 local $Coro::idle = sub {
3232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3233 (async { 3386 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3387 $Coro::current->{desc} = "IDLE BUG HANDLER";
3235 Event::one_event; 3388 EV::loop EV::LOOP_ONESHOT;
3236 })->prio (Coro::PRIO_MAX); 3389 })->prio (Coro::PRIO_MAX);
3237 }; 3390 };
3238 3391
3392 {
3393 my $guard = freeze_mainloop;
3239 reload_config; 3394 reload_config;
3240 db_init; 3395 db_init;
3241 load_extensions; 3396 load_extensions;
3242 3397
3243 $TICK_WATCHER->start; 3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 }
3400
3401 utime time, time, $RUNTIMEFILE;
3402
3403 # no (long-running) fork's whatsoever before this point(!)
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3405
3244 Event::loop; 3406 EV::loop;
3245} 3407}
3246 3408
3247############################################################################# 3409#############################################################################
3248# initialisation and cleanup 3410# initialisation and cleanup
3249 3411
3250# install some emergency cleanup handlers 3412# install some emergency cleanup handlers
3251BEGIN { 3413BEGIN {
3414 our %SIGWATCHER = ();
3252 for my $signal (qw(INT HUP TERM)) { 3415 for my $signal (qw(INT HUP TERM)) {
3253 Event->signal ( 3416 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3254 reentrant => 0,
3255 data => WF_AUTOCANCEL,
3256 signal => $signal,
3257 prio => 0,
3258 cb => sub {
3259 cf::cleanup "SIG$signal"; 3417 cf::cleanup "SIG$signal";
3260 },
3261 ); 3418 };
3262 } 3419 }
3263} 3420}
3264 3421
3265sub write_runtime { 3422sub write_runtime_sync {
3266 my $runtime = "$LOCALDIR/runtime";
3267
3268 # first touch the runtime file to show we are still running: 3423 # first touch the runtime file to show we are still running:
3269 # the fsync below can take a very very long time. 3424 # the fsync below can take a very very long time.
3270 3425
3271 IO::AIO::aio_utime $runtime, undef, undef; 3426 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3272 3427
3273 my $guard = cf::lock_acquire "write_runtime"; 3428 my $guard = cf::lock_acquire "write_runtime";
3274 3429
3275 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3430 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3276 or return; 3431 or return;
3277 3432
3278 my $value = $cf::RUNTIME + 90 + 10; 3433 my $value = $cf::RUNTIME + 90 + 10;
3279 # 10 is the runtime save interval, for a monotonic clock 3434 # 10 is the runtime save interval, for a monotonic clock
3280 # 60 allows for the watchdog to kill the server. 3435 # 60 allows for the watchdog to kill the server.
3290 aio_utime $fh, undef, undef; 3445 aio_utime $fh, undef, undef;
3291 3446
3292 close $fh 3447 close $fh
3293 or return; 3448 or return;
3294 3449
3295 aio_rename "$runtime~", $runtime 3450 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3296 and return; 3451 and return;
3297 3452
3298 warn "runtime file written.\n"; 3453 warn "runtime file written.\n";
3299 3454
3300 1 3455 1
3456}
3457
3458our $uuid_lock;
3459our $uuid_skip;
3460
3461sub write_uuid_sync($) {
3462 $uuid_skip ||= $_[0];
3463
3464 return if $uuid_lock;
3465 local $uuid_lock = 1;
3466
3467 my $uuid = "$LOCALDIR/uuid";
3468
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return;
3471
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3473 $uuid_skip = 0;
3474
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return;
3477
3478 # always fsync - this file is important
3479 aio_fsync $fh
3480 and return;
3481
3482 close $fh
3483 or return;
3484
3485 aio_rename "$uuid~", $uuid
3486 and return;
3487
3488 warn "uuid file written ($value).\n";
3489
3490 1
3491
3492}
3493
3494sub write_uuid($$) {
3495 my ($skip, $sync) = @_;
3496
3497 $sync ? write_uuid_sync $skip
3498 : async { write_uuid_sync $skip };
3301} 3499}
3302 3500
3303sub emergency_save() { 3501sub emergency_save() {
3304 my $freeze_guard = cf::freeze_mainloop; 3502 my $freeze_guard = cf::freeze_mainloop;
3305 3503
3327 warn "end emergency map save\n"; 3525 warn "end emergency map save\n";
3328 3526
3329 warn "begin emergency database checkpoint\n"; 3527 warn "begin emergency database checkpoint\n";
3330 BDB::db_env_txn_checkpoint $DB_ENV; 3528 BDB::db_env_txn_checkpoint $DB_ENV;
3331 warn "end emergency database checkpoint\n"; 3529 warn "end emergency database checkpoint\n";
3530
3531 warn "begin write uuid\n";
3532 write_uuid_sync 1;
3533 warn "end write uuid\n";
3332 }; 3534 };
3333 3535
3334 warn "leave emergency perl save\n"; 3536 warn "leave emergency perl save\n";
3335} 3537}
3336 3538
3337sub post_cleanup { 3539sub post_cleanup {
3338 my ($make_core) = @_; 3540 my ($make_core) = @_;
3339 3541
3340 warn Carp::longmess "post_cleanup backtrace" 3542 warn Carp::longmess "post_cleanup backtrace"
3341 if $make_core; 3543 if $make_core;
3544
3545 my $fh = pidfile;
3546 unlink $PIDFILE if <$fh> == $$;
3342} 3547}
3548
3549# a safer delete_package, copied from Symbol
3550sub clear_package($) {
3551 my $pkg = shift;
3552
3553 # expand to full symbol table name if needed
3554 unless ($pkg =~ /^main::.*::$/) {
3555 $pkg = "main$pkg" if $pkg =~ /^::/;
3556 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3557 $pkg .= '::' unless $pkg =~ /::$/;
3558 }
3559
3560 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3561 my $stem_symtab = *{$stem}{HASH};
3562
3563 defined $stem_symtab and exists $stem_symtab->{$leaf}
3564 or return;
3565
3566 # clear all symbols
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 }
3572 warn "cleared package #$pkg\n";#d#
3573}
3574
3575our $RELOAD; # how many times to reload
3343 3576
3344sub do_reload_perl() { 3577sub do_reload_perl() {
3345 # can/must only be called in main 3578 # can/must only be called in main
3346 if ($Coro::current != $Coro::main) { 3579 if ($Coro::current != $Coro::main) {
3347 warn "can only reload from main coroutine"; 3580 warn "can only reload from main coroutine";
3348 return; 3581 return;
3349 } 3582 }
3350 3583
3584 return if $RELOAD++;
3585
3586 while ($RELOAD) {
3351 warn "reloading..."; 3587 warn "reloading...";
3352 3588
3353 warn "entering sync_job"; 3589 warn "entering sync_job";
3354 3590
3355 cf::sync_job { 3591 cf::sync_job {
3356 cf::write_runtime; # external watchdog should not bark 3592 cf::write_runtime_sync; # external watchdog should not bark
3357 cf::emergency_save; 3593 cf::emergency_save;
3358 cf::write_runtime; # external watchdog should not bark 3594 cf::write_runtime_sync; # external watchdog should not bark
3359 3595
3360 warn "syncing database to disk"; 3596 warn "syncing database to disk";
3361 BDB::db_env_txn_checkpoint $DB_ENV; 3597 BDB::db_env_txn_checkpoint $DB_ENV;
3362 3598
3363 # if anything goes wrong in here, we should simply crash as we already saved 3599 # if anything goes wrong in here, we should simply crash as we already saved
3364 3600
3365 warn "cancelling all WF_AUTOCANCEL watchers";
3366 for (Event::all_watchers) {
3367 $_->cancel if $_->data & WF_AUTOCANCEL;
3368 }
3369
3370 warn "flushing outstanding aio requests"; 3601 warn "flushing outstanding aio requests";
3371 for (;;) {
3372 BDB::flush;
3373 IO::AIO::flush;
3374 Coro::cede;
3375 last unless IO::AIO::nreqs || BDB::nreqs; 3602 while (IO::AIO::nreqs || BDB::nreqs) {
3376 warn "iterate..."; 3603 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3377 }
3378
3379 ++$RELOAD;
3380
3381 warn "cancelling all extension coros";
3382 $_->cancel for values %EXT_CORO;
3383 %EXT_CORO = ();
3384
3385 warn "removing commands";
3386 %COMMAND = ();
3387
3388 warn "removing ext/exti commands";
3389 %EXTCMD = ();
3390 %EXTICMD = ();
3391
3392 warn "unloading/nuking all extensions";
3393 for my $pkg (@EXTS) {
3394 warn "... unloading $pkg";
3395
3396 if (my $cb = $pkg->can ("unload")) {
3397 eval {
3398 $cb->($pkg);
3399 1
3400 } or warn "$pkg unloaded, but with errors: $@";
3401 } 3604 }
3402 3605
3403 warn "... nuking $pkg"; 3606 warn "cancelling all extension coros";
3404 Symbol::delete_package $pkg; 3607 $_->cancel for values %EXT_CORO;
3405 } 3608 %EXT_CORO = ();
3406 3609
3407 warn "unloading all perl modules loaded from $LIBDIR"; 3610 warn "removing commands";
3408 while (my ($k, $v) = each %INC) { 3611 %COMMAND = ();
3409 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3410 3612
3613 warn "removing ext/exti commands";
3614 %EXTCMD = ();
3615 %EXTICMD = ();
3616
3617 warn "unloading/nuking all extensions";
3618 for my $pkg (@EXTS) {
3411 warn "... unloading $k"; 3619 warn "... unloading $pkg";
3412 delete $INC{$k};
3413 3620
3414 $k =~ s/\.pm$//;
3415 $k =~ s/\//::/g;
3416
3417 if (my $cb = $k->can ("unload_module")) { 3621 if (my $cb = $pkg->can ("unload")) {
3622 eval {
3418 $cb->(); 3623 $cb->($pkg);
3624 1
3625 } or warn "$pkg unloaded, but with errors: $@";
3626 }
3627
3628 warn "... clearing $pkg";
3629 clear_package $pkg;
3419 } 3630 }
3420 3631
3421 Symbol::delete_package $k; 3632 warn "unloading all perl modules loaded from $LIBDIR";
3633 while (my ($k, $v) = each %INC) {
3634 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3635
3636 warn "... unloading $k";
3637 delete $INC{$k};
3638
3639 $k =~ s/\.pm$//;
3640 $k =~ s/\//::/g;
3641
3642 if (my $cb = $k->can ("unload_module")) {
3643 $cb->();
3644 }
3645
3646 clear_package $k;
3422 } 3647 }
3423 3648
3424 warn "getting rid of safe::, as good as possible"; 3649 warn "getting rid of safe::, as good as possible";
3425 Symbol::delete_package "safe::$_" 3650 clear_package "safe::$_"
3426 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3427 3652
3428 warn "unloading cf.pm \"a bit\""; 3653 warn "unloading cf.pm \"a bit\"";
3429 delete $INC{"cf.pm"}; 3654 delete $INC{"cf.pm"};
3430 delete $INC{"cf/pod.pm"}; 3655 delete $INC{"cf/pod.pm"};
3431 3656
3432 # don't, removes xs symbols, too, 3657 # don't, removes xs symbols, too,
3433 # and global variables created in xs 3658 # and global variables created in xs
3434 #Symbol::delete_package __PACKAGE__; 3659 #clear_package __PACKAGE__;
3435 3660
3436 warn "unload completed, starting to reload now"; 3661 warn "unload completed, starting to reload now";
3437 3662
3438 warn "reloading cf.pm"; 3663 warn "reloading cf.pm";
3439 require cf; 3664 require cf;
3440 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3665 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3441 3666
3442 warn "loading config and database again"; 3667 warn "loading config and database again";
3443 cf::reload_config; 3668 cf::reload_config;
3444 3669
3445 warn "loading extensions"; 3670 warn "loading extensions";
3446 cf::load_extensions; 3671 cf::load_extensions;
3447 3672
3448 warn "reattaching attachments to objects/players"; 3673 warn "reattaching attachments to objects/players";
3449 _global_reattach; # objects, sockets 3674 _global_reattach; # objects, sockets
3450 warn "reattaching attachments to maps"; 3675 warn "reattaching attachments to maps";
3451 reattach $_ for values %MAP; 3676 reattach $_ for values %MAP;
3452 warn "reattaching attachments to players"; 3677 warn "reattaching attachments to players";
3453 reattach $_ for values %PLAYER; 3678 reattach $_ for values %PLAYER;
3454 3679
3455 warn "leaving sync_job"; 3680 warn "leaving sync_job";
3456 3681
3457 1 3682 1
3458 } or do { 3683 } or do {
3459 warn $@; 3684 warn $@;
3460 warn "error while reloading, exiting."; 3685 cf::cleanup "error while reloading, exiting.";
3461 exit 1;
3462 }; 3686 };
3463 3687
3464 warn "reloaded"; 3688 warn "reloaded";
3689 --$RELOAD;
3690 }
3465}; 3691};
3466 3692
3467our $RELOAD_WATCHER; # used only during reload 3693our $RELOAD_WATCHER; # used only during reload
3468 3694
3469sub reload_perl() { 3695sub reload_perl() {
3470 # doing reload synchronously and two reloads happen back-to-back, 3696 # doing reload synchronously and two reloads happen back-to-back,
3471 # coro crashes during coro_state_free->destroy here. 3697 # coro crashes during coro_state_free->destroy here.
3472 3698
3473 $RELOAD_WATCHER ||= Event->timer ( 3699 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3474 reentrant => 0,
3475 after => 0,
3476 data => WF_AUTOCANCEL,
3477 cb => sub {
3478 do_reload_perl; 3700 do_reload_perl;
3479 undef $RELOAD_WATCHER; 3701 undef $RELOAD_WATCHER;
3480 },
3481 ); 3702 };
3482} 3703}
3483 3704
3484register_command "reload" => sub { 3705register_command "reload" => sub {
3485 my ($who, $arg) = @_; 3706 my ($who, $arg) = @_;
3486 3707
3499 3720
3500our @WAIT_FOR_TICK; 3721our @WAIT_FOR_TICK;
3501our @WAIT_FOR_TICK_BEGIN; 3722our @WAIT_FOR_TICK_BEGIN;
3502 3723
3503sub wait_for_tick { 3724sub wait_for_tick {
3504 return unless $TICK_WATCHER->is_active;
3505 return if $Coro::current == $Coro::main; 3725 return if tick_inhibit || $Coro::current == $Coro::main;
3506 3726
3507 my $signal = new Coro::Signal; 3727 my $signal = new Coro::Signal;
3508 push @WAIT_FOR_TICK, $signal; 3728 push @WAIT_FOR_TICK, $signal;
3509 $signal->wait; 3729 $signal->wait;
3510} 3730}
3511 3731
3512sub wait_for_tick_begin { 3732sub wait_for_tick_begin {
3513 return unless $TICK_WATCHER->is_active;
3514 return if $Coro::current == $Coro::main; 3733 return if tick_inhibit || $Coro::current == $Coro::main;
3515 3734
3516 my $signal = new Coro::Signal; 3735 my $signal = new Coro::Signal;
3517 push @WAIT_FOR_TICK_BEGIN, $signal; 3736 push @WAIT_FOR_TICK_BEGIN, $signal;
3518 $signal->wait; 3737 $signal->wait;
3519} 3738}
3520 3739
3521$TICK_WATCHER = Event->timer ( 3740sub tick {
3522 reentrant => 0,
3523 parked => 1,
3524 prio => 0,
3525 at => $NEXT_TICK || $TICK,
3526 data => WF_AUTOCANCEL,
3527 cb => sub {
3528 if ($Coro::current != $Coro::main) { 3741 if ($Coro::current != $Coro::main) {
3529 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3742 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3530 unless ++$bug_warning > 10; 3743 unless ++$bug_warning > 10;
3531 return; 3744 return;
3532 } 3745 }
3533 3746
3534 $NOW = $tick_start = Event::time;
3535
3536 cf::server_tick; # one server iteration 3747 cf::server_tick; # one server iteration
3537 3748
3538 $RUNTIME += $TICK;
3539 $NEXT_TICK += $TICK;
3540
3541 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3749 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3542 $NEXT_RUNTIME_WRITE = $NOW + 10; 3750 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3543 Coro::async_pool { 3751 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver"; 3752 $Coro::current->{desc} = "runtime saver";
3545 write_runtime 3753 write_runtime_sync
3546 or warn "ERROR: unable to write runtime file: $!"; 3754 or warn "ERROR: unable to write runtime file: $!";
3547 };
3548 } 3755 };
3756 }
3549 3757
3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3758 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3551 $sig->send; 3759 $sig->send;
3552 } 3760 }
3553 while (my $sig = shift @WAIT_FOR_TICK) { 3761 while (my $sig = shift @WAIT_FOR_TICK) {
3554 $sig->send; 3762 $sig->send;
3555 } 3763 }
3556 3764
3557 $NOW = Event::time; 3765 $LOAD = ($NOW - $TICK_START) / $TICK;
3558
3559 # if we are delayed by four ticks or more, skip them all
3560 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3561
3562 $TICK_WATCHER->at ($NEXT_TICK);
3563 $TICK_WATCHER->start;
3564
3565 $LOAD = ($NOW - $tick_start) / $TICK;
3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3766 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3567 3767
3568 _post_tick; 3768 if (0) {
3769 if ($NEXT_TICK) {
3770 my $jitter = $TICK_START - $NEXT_TICK;
3771 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3772 warn "jitter $JITTER\n";#d#
3773 }
3569 }, 3774 }
3570); 3775}
3571 3776
3572{ 3777{
3778 # configure BDB
3779
3573 BDB::min_parallel 8; 3780 BDB::min_parallel 8;
3574 BDB::max_poll_time $TICK * 0.1; 3781 BDB::max_poll_reqs $TICK * 0.1;
3575 $BDB_POLL_WATCHER = Event->io ( 3782 $AnyEvent::BDB::WATCHER->priority (1);
3576 reentrant => 0,
3577 fd => BDB::poll_fileno,
3578 poll => 'r',
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => \&BDB::poll_cb,
3582 );
3583
3584 BDB::set_sync_prepare {
3585 my $status;
3586 my $current = $Coro::current;
3587 (
3588 sub {
3589 $status = $!;
3590 $current->ready; undef $current;
3591 },
3592 sub {
3593 Coro::schedule while defined $current;
3594 $! = $status;
3595 },
3596 )
3597 };
3598 3783
3599 unless ($DB_ENV) { 3784 unless ($DB_ENV) {
3600 $DB_ENV = BDB::db_env_create; 3785 $DB_ENV = BDB::db_env_create;
3601 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3786 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3602 | BDB::LOG_AUTOREMOVE, 1); 3787 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3788 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3603 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3789 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3604 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3790 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3605 3791
3606 cf::sync_job { 3792 cf::sync_job {
3607 eval { 3793 eval {
3617 3803
3618 cf::cleanup "db_env_open(db): $@" if $@; 3804 cf::cleanup "db_env_open(db): $@" if $@;
3619 }; 3805 };
3620 } 3806 }
3621 3807
3622 $BDB_DEADLOCK_WATCHER = Event->timer ( 3808 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3809 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3630 },
3631 ); 3810 };
3632 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3811 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3633 after => 11,
3634 interval => 60,
3635 hard => 1,
3636 prio => 0,
3637 data => WF_AUTOCANCEL,
3638 cb => sub {
3639 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3812 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3640 },
3641 ); 3813 };
3642 $BDB_TRICKLE_WATCHER = Event->timer ( 3814 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3643 after => 5,
3644 interval => 10,
3645 hard => 1,
3646 prio => 0,
3647 data => WF_AUTOCANCEL,
3648 cb => sub {
3649 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3815 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3650 },
3651 ); 3816 };
3652} 3817}
3653 3818
3654{ 3819{
3820 # configure IO::AIO
3821
3655 IO::AIO::min_parallel 8; 3822 IO::AIO::min_parallel 8;
3656
3657 undef $Coro::AIO::WATCHER;
3658 IO::AIO::max_poll_time $TICK * 0.1; 3823 IO::AIO::max_poll_time $TICK * 0.1;
3659 $AIO_POLL_WATCHER = Event->io ( 3824 undef $AnyEvent::AIO::WATCHER;
3660 reentrant => 0,
3661 data => WF_AUTOCANCEL,
3662 fd => IO::AIO::poll_fileno,
3663 poll => 'r',
3664 prio => 0,
3665 cb => \&IO::AIO::poll_cb,
3666 );
3667} 3825}
3668 3826
3669my $_log_backtrace; 3827my $_log_backtrace;
3670 3828
3671sub _log_backtrace { 3829sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines