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.370 by root, Thu Sep 13 10:59:41 2007 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# 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 Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.32 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 75
43$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
44 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
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
49 78
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54 85
55our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
65our $DATADIR = datadir; 99our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
69our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
75 120
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $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 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 123our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
83 125
84our $BDB_POLL_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 129our $DB_ENV;
88 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
89our %CFG; 133our %CFG;
90 134
91our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 136our $RUNTIME;
137our $NOW;
93 138
94our (%PLAYER, %PLAYER_LOADING); # all users 139our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 140our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 141our $LINK_MAP; # the special {link} map, which is always available
97 142
98# used to convert map paths into valid unix filenames by replacing / by ∕ 143# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 144our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 145
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
148our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
150
151our @POST_INIT;
152
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
104 155
105binmode STDOUT; 156binmode STDOUT;
106binmode STDERR; 157binmode STDERR;
107 158
108# read virtual server time, if available 159# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
113} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
114 167
115mkdir $_ 168mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 170
118our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
119 172
120sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
121 189
122############################################################################# 190#############################################################################
123 191
124=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
125 193
161 229
162The raw value load value from the last tick. 230The raw value load value from the last tick.
163 231
164=item %cf::CFG 232=item %cf::CFG
165 233
166Configuration for the server, loaded from C</etc/crossfire/config>, or 234Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 235from wherever your confdir points to.
168 236
169=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
170 238
171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
172returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
173per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
174 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
175=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
176 249
177This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call. 252that call.
180 253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
181=back 260=back
182 261
183=cut 262=cut
184 263
185BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
186 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
187 my $msg = join "", @_; 271 my $msg = join "", @_;
188 272
189 $msg .= "\n" 273 $msg .= "\n"
190 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
191 275
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 277
194 LOG llevError, $msg; 278 LOG llevWarn, $msg;
195 }; 279};
196} 280
281$Coro::State::DIEHOOK = sub {
282 return unless $^S eq 0; # "eq", not "=="
283
284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
287 error "DIEHOOK called in main context, Coro bug?\n";#d#
288 return;#d#
289 }#d#
290
291 # kill coroutine otherwise
292 Coro::terminate
293};
197 294
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 305for my $pkg (qw(
209 cf::global cf::attachable 306 cf::global cf::attachable
210 cf::object cf::object::player 307 cf::object cf::object::player
211 cf::client cf::player 308 cf::client cf::player
212 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
213 cf::map cf::party cf::region 311 cf::party cf::region
214)) { 312)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 314}
218 315
219$Event::DIED = sub { 316$EV::DIED = sub {
220 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
221}; 318};
222 319
223############################################################################# 320#############################################################################
224 321
225=head2 UTILITY FUNCTIONS 322=head2 UTILITY FUNCTIONS
247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 344 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248 $d 345 $d
249 } || "[unable to dump $_[0]: '$@']"; 346 } || "[unable to dump $_[0]: '$@']";
250} 347}
251 348
252=item $ref = cf::from_json $json 349=item $ref = cf::decode_json $json
253 350
254Converts a JSON string into the corresponding perl data structure. 351Converts a JSON string into the corresponding perl data structure.
255 352
256=item $json = cf::to_json $ref 353=item $json = cf::encode_json $ref
257 354
258Converts a perl data structure into its JSON representation. 355Converts a perl data structure into its JSON representation.
259 356
260=cut 357=cut
261 358
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 359our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 360
264sub to_json ($) { $json_coder->encode ($_[0]) } 361sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 362sub decode_json($) { $json_coder->decode ($_[0]) }
363
364=item $ref = cf::yaml_load $scalar
365
366Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367
368=cut
369
370sub fork_call(&@);
371
372sub yaml_load($) {
373 fork_call { YAML::XS::Load $_[0] } @_
374}
375
376=item cf::post_init { BLOCK }
377
378Execute the given codeblock, I<after> all extensions have been (re-)loaded,
379but I<before> the server starts ticking again.
380
381The codeblock will have a single boolean argument to indicate whether this
382is a reload or not.
383
384=cut
385
386sub post_init(&) {
387 push @POST_INIT, shift;
388}
389
390sub _post_init {
391 trace "running post_init jobs";
392
393 # run them in parallel...
394
395 my @join;
396
397 while () {
398 push @join, map &Coro::async ($_, 0), @POST_INIT;
399 @POST_INIT = ();
400
401 @join or last;
402
403 (pop @join)->join;
404 }
405}
266 406
267=item cf::lock_wait $string 407=item cf::lock_wait $string
268 408
269Wait until the given lock is available. See cf::lock_acquire. 409Wait until the given lock is available. See cf::lock_acquire.
270 410
271=item my $lock = cf::lock_acquire $string 411=item my $lock = cf::lock_acquire $string
272 412
273Wait until the given lock is available and then acquires it and returns 413Wait until the given lock is available and then acquires it and returns
274a Coro::guard object. If the guard object gets destroyed (goes out of scope, 414a L<Guard> object. If the guard object gets destroyed (goes out of scope,
275for example when the coroutine gets canceled), the lock is automatically 415for example when the coroutine gets canceled), the lock is automatically
276returned. 416returned.
277 417
278Locks are *not* recursive, locking from the same coro twice results in a 418Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro. 419deadlocked coro.
285 425
286Return true if the lock is currently active, i.e. somebody has locked it. 426Return true if the lock is currently active, i.e. somebody has locked it.
287 427
288=cut 428=cut
289 429
290our %LOCK; 430our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 431
293sub lock_wait($) { 432sub lock_wait($) {
294 my ($key) = @_; 433 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 434}
307 435
308sub lock_acquire($) { 436sub lock_acquire($) {
309 my ($key) = @_; 437 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 438}
323 439
324sub lock_active($) { 440sub lock_active($) {
325 my ($key) = @_; 441 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 442}
329 443
330sub freeze_mainloop { 444sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 445 tick_inhibit_inc;
332 446
333 my $guard = Coro::guard { 447 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start; 448}
335 }; 449
336 $TICK_WATCHER->stop; 450=item cf::periodic $interval, $cb
337 $guard 451
452Like EV::periodic, but randomly selects a starting point so that the actions
453get spread over time.
454
455=cut
456
457sub periodic($$) {
458 my ($interval, $cb) = @_;
459
460 my $start = rand List::Util::min 180, $interval;
461
462 EV::periodic $start, $interval, 0, $cb
338} 463}
339 464
340=item cf::get_slot $time[, $priority[, $name]] 465=item cf::get_slot $time[, $priority[, $name]]
341 466
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 467Allocate $time seconds of blocking CPU time at priority C<$priority>:
350 475
351=cut 476=cut
352 477
353our @SLOT_QUEUE; 478our @SLOT_QUEUE;
354our $SLOT_QUEUE; 479our $SLOT_QUEUE;
480our $SLOT_DECAY = 0.9;
355 481
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 482$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 483$SLOT_QUEUE = Coro::async {
484 $Coro::current->desc ("timeslot manager");
485
358 my $signal = new Coro::Signal; 486 my $signal = new Coro::Signal;
487 my $busy;
359 488
360 while () { 489 while () {
361 next_job: 490 next_job:
491
362 my $avail = cf::till_tick; 492 my $avail = cf::till_tick;
363 if ($avail > 0.01) { 493
364 for (0 .. $#SLOT_QUEUE) { 494 for (0 .. $#SLOT_QUEUE) {
365 if ($SLOT_QUEUE[$_][0] < $avail) { 495 if ($SLOT_QUEUE[$_][0] <= $avail) {
496 $busy = 0;
366 my $job = splice @SLOT_QUEUE, $_, 1, (); 497 my $job = splice @SLOT_QUEUE, $_, 1, ();
367 $job->[2]->send; 498 $job->[2]->send;
368 Coro::cede; 499 Coro::cede;
369 goto next_job; 500 goto next_job;
370 } 501 } else {
502 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
371 } 503 }
372 } 504 }
373 505
374 if (@SLOT_QUEUE) { 506 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 507 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 508 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 509 $signal->wait;
378 } else { 510 } else {
511 $busy = 0;
379 Coro::schedule; 512 Coro::schedule;
380 } 513 }
381 } 514 }
382}; 515};
383 516
384sub get_slot($;$$) { 517sub get_slot($;$$) {
518 return if tick_inhibit || $Coro::current == $Coro::main;
519
385 my ($time, $pri, $name) = @_; 520 my ($time, $pri, $name) = @_;
386 521
387 $time = $TICK * .6 if $time > $TICK * .6; 522 $time = clamp $time, 0.01, $TICK * .6;
523
388 my $sig = new Coro::Signal; 524 my $sig = new Coro::Signal;
389 525
390 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 526 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
391 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 527 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
392 $SLOT_QUEUE->ready; 528 $SLOT_QUEUE->ready;
403 539
404BEGIN { *async = \&Coro::async_pool } 540BEGIN { *async = \&Coro::async_pool }
405 541
406=item cf::sync_job { BLOCK } 542=item cf::sync_job { BLOCK }
407 543
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 544The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 545is always able to handle events or runnable, as Deliantra is only
410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 546partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 547acceptable.
412 548
413If it must be done, put the blocking parts into C<sync_job>. This will run 549If it must be done, put the blocking parts into C<sync_job>. This will run
414the given BLOCK in another coroutine while waiting for the result. The 550the given BLOCK in another coroutine while waiting for the result. The
418=cut 554=cut
419 555
420sub sync_job(&) { 556sub sync_job(&) {
421 my ($job) = @_; 557 my ($job) = @_;
422 558
423 if ($Coro::current == $Coro::main) { 559 if (in_main) {
424 my $time = Event::time; 560 my $time = AE::time;
425 561
426 # this is the main coro, too bad, we have to block 562 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 563 # till the operation succeeds, freezing the server :/
428 564
429 # TODO: use suspend/resume instead 565 #LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 566
431 my $freeze_guard = freeze_mainloop; 567 my $freeze_guard = freeze_mainloop;
432 568
433 my $busy = 1; 569 my $busy = 1;
434 my @res; 570 my @res;
435 571
436 (async { 572 (async {
573 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 574 @res = eval { $job->() };
438 warn $@ if $@; 575 error $@ if $@;
439 undef $busy; 576 undef $busy;
440 })->prio (Coro::PRIO_MAX); 577 })->prio (Coro::PRIO_MAX);
441 578
442 while ($busy) { 579 while ($busy) {
443 Coro::cede or Event::one_event; 580 if (Coro::nready) {
581 Coro::cede_notself;
582 } else {
583 EV::loop EV::LOOP_ONESHOT;
444 } 584 }
585 }
445 586
446 $time = Event::time - $time; 587 my $time = AE::time - $time;
447 588
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load 589 $TICK_START += $time; # do not account sync jobs to server load
452 590
453 wantarray ? @res : $res[0] 591 wantarray ? @res : $res[0]
454 } else { 592 } else {
455 # we are in another coroutine, how wonderful, everything just works 593 # we are in another coroutine, how wonderful, everything just works
456 594
476 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
477 615
478 $coro 616 $coro
479} 617}
480 618
481=item fork_call { }, $args 619=item fork_call { }, @args
482 620
483Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 624never block itself or use any form of event handling.
487 625
488=cut 626=cut
627
628sub post_fork {
629 reset_signals;
630}
489 631
490sub fork_call(&@) { 632sub fork_call(&@) {
491 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
492 634
493 # we seemingly have to make a local copy of the whole thing, 635 # we seemingly have to make a local copy of the whole thing,
494 # otherwise perl prematurely frees the stuff :/ 636 # otherwise perl prematurely frees the stuff :/
495 # TODO: investigate and fix (likely this will be rather laborious) 637 # TODO: investigate and fix (likely this will be rather laborious)
496 638
497 my @res = Coro::Util::fork_eval { 639 my @res = Coro::Util::fork_eval {
498 reset_signals; 640 cf::post_fork;
499 &$cb 641 &$cb
500 }, @args; 642 } @args;
501 643
502 wantarray ? @res : $res[-1] 644 wantarray ? @res : $res[-1]
645}
646
647sub objinfo {
648 (
649 "counter value" => cf::object::object_count,
650 "objects created" => cf::object::create_count,
651 "objects destroyed" => cf::object::destroy_count,
652 "freelist size" => cf::object::free_count,
653 "allocated objects" => cf::object::objects_size,
654 "active objects" => cf::object::actives_size,
655 )
656}
657
658=item $coin = coin_from_name $name
659
660=cut
661
662our %coin_alias = (
663 "silver" => "silvercoin",
664 "silvercoin" => "silvercoin",
665 "silvercoins" => "silvercoin",
666 "gold" => "goldcoin",
667 "goldcoin" => "goldcoin",
668 "goldcoins" => "goldcoin",
669 "platinum" => "platinacoin",
670 "platinumcoin" => "platinacoin",
671 "platinumcoins" => "platinacoin",
672 "platina" => "platinacoin",
673 "platinacoin" => "platinacoin",
674 "platinacoins" => "platinacoin",
675 "royalty" => "royalty",
676 "royalties" => "royalty",
677);
678
679sub coin_from_name($) {
680 $coin_alias{$_[0]}
681 ? cf::arch::find $coin_alias{$_[0]}
682 : undef
503} 683}
504 684
505=item $value = cf::db_get $family => $key 685=item $value = cf::db_get $family => $key
506 686
507Returns a single value from the environment database. 687Returns a single value from the environment database.
517within each server. 697within each server.
518 698
519=cut 699=cut
520 700
521sub db_table($) { 701sub db_table($) {
702 cf::error "db_get called from main context"
703 if $Coro::current == $Coro::main;
704
522 my ($name) = @_; 705 my ($name) = @_;
523 my $db = BDB::db_create $DB_ENV; 706 my $db = BDB::db_create $DB_ENV;
524 707
525 eval { 708 eval {
526 $db->set_flags (BDB::CHKSUM); 709 $db->set_flags (BDB::CHKSUM);
536} 719}
537 720
538our $DB; 721our $DB;
539 722
540sub db_init { 723sub db_init {
541 cf::sync_job {
542 $DB ||= db_table "db"; 724 $DB ||= db_table "db";
543 };
544} 725}
545 726
546sub db_get($$) { 727sub db_get($$) {
547 my $key = "$_[0]/$_[1]"; 728 my $key = "$_[0]/$_[1]";
548 729
549 cf::sync_job { 730 cf::error "db_get called from main context"
731 if $Coro::current == $Coro::main;
732
550 BDB::db_get $DB, undef, $key, my $data; 733 BDB::db_get $DB, undef, $key, my $data;
551 734
552 $! ? () 735 $! ? ()
553 : $data 736 : $data
554 }
555} 737}
556 738
557sub db_put($$$) { 739sub db_put($$$) {
558 BDB::dbreq_pri 4; 740 BDB::dbreq_pri 4;
559 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 741 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
615 797
616 my $t1 = Time::HiRes::time; 798 my $t1 = Time::HiRes::time;
617 my $data = $process->(\@data); 799 my $data = $process->(\@data);
618 my $t2 = Time::HiRes::time; 800 my $t2 = Time::HiRes::time;
619 801
620 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 802 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
621 803
622 db_put cache => "$id/data", $data; 804 db_put cache => "$id/data", $data;
623 db_put cache => "$id/md5" , $md5; 805 db_put cache => "$id/md5" , $md5;
624 db_put cache => "$id/meta", $meta; 806 db_put cache => "$id/meta", $meta;
625 807
635 817
636=cut 818=cut
637 819
638sub datalog($@) { 820sub datalog($@) {
639 my ($type, %kv) = @_; 821 my ($type, %kv) = @_;
640 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 822 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
641} 823}
642 824
643=back 825=back
644 826
645=cut 827=cut
646 828
647############################################################################# 829#############################################################################
648 830
649=head2 ATTACHABLE OBJECTS 831=head2 ATTACHABLE OBJECTS
650 832
651Many objects in crossfire are so-called attachable objects. That means you can 833Many objects in deliantra are so-called attachable objects. That means you can
652attach callbacks/event handlers (a collection of which is called an "attachment") 834attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 835to it. All such attachable objects support the following methods.
654 836
655In the following description, CLASS can be any of C<global>, C<object> 837In the following description, CLASS can be any of C<global>, C<object>
656C<player>, C<client> or C<map> (i.e. the attachable objects in 838C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 839Deliantra).
658 840
659=over 4 841=over 4
660 842
661=item $attachable->attach ($attachment, key => $value...) 843=item $attachable->attach ($attachment, key => $value...)
662 844
706=item cf::CLASS::attachment $name, ... 888=item cf::CLASS::attachment $name, ...
707 889
708Register an attachment by C<$name> through which attachable objects of the 890Register an attachment by C<$name> through which attachable objects of the
709given CLASS can refer to this attachment. 891given CLASS can refer to this attachment.
710 892
711Some classes such as crossfire maps and objects can specify attachments 893Some classes such as deliantra maps and objects can specify attachments
712that are attached at load/instantiate time, thus the need for a name. 894that are attached at load/instantiate time, thus the need for a name.
713 895
714These calls expect any number of the following handler/hook descriptions: 896These calls expect any number of the following handler/hook descriptions:
715 897
716=over 4 898=over 4
840 1022
841 } elsif (exists $cb_id{$type}) { 1023 } elsif (exists $cb_id{$type}) {
842 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1024 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
843 1025
844 } elsif (ref $type) { 1026 } elsif (ref $type) {
845 warn "attaching objects not supported, ignoring.\n"; 1027 error "attaching objects not supported, ignoring.\n";
846 1028
847 } else { 1029 } else {
848 shift @arg; 1030 shift @arg;
849 warn "attach argument '$type' not supported, ignoring.\n"; 1031 error "attach argument '$type' not supported, ignoring.\n";
850 } 1032 }
851 } 1033 }
852} 1034}
853 1035
854sub _object_attach { 1036sub _object_attach {
864 _attach $registry, $klass, @attach; 1046 _attach $registry, $klass, @attach;
865 } 1047 }
866 1048
867 $obj->{$name} = \%arg; 1049 $obj->{$name} = \%arg;
868 } else { 1050 } else {
869 warn "object uses attachment '$name' which is not available, postponing.\n"; 1051 info "object uses attachment '$name' which is not available, postponing.\n";
870 } 1052 }
871 1053
872 $obj->{_attachment}{$name} = undef; 1054 $obj->{_attachment}{$name} = undef;
873} 1055}
874 1056
933 1115
934 for (@$callbacks) { 1116 for (@$callbacks) {
935 eval { &{$_->[1]} }; 1117 eval { &{$_->[1]} };
936 1118
937 if ($@) { 1119 if ($@) {
938 warn "$@";
939 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1120 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
940 override; 1121 override;
941 } 1122 }
942 1123
943 return 1 if $override; 1124 return 1 if $override;
944 } 1125 }
945 1126
946 0 1127 0
947} 1128}
948 1129
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1130=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1131
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1132=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1133
953Generate an object-specific event with the given arguments. 1134Generate an object-specific event with the given arguments.
954 1135
960 1141
961=cut 1142=cut
962 1143
963############################################################################# 1144#############################################################################
964# object support 1145# object support
965#
966 1146
1147sub _object_equal($$);
1148sub _object_equal($$) {
1149 my ($a, $b) = @_;
1150
1151 return 0 unless (ref $a) eq (ref $b);
1152
1153 if ("HASH" eq ref $a) {
1154 my @ka = keys %$a;
1155 my @kb = keys %$b;
1156
1157 return 0 if @ka != @kb;
1158
1159 for (0 .. $#ka) {
1160 return 0 unless $ka[$_] eq $kb[$_];
1161 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1162 }
1163
1164 } elsif ("ARRAY" eq ref $a) {
1165
1166 return 0 if @$a != @$b;
1167
1168 for (0 .. $#$a) {
1169 return 0 unless _object_equal $a->[$_], $b->[$_];
1170 }
1171
1172 } elsif ($a ne $b) {
1173 return 0;
1174 }
1175
1176 1
1177}
1178
1179our $SLOW_MERGES;#d#
967sub _can_merge { 1180sub _can_merge {
968 my ($ob1, $ob2) = @_; 1181 my ($ob1, $ob2) = @_;
969 1182
970 local $Storable::canonical = 1; 1183 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1184
974 $fob1 eq $fob2 1185 # we do the slow way here
1186 return _object_equal $ob1, $ob2
975} 1187}
976 1188
977sub reattach { 1189sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1190 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1191 my ($obj) = @_;
980 1192
1193 # no longer needed after getting rid of delete_package?
981 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1194 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982 1195
983 my $registry = $obj->registry; 1196 my $registry = $obj->registry;
984 1197
985 @$registry = (); 1198 @$registry = ();
986 1199
991 for (@$attach) { 1204 for (@$attach) {
992 my ($klass, @attach) = @$_; 1205 my ($klass, @attach) = @$_;
993 _attach $registry, $klass, @attach; 1206 _attach $registry, $klass, @attach;
994 } 1207 }
995 } else { 1208 } else {
996 warn "object uses attachment '$name' that is not available, postponing.\n"; 1209 info "object uses attachment '$name' that is not available, postponing.\n";
997 } 1210 }
998 } 1211 }
999} 1212}
1000 1213
1001cf::attachable->attach ( 1214cf::attachable->attach (
1002 prio => -1000000, 1215 prio => -1000000,
1003 on_instantiate => sub { 1216 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1217 my ($obj, $data) = @_;
1005 1218
1006 $data = from_json $data; 1219 $data = decode_json $data;
1007 1220
1008 for (@$data) { 1221 for (@$data) {
1009 my ($name, $args) = @$_; 1222 my ($name, $args) = @$_;
1010 1223
1011 $obj->attach ($name, %{$args || {} }); 1224 $obj->attach ($name, %{$args || {} });
1025); 1238);
1026 1239
1027sub object_freezer_save { 1240sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1241 my ($filename, $rdata, $objs) = @_;
1029 1242
1030 my $guard = cf::lock_acquire "io";
1031
1032 sync_job { 1243 sync_job {
1033 if (length $$rdata) { 1244 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1245 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1246 trace sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1247 $decname, length $$rdata, scalar @$objs
1248 if $VERBOSE_IO;
1037 1249
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1250 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1251 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1252 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1253 if ($cf::USE_FSYNC) {
1254 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1255 aio_fsync $fh;
1256 }
1042 close $fh; 1257 aio_close $fh;
1043 1258
1044 if (@$objs) { 1259 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1260 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1261 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1262 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1263 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1264 if ($cf::USE_FSYNC) {
1265 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1266 aio_fsync $fh;
1267 }
1050 close $fh; 1268 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1269 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1270 }
1053 } else { 1271 } else {
1054 aio_unlink "$filename.pst"; 1272 aio_unlink "$filename.pst";
1055 } 1273 }
1056 1274
1057 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1276
1277 $filename =~ s%/[^/]+$%%;
1278 aio_pathsync $filename if $cf::USE_FSYNC;
1058 } else { 1279 } else {
1059 warn "FATAL: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
1060 } 1281 }
1061 } else { 1282 } else {
1062 aio_unlink $filename; 1283 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
1064 } 1285 }
1065 }; 1286 };
1066
1067 undef $guard;
1068} 1287}
1069 1288
1070sub object_freezer_as_string { 1289sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1290 my ($rdata, $objs) = @_;
1072 1291
1077 1296
1078sub object_thawer_load { 1297sub object_thawer_load {
1079 my ($filename) = @_; 1298 my ($filename) = @_;
1080 1299
1081 my ($data, $av); 1300 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1301
1085 (aio_load $filename, $data) >= 0 1302 (aio_load $filename, $data) >= 0
1086 or return; 1303 or return;
1087 1304
1088 unless (aio_stat "$filename.pst") { 1305 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1306 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1307 or return;
1091 1308
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1309 my $st = eval { Coro::Storable::thaw $av };
1310 $av = $st->{objs};
1094 } 1311 }
1095 1312
1096 utf8::decode (my $decname = $filename); 1313 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1315 $decname, length $data, scalar @{$av || []}
1316 if $VERBOSE_IO;
1099 1317
1100 ($data, $av) 1318 ($data, $av)
1101} 1319}
1102 1320
1103=head2 COMMAND CALLBACKS 1321=head2 COMMAND CALLBACKS
1159 my ($name, $cb) = @_; 1377 my ($name, $cb) = @_;
1160 1378
1161 $EXTICMD{$name} = $cb; 1379 $EXTICMD{$name} = $cb;
1162} 1380}
1163 1381
1382use File::Glob ();
1383
1164cf::player->attach ( 1384cf::player->attach (
1165 on_command => sub { 1385 on_unknown_command => sub {
1166 my ($pl, $name, $params) = @_; 1386 my ($pl, $name, $params) = @_;
1167 1387
1168 my $cb = $COMMAND{$name} 1388 my $cb = $COMMAND{$name}
1169 or return; 1389 or return;
1170 1390
1193 1413
1194 $pl->ext_reply ($reply, @reply) 1414 $pl->ext_reply ($reply, @reply)
1195 if $reply; 1415 if $reply;
1196 1416
1197 } else { 1417 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1419 }
1200 1420
1201 cf::override; 1421 cf::override;
1202 }, 1422 },
1203); 1423);
1204 1424
1425# "readahead" all extensions
1426sub cache_extensions {
1427 my $grp = IO::AIO::aio_group;
1428
1429 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1430 for (grep /\.ext$/, @{$_[0]}) {
1431 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1432 }
1433 };
1434
1435 $grp
1436}
1437
1205sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1206 cf::sync_job { 1441 cf::sync_job {
1207 my %todo; 1442 my %todo;
1208 1443
1209 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1210 next unless -r $path; 1445 next unless -r $path;
1228 1463
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1466
1232 $ext{source} = 1467 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1234 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1235 . $source 1470 . $source
1236 . "\n};\n1"; 1471 . "\n};\n1";
1237 1472
1238 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
1239 } 1474 }
1240 1475
1476 my $pass = 0;
1241 my %done; 1477 my %done;
1242 while (%todo) { 1478 while (%todo) {
1243 my $progress; 1479 my $progress;
1244 1480
1481 ++$pass;
1482
1483 ext:
1245 while (my ($k, $v) = each %todo) { 1484 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip 1486 next ext
1248 unless exists $done{$_}; 1487 unless exists $done{$_};
1249 } 1488 }
1250 1489
1251 warn "... loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1252 1491
1253 unless (eval $v->{source}) { 1492 my $active = eval $v->{source};
1493
1494 if (length $@) {
1254 my $msg = $@ ? "$v->{path}: $@\n" 1495 error "$v->{path}: $@\n";
1255 : "$v->{base}: extension inactive.\n";
1256 1496
1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1257 if (exists $v->{meta}{mandatory}) { 1498 if exists $v->{meta}{mandatory};
1258 warn $msg; 1499
1259 warn "mandatory extension failed to load, exiting.\n"; 1500 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1260 exit 1; 1501 delete $todo{$k};
1261 } 1502 } else {
1262 1503 $done{$k} = delete $todo{$k};
1263 warn $msg; 1504 push @EXTS, $v->{pkg};
1505 $progress = 1;
1506
1507 info "$v->{base}: extension inactive.\n"
1508 unless $active;
1264 } 1509 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
1269 } 1510 }
1270 1511
1271 skip: 1512 unless ($progress) {
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1513 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1273 unless $progress; 1514
1515 while (my ($k, $v) = each %todo) {
1516 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1517 if exists $v->{meta}{mandatory};
1518 }
1519 }
1274 } 1520 }
1275 }; 1521 };
1276} 1522}
1277 1523
1278############################################################################# 1524#############################################################################
1279 1525
1280=back 1526=back
1281 1527
1282=head2 CORE EXTENSIONS 1528=head2 CORE EXTENSIONS
1283 1529
1284Functions and methods that extend core crossfire objects. 1530Functions and methods that extend core deliantra objects.
1285 1531
1286=cut 1532=cut
1287 1533
1288package cf::player; 1534package cf::player;
1289 1535
1332 1578
1333sub exists($) { 1579sub exists($) {
1334 my ($login) = @_; 1580 my ($login) = @_;
1335 1581
1336 $cf::PLAYER{$login} 1582 $cf::PLAYER{$login}
1337 or cf::sync_job { !aio_stat path $login } 1583 or !aio_stat path $login
1338} 1584}
1339 1585
1340sub find($) { 1586sub find($) {
1341 return $cf::PLAYER{$_[0]} || do { 1587 return $cf::PLAYER{$_[0]} || do {
1342 my $login = $_[0]; 1588 my $login = $_[0];
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1598 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1599
1354 my $f = new_from_file cf::object::thawer path $login 1600 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1601 or return;
1356 1602
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1603 my $pl = cf::player::load_pl $f
1359 or return; 1604 or return;
1605
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1606 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1607 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1608 $cf::PLAYER{$login} = $pl
1363 } 1609 }
1364 } 1610 }
1365} 1611}
1366 1612
1613cf::player->attach (
1614 on_load => sub {
1615 my ($pl, $path) = @_;
1616
1617 # restore slots saved in save, below
1618 my $slots = delete $pl->{_slots};
1619
1620 $pl->ob->current_weapon ($slots->[0]);
1621 $pl->combat_ob ($slots->[1]);
1622 $pl->ranged_ob ($slots->[2]);
1623 },
1624);
1625
1367sub save($) { 1626sub save($) {
1368 my ($pl) = @_; 1627 my ($pl) = @_;
1369 1628
1370 return if $pl->{deny_save}; 1629 return if $pl->{deny_save};
1371 1630
1374 1633
1375 return if $pl->{deny_save}; 1634 return if $pl->{deny_save};
1376 1635
1377 aio_mkdir playerdir $pl, 0770; 1636 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1637 $pl->{last_save} = $cf::RUNTIME;
1638
1639 cf::get_slot 0.01;
1640
1641 # save slots, to be restored later
1642 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1379 1643
1380 $pl->save_pl ($path); 1644 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1645 cf::cede_to_tick;
1382} 1646}
1383 1647
1415 my ($pl) = @_; 1679 my ($pl) = @_;
1416 1680
1417 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1418 1682
1419 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1684 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1685
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1423 $pl->deactivate; 1687 $pl->deactivate;
1688
1689 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1425 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1426 1694
1427 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1429 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
1467 1735
1468 for my $login (@$dirs) { 1736 for my $login (@$dirs) {
1469 my $path = path $login; 1737 my $path = path $login;
1470 1738
1471 # a .pst is a dead give-away for a valid player 1739 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1740 # if no pst file found, open and chekc for blocked users
1741 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1742 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1743 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1744 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1745 }
1477 1746
1481 1750
1482 \@logins 1751 \@logins
1483} 1752}
1484 1753
1485=item $player->maps 1754=item $player->maps
1755
1756=item cf::player::maps $login
1486 1757
1487Returns an arrayref of map paths that are private for this 1758Returns an arrayref of map paths that are private for this
1488player. May block. 1759player. May block.
1489 1760
1490=cut 1761=cut
1508 } 1779 }
1509 1780
1510 \@paths 1781 \@paths
1511} 1782}
1512 1783
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1784=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1785
1515Expand crossfire pod fragments into protocol xml. 1786Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1787
1564=item $player->ext_reply ($msgid, @msg) 1788=item $player->ext_reply ($msgid, @msg)
1565 1789
1566Sends an ext reply to the player. 1790Sends an ext reply to the player.
1567 1791
1599 1823
1600=cut 1824=cut
1601 1825
1602sub find_by_path($) { 1826sub find_by_path($) {
1603 my ($path) = @_; 1827 my ($path) = @_;
1828
1829 $path =~ s/^~[^\/]*//; # skip ~login
1604 1830
1605 my ($match, $specificity); 1831 my ($match, $specificity);
1606 1832
1607 for my $region (list) { 1833 for my $region (list) {
1608 if ($region->{match} && $path =~ $region->{match}) { 1834 if ($region->{match} && $path =~ $region->{match}) {
1634our $MAX_RESET = 3600; 1860our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1861our $DEFAULT_RESET = 3000;
1636 1862
1637sub generate_random_map { 1863sub generate_random_map {
1638 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1639 # mit "rum" bekleckern, nicht 1865
1866 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1867
1640 $self->_create_random_map ( 1868 $self->_create_random_map ($rmp);
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1644 $rmp->{exit_on_final_map},
1645 $rmp->{xsize}, $rmp->{ysize},
1646 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1647 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1648 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1649 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1650 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1651 (cf::region::find $rmp->{region}), $rmp->{custom}
1652 )
1653} 1869}
1654 1870
1655=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1656 1872
1657Register a handler for the map path matching the given regex at the 1873Register a handler for the map path matching the given regex at the
1662 1878
1663sub register { 1879sub register {
1664 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1665 my $pkg = caller; 1881 my $pkg = caller;
1666 1882
1667 no strict;
1668 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1669 1884
1670 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1671} 1886}
1672 1887
1673# also paths starting with '/' 1888# also paths starting with '/'
1674$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1889$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1675 1890
1676sub thawer_merge { 1891sub thawer_merge {
1677 my ($self, $merge) = @_; 1892 my ($self, $merge) = @_;
1678 1893
1679 # we have to keep some variables in memory intact 1894 # we have to keep some variables in memory intact
1684} 1899}
1685 1900
1686sub normalise { 1901sub normalise {
1687 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1688 1903
1689 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1690 1905
1691 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1692 1907
1693 # map plan: 1908 # map plan:
1694 # 1909 #
1709 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1710 $path = "$base/$path"; 1925 $path = "$base/$path";
1711 } 1926 }
1712 1927
1713 for ($path) { 1928 for ($path) {
1714 redo if s{//}{/};
1715 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1716 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1717 } 1931 }
1718 1932
1719 $path 1933 $path
1733 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1734 return $self; 1948 return $self;
1735 } 1949 }
1736 } 1950 }
1737 1951
1738 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1739 () 1953 ()
1740} 1954}
1741 1955
1742sub init { 1956sub init {
1743 my ($self) = @_; 1957 my ($self) = @_;
1765 1979
1766# the temporary/swap location 1980# the temporary/swap location
1767sub save_path { 1981sub save_path {
1768 my ($self) = @_; 1982 my ($self) = @_;
1769 1983
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1984 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1985 "$TMPDIR/$path.map"
1772} 1986}
1773 1987
1774# the unique path, undef == no special unique path 1988# the unique path, undef == no special unique path
1775sub uniq_path { 1989sub uniq_path {
1776 my ($self) = @_; 1990 my ($self) = @_;
1777 1991
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1992 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1993 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 1994}
1790 1995
1791sub decay_objects { 1996sub decay_objects {
1792 my ($self) = @_; 1997 my ($self) = @_;
1793 1998
1875 2080
1876sub find; 2081sub find;
1877sub find { 2082sub find {
1878 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
1879 2084
2085 cf::cede_to_tick;
2086
1880 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
1881 2088
1882 cf::lock_wait "map_data:$path";#d#remove 2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
1884 2091
1885 $cf::MAP{$path} || do { 2092 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 2093 my $map = new_from_path cf::map $path
1890 or return; 2094 or return;
1891 2095
1892 $map->{last_save} = $cf::RUNTIME; 2096 $map->{last_save} = $cf::RUNTIME;
1893 2097
1895 or return; 2099 or return;
1896 2100
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2101 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2102 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2103 #$cf::WAIT_FOR_TICK->wait;
2104 undef $guard2;
1900 undef $guard1; 2105 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2106 $map->reset;
1903 return find $path; 2107 return find $path;
1904 } 2108 }
1905 2109
1906 $cf::MAP{$path} = $map 2110 $cf::MAP{$path} = $map
1907 } 2111 }
1908} 2112}
1909 2113
1910sub pre_load { } 2114sub pre_load { }
1911sub post_load { } 2115#sub post_load { } # XS
1912 2116
1913sub load { 2117sub load {
1914 my ($self) = @_; 2118 my ($self) = @_;
1915 2119
1916 local $self->{deny_reset} = 1; # loading can take a long time 2120 local $self->{deny_reset} = 1; # loading can take a long time
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2137 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2138 $f->skip_block;
1935 $self->_load_objects ($f) 2139 $self->_load_objects ($f)
1936 or return; 2140 or return;
1937 2141
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2142 $self->post_load_original
1939 if delete $self->{load_original}; 2143 if delete $self->{load_original};
1940 2144
1941 if (my $uniq = $self->uniq_path) { 2145 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2146 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2147 unless (aio_stat $uniq) {
1961 unless ($self->{deny_activate}) { 2165 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2166 $self->decay_objects;
1963 $self->fix_auto_apply; 2167 $self->fix_auto_apply;
1964 $self->update_buttons; 2168 $self->update_buttons;
1965 cf::cede_to_tick; 2169 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2170 $self->activate;
1969 } 2171 }
1970 2172
1971 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2174 $self->last_access ($cf::RUNTIME);
1973 2175
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2176 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2177 }
1976 2178
1977 $self->post_load; 2179 $self->post_load;
1978}
1979 2180
2181 1
2182}
2183
2184# customize the map for a given player, i.e.
2185# return the _real_ map. used by e.g. per-player
2186# maps to change the path to ~playername/mappath
1980sub customise_for { 2187sub customise_for {
1981 my ($self, $ob) = @_; 2188 my ($self, $ob) = @_;
1982 2189
1983 return find "~" . $ob->name . "/" . $self->{path} 2190 return find "~" . $ob->name . "/" . $self->{path}
1984 if $self->per_player; 2191 if $self->per_player;
2000 or next; 2207 or next;
2001 $neigh = find $neigh, $map 2208 $neigh = find $neigh, $map
2002 or next; 2209 or next;
2003 $neigh->load; 2210 $neigh->load;
2004 2211
2212 # now find the diagonal neighbours
2005 push @neigh, 2213 push @neigh,
2006 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2007 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2008 } 2216 }
2009 2217
2016} 2224}
2017 2225
2018sub find_sync { 2226sub find_sync {
2019 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
2020 2228
2021 cf::sync_job { find $path, $origin } 2229 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230 if $Coro::current == $Coro::main;
2231
2232 find $path, $origin
2022} 2233}
2023 2234
2024sub do_load_sync { 2235sub do_load_sync {
2025 my ($map) = @_; 2236 my ($map) = @_;
2026 2237
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main; 2239 if $Coro::current == $Coro::main;
2029 2240
2030 cf::sync_job { $map->load }; 2241 $map->load;
2031} 2242}
2032 2243
2033our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
2034our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
2035 2246
2037 my ($path, $origin, $load) = @_; 2248 my ($path, $origin, $load) = @_;
2038 2249
2039 $path = normalise $path, $origin && $origin->{path}; 2250 $path = normalise $path, $origin && $origin->{path};
2040 2251
2041 if (my $map = $cf::MAP{$path}) { 2252 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2253 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2254 }
2044 2255
2045 $MAP_PREFETCH{$path} |= $load; 2256 $MAP_PREFETCH{$path} |= $load;
2046 2257
2047 $MAP_PREFETCHER ||= cf::async { 2258 $MAP_PREFETCHER ||= cf::async {
2259 $Coro::current->{desc} = "map prefetcher";
2260
2048 while (%MAP_PREFETCH) { 2261 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2262 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2263 if (my $map = find $k) {
2051 $map->load if $v; 2264 $map->load if $v;
2052 } 2265 }
2059 $MAP_PREFETCHER->prio (6); 2272 $MAP_PREFETCHER->prio (6);
2060 2273
2061 () 2274 ()
2062} 2275}
2063 2276
2277# common code, used by both ->save and ->swapout
2064sub save { 2278sub _save {
2065 my ($self) = @_; 2279 my ($self) = @_;
2066
2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
2068 2280
2069 $self->{last_save} = $cf::RUNTIME; 2281 $self->{last_save} = $cf::RUNTIME;
2070 2282
2071 return unless $self->dirty; 2283 return unless $self->dirty;
2072 2284
2078 return if $self->{deny_save}; 2290 return if $self->{deny_save};
2079 2291
2080 local $self->{last_access} = $self->last_access;#d# 2292 local $self->{last_access} = $self->last_access;#d#
2081 2293
2082 cf::async { 2294 cf::async {
2295 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2296 $_->contr->save for $self->players;
2084 }; 2297 };
2298
2299 cf::get_slot 0.02;
2085 2300
2086 if ($uniq) { 2301 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2302 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2303 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2304 } else {
2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2305 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2091 } 2306 }
2092} 2307}
2093 2308
2309sub save {
2310 my ($self) = @_;
2311
2312 my $lock = cf::lock_acquire "map_data:$self->{path}";
2313
2314 $self->_save;
2315}
2316
2094sub swap_out { 2317sub swap_out {
2095 my ($self) = @_; 2318 my ($self) = @_;
2096 2319
2097 # save first because save cedes
2098 $self->save;
2099
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2320 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2321
2322 return if $self->in_memory != cf::MAP_ACTIVE;
2323 return if $self->{deny_save};
2102 return if $self->players; 2324 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2104 return if $self->{deny_save};
2105 2325
2326 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP;
2106 $self->in_memory (cf::MAP_SWAPPED); 2329 $self->in_memory (cf::MAP_SWAPPED);
2330
2331 # then atomically save
2332 $self->_save;
2333
2334 # then free the map
2335 $self->clear;
2336}
2337
2338sub reset_at {
2339 my ($self) = @_;
2340
2341 # TODO: safety, remove and allow resettable per-player maps
2342 return 1e99 if $self->{deny_reset};
2343
2344 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2345 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2346
2347 $time + $to
2348}
2349
2350sub should_reset {
2351 my ($self) = @_;
2352
2353 $self->reset_at <= $cf::RUNTIME
2354}
2355
2356sub reset {
2357 my ($self) = @_;
2358
2359 my $lock = cf::lock_acquire "map_data:$self->{path}";
2360
2361 return if $self->players;
2362
2363 cf::trace "resetting map ", $self->path, "\n";
2364
2365 $self->in_memory (cf::MAP_SWAPPED);
2366
2367 # need to save uniques path
2368 unless ($self->{deny_save}) {
2369 my $uniq = $self->uniq_path; utf8::encode $uniq;
2370
2371 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2372 if $uniq;
2373 }
2374
2375 delete $cf::MAP{$self->path};
2107 2376
2108 $self->deactivate; 2377 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP; 2378 $_->clear_links_to ($self) for values %cf::MAP;
2110 $self->clear; 2379 $self->clear;
2111}
2112
2113sub reset_at {
2114 my ($self) = @_;
2115
2116 # TODO: safety, remove and allow resettable per-player maps
2117 return 1e99 if $self->{deny_reset};
2118
2119 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2120 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2121
2122 $time + $to
2123}
2124
2125sub should_reset {
2126 my ($self) = @_;
2127
2128 $self->reset_at <= $cf::RUNTIME
2129}
2130
2131sub reset {
2132 my ($self) = @_;
2133
2134 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135
2136 return if $self->players;
2137
2138 warn "resetting map ", $self->path;
2139
2140 $self->in_memory (cf::MAP_SWAPPED);
2141
2142 # need to save uniques path
2143 unless ($self->{deny_save}) {
2144 my $uniq = $self->uniq_path; utf8::encode $uniq;
2145
2146 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2147 if $uniq;
2148 }
2149
2150 delete $cf::MAP{$self->path};
2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2154 $self->clear;
2155 2380
2156 $self->unlink_save; 2381 $self->unlink_save;
2157 $self->destroy; 2382 $self->destroy;
2158} 2383}
2159 2384
2167 2392
2168 delete $cf::MAP{$self->path}; 2393 delete $cf::MAP{$self->path};
2169 2394
2170 $self->unlink_save; 2395 $self->unlink_save;
2171 2396
2172 bless $self, "cf::map"; 2397 bless $self, "cf::map::wrap";
2173 delete $self->{deny_reset}; 2398 delete $self->{deny_reset};
2174 $self->{deny_save} = 1; 2399 $self->{deny_save} = 1;
2175 $self->reset_timeout (1); 2400 $self->reset_timeout (1);
2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2401 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2177 2402
2226 2451
2227sub unique_maps() { 2452sub unique_maps() {
2228 [ 2453 [
2229 map { 2454 map {
2230 utf8::decode $_; 2455 utf8::decode $_;
2231 /\.map$/ 2456 s/\.map$//; # TODO future compatibility hack
2457 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2458 ? ()
2232 ? normalise $_ 2459 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2460 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2461 ]
2236} 2462}
2237 2463
2238package cf; 2464=item cf::map::static_maps
2465
2466Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2467file in the shared directory excluding F</styles> and F</editor>). May
2468block.
2469
2470=cut
2471
2472sub static_maps() {
2473 my @dirs = "";
2474 my @maps;
2475
2476 while (@dirs) {
2477 my $dir = shift @dirs;
2478
2479 next if $dir eq "/styles" || $dir eq "/editor";
2480
2481 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2482 or return;
2483
2484 for (@$files) {
2485 s/\.map$// or next;
2486 utf8::decode $_;
2487 push @maps, "$dir/$_";
2488 }
2489
2490 push @dirs, map "$dir/$_", @$dirs;
2491 }
2492
2493 \@maps
2494}
2239 2495
2240=back 2496=back
2241 2497
2242=head3 cf::object 2498=head3 cf::object
2243 2499
2247 2503
2248=over 4 2504=over 4
2249 2505
2250=item $ob->inv_recursive 2506=item $ob->inv_recursive
2251 2507
2252Returns the inventory of the object _and_ their inventories, recursively. 2508Returns the inventory of the object I<and> their inventories, recursively,
2509but I<not> the object itself.
2253 2510
2254=cut 2511=cut
2255 2512
2256sub inv_recursive_; 2513sub inv_recursive_;
2257sub inv_recursive_ { 2514sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2519 inv_recursive_ inv $_[0]
2263} 2520}
2264 2521
2265=item $ref = $ob->ref 2522=item $ref = $ob->ref
2266 2523
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2524Creates and returns a persistent reference to an object that can be stored as a string.
2268 2525
2269=item $ob = cf::object::deref ($refstring) 2526=item $ob = cf::object::deref ($refstring)
2270 2527
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2528returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2529even if the object actually exists. May block.
2274=cut 2531=cut
2275 2532
2276sub deref { 2533sub deref {
2277 my ($ref) = @_; 2534 my ($ref) = @_;
2278 2535
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2536 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2537 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2538 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2539 or return;
2286 $pl->ob->uuid eq $uuid 2540 $pl->ob->uuid eq $uuid
2287 or return; 2541 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2561can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2562dialogue with the given NPC character.
2309 2563
2310=cut 2564=cut
2311 2565
2566our $SAY_CHANNEL = {
2567 id => "say",
2568 title => "Map",
2569 reply => "say ",
2570 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2571};
2572
2573our $CHAT_CHANNEL = {
2574 id => "chat",
2575 title => "Chat",
2576 reply => "chat ",
2577 tooltip => "Player chat and shouts, global to the server.",
2578};
2579
2312# rough implementation of a future "reply" method that works 2580# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2581# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2582#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2583sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2584 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2595 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2596 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2597
2330 } else { 2598 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2599 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2600 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2601 }
2334 } 2602 }
2335} 2603}
2336 2604
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2605=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2630
2363=item $player_object->enter_link 2631=item $player_object->enter_link
2364 2632
2365Freezes the player and moves him/her to a special map (C<{link}>). 2633Freezes the player and moves him/her to a special map (C<{link}>).
2366 2634
2367The player should be reasonably safe there for short amounts of time. You 2635The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2636for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2637though, as the player cannot control the character while it is on the link
2638map.
2369 2639
2370Will never block. 2640Will never block.
2371 2641
2372=item $player_object->leave_link ($map, $x, $y) 2642=item $player_object->leave_link ($map, $x, $y)
2373 2643
2393sub cf::object::player::enter_link { 2663sub cf::object::player::enter_link {
2394 my ($self) = @_; 2664 my ($self) = @_;
2395 2665
2396 $self->deactivate_recursive; 2666 $self->deactivate_recursive;
2397 2667
2668 ++$self->{_link_recursion};
2669
2398 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2670 return if UNIVERSAL::isa $self->map, "ext::map_link";
2399 2671
2400 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2672 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2401 if $self->map && $self->map->{path} ne "{link}"; 2673 if $self->map && $self->map->{path} ne "{link}";
2402 2674
2403 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2675 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2404} 2676}
2405 2677
2406sub cf::object::player::leave_link { 2678sub cf::object::player::leave_link {
2407 my ($self, $map, $x, $y) = @_; 2679 my ($self, $map, $x, $y) = @_;
2408 2680
2425 ($x, $y) = (-1, -1) 2697 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2698 unless (defined $x) && (defined $y);
2427 2699
2428 # use -1 or undef as default coordinates, not 0, 0 2700 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2701 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2702 if $x <= 0 && $y <= 0;
2431 2703
2432 $map->load; 2704 $map->load;
2433 $map->load_neighbours; 2705 $map->load_neighbours;
2434 2706
2435 return unless $self->contr->active; 2707 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2708
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2710 if ($self->enter_map ($map, $x, $y)) {
2440} 2711 # entering was successful
2712 delete $self->{_link_recursion};
2713 # only activate afterwards, to support waiting in hooks
2714 $self->activate_recursive;
2715 }
2441 2716
2717}
2718
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2719=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2443 2720
2444Moves the player to the given map-path and coordinates by first freezing 2721Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2722her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2723that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2724the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2725be called at the end of this process.
2449 2726
2727Note that $check will be called with a potentially non-loaded map, so if
2728it needs a loaded map it has to call C<< ->load >>.
2729
2450=cut 2730=cut
2451 2731
2452our $GOTOGEN; 2732our $GOTOGEN;
2453 2733
2454sub cf::object::player::goto { 2734sub cf::object::player::goto {
2455 my ($self, $path, $x, $y, $check, $done) = @_; 2735 my ($self, $path, $x, $y, $check, $done) = @_;
2456 2736
2737 if ($self->{_link_recursion} >= $MAX_LINKS) {
2738 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2739 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2740 ($path, $x, $y) = @$EMERGENCY_POSITION;
2741 }
2742
2457 # do generation counting so two concurrent goto's will be executed in-order 2743 # do generation counting so two concurrent goto's will be executed in-order
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2744 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2745
2460 $self->enter_link; 2746 $self->enter_link;
2461 2747
2462 (async { 2748 (async {
2749 $Coro::current->{desc} = "player::goto $path $x $y";
2750
2463 # *tag paths override both path and x|y 2751 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2752 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2753 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2754 my $ob = $obs[rand @obs];
2467 2755
2482 my $map = eval { 2770 my $map = eval {
2483 my $map = defined $path ? cf::map::find $path : undef; 2771 my $map = defined $path ? cf::map::find $path : undef;
2484 2772
2485 if ($map) { 2773 if ($map) {
2486 $map = $map->customise_for ($self); 2774 $map = $map->customise_for ($self);
2487 $map = $check->($map) if $check && $map; 2775 $map = $check->($map, $x, $y, $self) if $check && $map;
2488 } else { 2776 } else {
2489 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2777 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2490 } 2778 }
2491 2779
2492 $map 2780 $map
2500 if ($gen == $self->{_goto_generation}) { 2788 if ($gen == $self->{_goto_generation}) {
2501 delete $self->{_goto_generation}; 2789 delete $self->{_goto_generation};
2502 $self->leave_link ($map, $x, $y); 2790 $self->leave_link ($map, $x, $y);
2503 } 2791 }
2504 2792
2505 $done->() if $done; 2793 $done->($self) if $done;
2506 })->prio (1); 2794 })->prio (1);
2507} 2795}
2508 2796
2509=item $player_object->enter_exit ($exit_object) 2797=item $player_object->enter_exit ($exit_object)
2510 2798
2530} 2818}
2531 2819
2532sub prepare_random_map { 2820sub prepare_random_map {
2533 my ($exit) = @_; 2821 my ($exit) = @_;
2534 2822
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537 # all this does is basically replace the /! path by 2823 # all this does is basically replace the /! path by
2538 # a new random map path (?random/...) with a seed 2824 # a new random map path (?random/...) with a seed
2539 # that depends on the exit object 2825 # that depends on the exit object
2540 2826
2541 my $rmp = parse_random_map_params $exit->msg; 2827 my $rmp = parse_random_map_params $exit->msg;
2543 if ($exit->map) { 2829 if ($exit->map) {
2544 $rmp->{region} = $exit->region->name; 2830 $rmp->{region} = $exit->region->name;
2545 $rmp->{origin_map} = $exit->map->path; 2831 $rmp->{origin_map} = $exit->map->path;
2546 $rmp->{origin_x} = $exit->x; 2832 $rmp->{origin_x} = $exit->x;
2547 $rmp->{origin_y} = $exit->y; 2833 $rmp->{origin_y} = $exit->y;
2834
2835 $exit->map->touch;
2548 } 2836 }
2549 2837
2550 $rmp->{random_seed} ||= $exit->random_seed; 2838 $rmp->{random_seed} ||= $exit->random_seed;
2551 2839
2552 my $data = cf::to_json $rmp; 2840 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2841 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2842 my $meta = "$RANDOMDIR/$md5.meta";
2555 2843
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2844 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2845 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh; 2846 undef $fh;
2559 aio_rename "$meta~", $meta; 2847 aio_rename "$meta~", $meta;
2560 2848
2849 my $slaying = "?random/$md5";
2850
2851 if ($exit->valid) {
2561 $exit->slaying ("?random/$md5"); 2852 $exit->slaying ("?random/$md5");
2562 $exit->msg (undef); 2853 $exit->msg (undef);
2854 }
2563 } 2855 }
2564} 2856}
2565 2857
2566sub cf::object::player::enter_exit { 2858sub cf::object::player::enter_exit {
2567 my ($self, $exit) = @_; 2859 my ($self, $exit) = @_;
2568 2860
2569 return unless $self->type == cf::PLAYER; 2861 return unless $self->type == cf::PLAYER;
2570 2862
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
2582 $self->enter_link; 2863 $self->enter_link;
2583 2864
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2588 (async { 2865 (async {
2589 $self->deactivate_recursive; # just to be sure 2866 $Coro::current->{desc} = "enter_exit";
2867
2590 unless (eval { 2868 unless (eval {
2869 $self->deactivate_recursive; # just to be sure
2870
2871 # random map handling
2872 {
2873 my $guard = cf::lock_acquire "exit_prepare:$exit";
2874
2875 prepare_random_map $exit
2876 if $exit->slaying eq "/!";
2877 }
2878
2879 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2880 my $x = $exit->stats->hp;
2881 my $y = $exit->stats->sp;
2882
2591 $self->goto ($slaying, $hp, $sp); 2883 $self->goto ($map, $x, $y);
2592 2884
2885 # if exit is damned, update players death & WoR home-position
2886 $self->contr->savebed ($map, $x, $y)
2887 if $exit->flag (cf::FLAG_DAMNED);
2888
2593 1; 2889 1
2594 }) { 2890 }) {
2595 $self->message ("Something went wrong deep within the crossfire server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2596 . "I'll try to bring you back to the map you were before. " 2892 . "I'll try to bring you back to the map you were before. "
2597 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2598 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2599 2895
2600 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2601 $self->leave_link; 2897 $self->leave_link;
2602 } 2898 }
2603 })->prio (1); 2899 })->prio (1);
2604} 2900}
2605 2901
2617sub cf::client::send_drawinfo { 2913sub cf::client::send_drawinfo {
2618 my ($self, $text, $flags) = @_; 2914 my ($self, $text, $flags) = @_;
2619 2915
2620 utf8::encode $text; 2916 utf8::encode $text;
2621 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2917 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2918}
2919
2920=item $client->send_big_packet ($pkt)
2921
2922Like C<send_packet>, but tries to compress large packets, and fragments
2923them as required.
2924
2925=cut
2926
2927our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2928
2929sub cf::client::send_big_packet {
2930 my ($self, $pkt) = @_;
2931
2932 # try lzf for large packets
2933 $pkt = "lzf " . Compress::LZF::compress $pkt
2934 if 1024 <= length $pkt and $self->{can_lzf};
2935
2936 # split very large packets
2937 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2938 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2939 $pkt = "frag";
2940 }
2941
2942 $self->send_packet ($pkt);
2622} 2943}
2623 2944
2624=item $client->send_msg ($channel, $msg, $color, [extra...]) 2945=item $client->send_msg ($channel, $msg, $color, [extra...])
2625 2946
2626Send a drawinfo or msg packet to the client, formatting the msg for the 2947Send a drawinfo or msg packet to the client, formatting the msg for the
2628the message, with C<log> being the default. If C<$color> is negative, suppress 2949the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet. 2950the message unless the client supports the msg packet.
2630 2951
2631=cut 2952=cut
2632 2953
2954# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2955our %CHANNEL = (
2956 "c/motd" => {
2957 id => "infobox",
2958 title => "MOTD",
2959 reply => undef,
2960 tooltip => "The message of the day",
2961 },
2634 "c/identify" => { 2962 "c/identify" => {
2635 id => "identify", 2963 id => "infobox",
2636 title => "Identify", 2964 title => "Identify",
2637 reply => undef, 2965 reply => undef,
2638 tooltip => "Items recently identified", 2966 tooltip => "Items recently identified",
2639 }, 2967 },
2640 "c/examine" => { 2968 "c/examine" => {
2641 id => "examine", 2969 id => "infobox",
2642 title => "Examine", 2970 title => "Examine",
2643 reply => undef, 2971 reply => undef,
2644 tooltip => "Signs and other items you examined", 2972 tooltip => "Signs and other items you examined",
2645 }, 2973 },
2974 "c/shopinfo" => {
2975 id => "infobox",
2976 title => "Shop Info",
2977 reply => undef,
2978 tooltip => "What your bargaining skill tells you about the shop",
2979 },
2980 "c/book" => {
2981 id => "infobox",
2982 title => "Book",
2983 reply => undef,
2984 tooltip => "The contents of a note or book",
2985 },
2986 "c/lookat" => {
2987 id => "infobox",
2988 title => "Look",
2989 reply => undef,
2990 tooltip => "What you saw there",
2991 },
2992 "c/who" => {
2993 id => "infobox",
2994 title => "Players",
2995 reply => undef,
2996 tooltip => "Shows players who are currently online",
2997 },
2998 "c/body" => {
2999 id => "infobox",
3000 title => "Body Parts",
3001 reply => undef,
3002 tooltip => "Shows which body parts you posess and are available",
3003 },
3004 "c/statistics" => {
3005 id => "infobox",
3006 title => "Statistics",
3007 reply => undef,
3008 tooltip => "Shows your primary statistics",
3009 },
3010 "c/skills" => {
3011 id => "infobox",
3012 title => "Skills",
3013 reply => undef,
3014 tooltip => "Shows your experience per skill and item power",
3015 },
3016 "c/shopitems" => {
3017 id => "infobox",
3018 title => "Shop Items",
3019 reply => undef,
3020 tooltip => "Shows the items currently for sale in this shop",
3021 },
3022 "c/resistances" => {
3023 id => "infobox",
3024 title => "Resistances",
3025 reply => undef,
3026 tooltip => "Shows your resistances",
3027 },
3028 "c/pets" => {
3029 id => "infobox",
3030 title => "Pets",
3031 reply => undef,
3032 tooltip => "Shows information abotu your pets/a specific pet",
3033 },
3034 "c/perceiveself" => {
3035 id => "infobox",
3036 title => "Perceive Self",
3037 reply => undef,
3038 tooltip => "You gained detailed knowledge about yourself",
3039 },
3040 "c/uptime" => {
3041 id => "infobox",
3042 title => "Uptime",
3043 reply => undef,
3044 tooltip => "How long the server has been running since last restart",
3045 },
3046 "c/mapinfo" => {
3047 id => "infobox",
3048 title => "Map Info",
3049 reply => undef,
3050 tooltip => "Information related to the maps",
3051 },
3052 "c/party" => {
3053 id => "party",
3054 title => "Party",
3055 reply => "gsay ",
3056 tooltip => "Messages and chat related to your party",
3057 },
3058 "c/death" => {
3059 id => "death",
3060 title => "Death",
3061 reply => undef,
3062 tooltip => "Reason for and more info about your most recent death",
3063 },
3064 "c/say" => $SAY_CHANNEL,
3065 "c/chat" => $CHAT_CHANNEL,
2646); 3066);
2647 3067
2648sub cf::client::send_msg { 3068sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 3069 my ($self, $channel, $msg, $color, @extra) = @_;
2650 3070
2651 $msg = $self->pl->expand_cfpod ($msg); 3071 $msg = $self->pl->expand_cfpod ($msg)
3072 unless $color & cf::NDI_VERBATIM;
2652 3073
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 3074 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 3075
2655 # check predefined channels, for the benefit of C 3076 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3077 if ($CHANNEL{$channel}) {
3078 $channel = $CHANNEL{$channel};
2657 3079
3080 $self->ext_msg (channel_info => $channel);
3081 $channel = $channel->{id};
3082
2658 if (ref $channel) { 3083 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 3084 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 3085 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 3086 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 3087 $self->ext_msg (channel_info => $channel);
2663 if $self->can_msg;
2664 } 3088 }
2665 3089
2666 $channel = $channel->{id}; 3090 $channel = $channel->{id};
2667 } 3091 }
2668 3092
2669 return unless @extra || length $msg; 3093 return unless @extra || length $msg;
2670 3094
2671 if ($self->can_msg) {
2672 # default colour, mask it out 3095 # default colour, mask it out
2673 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3096 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2674 if $color & cf::NDI_DEF; 3097 if $color & cf::NDI_DEF;
2675 3098
2676 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3099 my $pkt = "msg "
3100 . $self->{json_coder}->encode (
2677 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3101 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2678 } else { 3102 );
2679 if ($color >= 0) {
2680 # replace some tags by gcfclient-compatible ones
2681 for ($msg) {
2682 1 while
2683 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2684 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2685 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2686 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2687 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2688 }
2689 3103
2690 $color &= cf::NDI_COLOR_MASK; 3104 $self->send_big_packet ($pkt);
2691
2692 utf8::encode $msg;
2693
2694 if (0 && $msg =~ /\[/) {
2695 # COMMAND/INFO
2696 $self->send_packet ("drawextinfo $color 10 8 $msg")
2697 } else {
2698 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2699 $self->send_packet ("drawinfo $color $msg")
2700 }
2701 }
2702 }
2703} 3105}
2704 3106
2705=item $client->ext_msg ($type, @msg) 3107=item $client->ext_msg ($type, @msg)
2706 3108
2707Sends an ext event to the client. 3109Sends an ext event to the client.
2710 3112
2711sub cf::client::ext_msg($$@) { 3113sub cf::client::ext_msg($$@) {
2712 my ($self, $type, @msg) = @_; 3114 my ($self, $type, @msg) = @_;
2713 3115
2714 if ($self->extcmd == 2) { 3116 if ($self->extcmd == 2) {
2715 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3117 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2716 } elsif ($self->extcmd == 1) { # TODO: remove 3118 } elsif ($self->extcmd == 1) { # TODO: remove
2717 push @msg, msgtype => "event_$type"; 3119 push @msg, msgtype => "event_$type";
2718 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3120 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2719 } 3121 }
2720} 3122}
2721 3123
2722=item $client->ext_reply ($msgid, @msg) 3124=item $client->ext_reply ($msgid, @msg)
2723 3125
2727 3129
2728sub cf::client::ext_reply($$@) { 3130sub cf::client::ext_reply($$@) {
2729 my ($self, $id, @msg) = @_; 3131 my ($self, $id, @msg) = @_;
2730 3132
2731 if ($self->extcmd == 2) { 3133 if ($self->extcmd == 2) {
2732 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3134 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2733 } elsif ($self->extcmd == 1) { 3135 } elsif ($self->extcmd == 1) {
2734 #TODO: version 1, remove 3136 #TODO: version 1, remove
2735 unshift @msg, msgtype => "reply", msgid => $id; 3137 unshift @msg, msgtype => "reply", msgid => $id;
2736 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3138 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2737 } 3139 }
2738} 3140}
2739 3141
2740=item $success = $client->query ($flags, "text", \&cb) 3142=item $success = $client->query ($flags, "text", \&cb)
2741 3143
2812 3214
2813 $ns->ext_reply ($reply, @reply) 3215 $ns->ext_reply ($reply, @reply)
2814 if $reply; 3216 if $reply;
2815 3217
2816 } else { 3218 } else {
2817 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3219 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2818 } 3220 }
2819 3221
2820 cf::override; 3222 cf::override;
2821 }, 3223 },
2822); 3224);
2842 3244
2843 $coro 3245 $coro
2844} 3246}
2845 3247
2846cf::client->attach ( 3248cf::client->attach (
2847 on_destroy => sub { 3249 on_client_destroy => sub {
2848 my ($ns) = @_; 3250 my ($ns) = @_;
2849 3251
2850 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3252 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2851 }, 3253 },
2852); 3254);
2868our $safe_hole = new Safe::Hole; 3270our $safe_hole = new Safe::Hole;
2869 3271
2870$SIG{FPE} = 'IGNORE'; 3272$SIG{FPE} = 'IGNORE';
2871 3273
2872$safe->permit_only (Opcode::opset qw( 3274$safe->permit_only (Opcode::opset qw(
2873 :base_core :base_mem :base_orig :base_math 3275 :base_core :base_mem :base_orig :base_math :base_loop
2874 grepstart grepwhile mapstart mapwhile 3276 grepstart grepwhile mapstart mapwhile
2875 sort time 3277 sort time
2876)); 3278));
2877 3279
2878# here we export the classes and methods available to script code 3280# here we export the classes and methods available to script code
2880=pod 3282=pod
2881 3283
2882The following functions and methods are available within a safe environment: 3284The following functions and methods are available within a safe environment:
2883 3285
2884 cf::object 3286 cf::object
2885 contr pay_amount pay_player map x y force_find force_add 3287 contr pay_amount pay_player map x y force_find force_add destroy
2886 insert remove name archname title slaying race decrease_ob_nr 3288 insert remove name archname title slaying race decrease split
3289 value
2887 3290
2888 cf::object::player 3291 cf::object::player
2889 player 3292 player
2890 3293
2891 cf::player 3294 cf::player
2896 3299
2897=cut 3300=cut
2898 3301
2899for ( 3302for (
2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3303 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2901 insert remove inv name archname title slaying race 3304 insert remove inv nrof name archname title slaying race
2902 decrease_ob_nr)], 3305 decrease split destroy change_exp value msg lore send_msg)],
2903 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
2904 ["cf::player" => qw(peaceful)], 3307 ["cf::player" => qw(peaceful send_msg)],
2905 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
2906) { 3309) {
2907 no strict 'refs';
2908 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
2909 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2910 for @funs; 3312 for @funs;
2911} 3313}
2912 3314
2927 3329
2928 my $qcode = $code; 3330 my $qcode = $code;
2929 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3331 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2930 $qcode =~ s/\n/\\n/g; 3332 $qcode =~ s/\n/\\n/g;
2931 3333
3334 %vars = (_dummy => 0) unless %vars;
3335
3336 my @res;
2932 local $_; 3337 local $_;
2933 local @safe::cf::_safe_eval_args = values %vars;
2934 3338
2935 my $eval = 3339 my $eval =
2936 "do {\n" 3340 "do {\n"
2937 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3341 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2938 . "#line 0 \"{$qcode}\"\n" 3342 . "#line 0 \"{$qcode}\"\n"
2939 . $code 3343 . $code
2940 . "\n}" 3344 . "\n}"
2941 ; 3345 ;
2942 3346
3347 if ($CFG{safe_eval}) {
2943 sub_generation_inc; 3348 sub_generation_inc;
3349 local @safe::cf::_safe_eval_args = values %vars;
2944 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3350 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2945 sub_generation_inc; 3351 sub_generation_inc;
3352 } else {
3353 local @cf::_safe_eval_args = values %vars;
3354 @res = wantarray ? eval eval : scalar eval $eval;
3355 }
2946 3356
2947 if ($@) { 3357 if ($@) {
2948 warn "$@"; 3358 warn "$@",
2949 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
2950 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
2951 } 3361 }
2952 3362
2953 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
2954} 3364}
2955 3365
2969=cut 3379=cut
2970 3380
2971sub register_script_function { 3381sub register_script_function {
2972 my ($fun, $cb) = @_; 3382 my ($fun, $cb) = @_;
2973 3383
2974 no strict 'refs'; 3384 $fun = "safe::$fun" if $CFG{safe_eval};
2975 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3385 *$fun = $safe_hole->wrap ($cb);
2976} 3386}
2977 3387
2978=back 3388=back
2979 3389
2980=cut 3390=cut
2989 # for this (global event?) 3399 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = (); 3400 %ext::player_env::MUSIC_FACE_CACHE = ();
2991 3401
2992 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2993 3403
2994 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
2995 3405
2996 my $facedata;
2997 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
2998 or die "$path: $!"; 3407 or die "$path: $!";
2999 3408
3000 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
3001 3410
3002 $facedata->{version} == 2 3411 $facedata->{version} == 2
3003 or cf::cleanup "$path: version mismatch, cannot proceed."; 3412 or cf::cleanup "$path: version mismatch, cannot proceed.";
3004 3413
3005 # patch in the exptable 3414 # patch in the exptable
3415 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3006 $facedata->{resource}{"res/exp_table"} = { 3416 $facedata->{resource}{"res/exp_table"} = {
3007 type => FT_RSRC, 3417 type => FT_RSRC,
3008 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3418 data => $exp_table,
3419 hash => (Digest::MD5::md5 $exp_table),
3009 }; 3420 };
3010 cf::cede_to_tick; 3421 cf::cede_to_tick;
3011 3422
3012 { 3423 {
3013 my $faces = $facedata->{faceinfo}; 3424 my $faces = $facedata->{faceinfo};
3014 3425
3015 while (my ($face, $info) = each %$faces) { 3426 while (my ($face, $info) = each %$faces) {
3016 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3427 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3428
3017 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3018 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
3019 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3020 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3432 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3433 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3021 3434
3022 cf::cede_to_tick; 3435 cf::cede_to_tick;
3023 } 3436 }
3024 3437
3025 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3026 next unless $info->{smooth}; 3439 next unless $info->{smooth};
3440
3027 my $idx = cf::face::find $face 3441 my $idx = cf::face::find $face
3028 or next; 3442 or next;
3443
3029 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
3030 cf::face::set_smooth $idx, $smooth; 3445 cf::face::set_smooth $idx, $smooth;
3031 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3032 } else { 3447 } else {
3033 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
3034 } 3449 }
3035 3450
3036 cf::cede_to_tick; 3451 cf::cede_to_tick;
3037 } 3452 }
3038 } 3453 }
3047 3462
3048 cf::anim::invalidate_all; # d'oh 3463 cf::anim::invalidate_all; # d'oh
3049 } 3464 }
3050 3465
3051 { 3466 {
3052 # TODO: for gcfclient pleasure, we should give resources
3053 # that gcfclient doesn't grok a >10000 face index.
3054 my $res = $facedata->{resource}; 3467 my $res = $facedata->{resource};
3055 3468
3056 my $soundconf = delete $res->{"res/sound.conf"};
3057
3058 while (my ($name, $info) = each %$res) { 3469 while (my ($name, $info) = each %$res) {
3470 if (defined $info->{type}) {
3059 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data;
3061 3472
3062 if ($info->{type} & 1) { 3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3063 # prepend meta info 3474 cf::face::set_type $idx, $info->{type};
3064
3065 my $meta = $enc->encode ({
3066 name => $name,
3067 %{ $info->{meta} || {} },
3068 });
3069
3070 $data = pack "(w/a*)*", $meta, $info->{data};
3071 } else { 3475 } else {
3072 $data = $info->{data}; 3476 $RESOURCE{$name} = $info; # unused
3073 } 3477 }
3074 3478
3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3076 cf::face::set_type $idx, $info->{type};
3077
3078 cf::cede_to_tick; 3479 cf::cede_to_tick;
3079 } 3480 }
3080
3081 if ($soundconf) {
3082 $soundconf = $enc->decode (delete $soundconf->{data});
3083
3084 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3085 my $sound = $soundconf->{compat}[$_]
3086 or next;
3087
3088 my $face = cf::face::find "sound/$sound->[1]";
3089 cf::sound::set $sound->[0] => $face;
3090 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3091 }
3092
3093 while (my ($k, $v) = each %{$soundconf->{event}}) {
3094 my $face = cf::face::find "sound/$v";
3095 cf::sound::set $k => $face;
3096 }
3097 }
3098 } 3481 }
3482
3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3099 3484
3100 1 3485 1
3101} 3486}
3102 3487
3103register_exticmd fx_want => sub { 3488register_exticmd fx_want => sub {
3105 3490
3106 while (my ($k, $v) = each %$want) { 3491 while (my ($k, $v) = each %$want) {
3107 $ns->fx_want ($k, $v); 3492 $ns->fx_want ($k, $v);
3108 } 3493 }
3109}; 3494};
3495
3496sub load_resource_file($) {
3497 my $guard = lock_acquire "load_resource_file";
3498
3499 my $status = load_resource_file_ $_[0];
3500 get_slot 0.1, 100;
3501 cf::arch::commit_load;
3502
3503 $status
3504}
3110 3505
3111sub reload_regions { 3506sub reload_regions {
3112 # HACK to clear player env face cache, we need some signal framework 3507 # HACK to clear player env face cache, we need some signal framework
3113 # for this (global event?) 3508 # for this (global event?)
3114 %ext::player_env::MUSIC_FACE_CACHE = (); 3509 %ext::player_env::MUSIC_FACE_CACHE = ();
3128} 3523}
3129 3524
3130sub reload_archetypes { 3525sub reload_archetypes {
3131 load_resource_file "$DATADIR/archetypes" 3526 load_resource_file "$DATADIR/archetypes"
3132 or die "unable to load archetypes\n"; 3527 or die "unable to load archetypes\n";
3133 #d# NEED to laod twice to resolve forward references
3134 # this really needs to be done in an extra post-pass
3135 # (which needs to be synchronous, so solve it differently)
3136 load_resource_file "$DATADIR/archetypes"
3137 or die "unable to load archetypes\n";
3138} 3528}
3139 3529
3140sub reload_treasures { 3530sub reload_treasures {
3141 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
3142 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
3143} 3533}
3144 3534
3535sub reload_sound {
3536 trace "loading sound config from $DATADIR/sound\n";
3537
3538 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3539 or die "$DATADIR/sound $!";
3540
3541 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3542
3543 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544 my $sound = $soundconf->{compat}[$_]
3545 or next;
3546
3547 my $face = cf::face::find "sound/$sound->[1]";
3548 cf::sound::set $sound->[0] => $face;
3549 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3550 }
3551
3552 while (my ($k, $v) = each %{$soundconf->{event}}) {
3553 my $face = cf::face::find "sound/$v";
3554 cf::sound::set $k => $face;
3555 }
3556}
3557
3145sub reload_resources { 3558sub reload_resources {
3146 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
3147 3560
3561 reload_exp_table;
3562 reload_materials;
3563 reload_facedata;
3564 reload_sound;
3565 reload_archetypes;
3148 reload_regions; 3566 reload_regions;
3149 reload_facedata;
3150 #reload_archetypes;#d#
3151 reload_archetypes;
3152 reload_treasures; 3567 reload_treasures;
3153 3568
3154 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
3155}
3156
3157sub init {
3158 reload_resources;
3159} 3570}
3160 3571
3161sub reload_config { 3572sub reload_config {
3162 open my $fh, "<:utf8", "$CONFDIR/config" 3573 trace "reloading config file...\n";
3163 or return;
3164 3574
3165 local $/; 3575 0 < aio_load "$CONFDIR/config", my $config
3166 *CFG = YAML::Syck::Load <$fh>; 3576 or die "$CONFDIR/config: $!";
3167 3577
3578 utf8::decode $config;
3579 *CFG = yaml_load $config;
3580
3168 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3169 3582
3170 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3171 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3172 3585
3173 if (exists $CFG{mlockall}) { 3586 if (exists $CFG{mlockall}) {
3177 }; 3590 };
3178 warn $@ if $@; 3591 warn $@ if $@;
3179 } 3592 }
3180} 3593}
3181 3594
3595sub pidfile() {
3596 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3597 or die "$PIDFILE: $!";
3598 flock $fh, &Fcntl::LOCK_EX
3599 or die "$PIDFILE: flock: $!";
3600 $fh
3601}
3602
3603# make sure only one server instance is running at any one time
3604sub atomic {
3605 my $fh = pidfile;
3606
3607 my $pid = <$fh>;
3608 kill 9, $pid if $pid > 0;
3609
3610 seek $fh, 0, 0;
3611 print $fh $$;
3612}
3613
3614sub main_loop {
3615 trace "EV::loop starting\n";
3616 if (1) {
3617 EV::loop;
3618 }
3619 trace "EV::loop returned\n";
3620 goto &main_loop unless $REALLY_UNLOOP;
3621}
3622
3182sub main { 3623sub main {
3624 cf::init_globals; # initialise logging
3625
3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3627 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3630
3631 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3632
3183 # we must not ever block the main coroutine 3633 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3634 local $Coro::idle = sub {
3185 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3635 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186 (async { 3636 (async {
3187 Event::one_event; 3637 $Coro::current->{desc} = "IDLE BUG HANDLER";
3638 EV::loop EV::LOOP_ONESHOT;
3188 })->prio (Coro::PRIO_MAX); 3639 })->prio (Coro::PRIO_MAX);
3189 }; 3640 };
3190 3641
3642 evthread_start IO::AIO::poll_fileno;
3643
3644 cf::sync_job {
3645 cf::incloader::init ();
3646
3647 cf::init_anim;
3648 cf::init_attackmess;
3649 cf::init_dynamic;
3650
3651 cf::load_settings;
3652
3653 reload_resources;
3191 reload_config; 3654 reload_config;
3192 db_init; 3655 db_init;
3656
3657 cf::init_uuid;
3658 cf::init_signals;
3659 cf::init_skills;
3660
3661 cf::init_beforeplay;
3662
3663 atomic;
3664
3193 load_extensions; 3665 load_extensions;
3194 3666
3195 $TICK_WATCHER->start; 3667 utime time, time, $RUNTIMEFILE;
3196 Event::loop; 3668
3669 # no (long-running) fork's whatsoever before this point(!)
3670 use POSIX ();
3671 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3672
3673 cf::_post_init 0;
3674 };
3675
3676 cf::object::thawer::errors_are_fatal 0;
3677 info "parse errors in files are no longer fatal from this point on.\n";
3678
3679 my $free_main; $free_main = EV::idle sub {
3680 undef $free_main;
3681 undef &main; # free gobs of memory :)
3682 };
3683
3684 goto &main_loop;
3197} 3685}
3198 3686
3199############################################################################# 3687#############################################################################
3200# initialisation and cleanup 3688# initialisation and cleanup
3201 3689
3202# install some emergency cleanup handlers 3690# install some emergency cleanup handlers
3203BEGIN { 3691BEGIN {
3692 our %SIGWATCHER = ();
3204 for my $signal (qw(INT HUP TERM)) { 3693 for my $signal (qw(INT HUP TERM)) {
3205 Event->signal ( 3694 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 signal => $signal,
3209 prio => 0,
3210 cb => sub {
3211 cf::cleanup "SIG$signal"; 3695 cf::cleanup "SIG$signal";
3212 },
3213 ); 3696 };
3214 } 3697 }
3215} 3698}
3216 3699
3217sub write_runtime { 3700sub write_runtime_sync {
3218 my $runtime = "$LOCALDIR/runtime"; 3701 my $t0 = AE::time;
3219 3702
3220 # first touch the runtime file to show we are still running: 3703 # first touch the runtime file to show we are still running:
3221 # the fsync below can take a very very long time. 3704 # the fsync below can take a very very long time.
3222 3705
3223 IO::AIO::aio_utime $runtime, undef, undef; 3706 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3224 3707
3225 my $guard = cf::lock_acquire "write_runtime"; 3708 my $guard = cf::lock_acquire "write_runtime";
3226 3709
3227 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3710 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3228 or return; 3711 or return;
3229 3712
3230 my $value = $cf::RUNTIME + 90 + 10; 3713 my $value = $cf::RUNTIME + 90 + 10;
3231 # 10 is the runtime save interval, for a monotonic clock 3714 # 10 is the runtime save interval, for a monotonic clock
3232 # 60 allows for the watchdog to kill the server. 3715 # 60 allows for the watchdog to kill the server.
3242 aio_utime $fh, undef, undef; 3725 aio_utime $fh, undef, undef;
3243 3726
3244 close $fh 3727 close $fh
3245 or return; 3728 or return;
3246 3729
3247 aio_rename "$runtime~", $runtime 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3248 and return; 3731 and return;
3249 3732
3250 warn "runtime file written.\n"; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3251 3734
3252 1 3735 1
3736}
3737
3738our $uuid_lock;
3739our $uuid_skip;
3740
3741sub write_uuid_sync($) {
3742 $uuid_skip ||= $_[0];
3743
3744 return if $uuid_lock;
3745 local $uuid_lock = 1;
3746
3747 my $uuid = "$LOCALDIR/uuid";
3748
3749 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3750 or return;
3751
3752 my $value = uuid_seq uuid_cur;
3753
3754 unless ($value) {
3755 info "cowardly refusing to write zero uuid value!\n";
3756 return;
3757 }
3758
3759 my $value = uuid_str $value + $uuid_skip;
3760 $uuid_skip = 0;
3761
3762 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3763 and return;
3764
3765 # always fsync - this file is important
3766 aio_fsync $fh
3767 and return;
3768
3769 close $fh
3770 or return;
3771
3772 aio_rename "$uuid~", $uuid
3773 and return;
3774
3775 trace "uuid file written ($value).\n";
3776
3777 1
3778
3779}
3780
3781sub write_uuid($$) {
3782 my ($skip, $sync) = @_;
3783
3784 $sync ? write_uuid_sync $skip
3785 : async { write_uuid_sync $skip };
3253} 3786}
3254 3787
3255sub emergency_save() { 3788sub emergency_save() {
3256 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
3257 3790
3258 warn "enter emergency perl save\n"; 3791 info "emergency_perl_save: enter\n";
3792
3793 # this is a trade-off: we want to be very quick here, so
3794 # save all maps without fsync, and later call a global sync
3795 # (which in turn might be very very slow)
3796 local $USE_FSYNC = 0;
3259 3797
3260 cf::sync_job { 3798 cf::sync_job {
3799 cf::write_runtime_sync; # external watchdog should not bark
3800
3261 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
3262 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
3263 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
3264 warn "begin emergency player save\n"; 3804 info "emergency_perl_save: begin player save\n";
3265 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
3266 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
3267 $pl->valid or next; 3807 $pl->valid or next;
3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268 $pl->save; 3809 $pl->save;
3269 } 3810 }
3270 warn "end emergency player save\n"; 3811 info "emergency_perl_save: end player save\n";
3271 3812
3272 warn "begin emergency map save\n"; 3813 cf::write_runtime_sync; # external watchdog should not bark
3814
3815 info "emergency_perl_save: begin map save\n";
3273 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
3274 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
3275 $map->valid or next; 3818 $map->valid or next;
3276 $map->save; 3819 $map->save;
3277 } 3820 }
3278 warn "end emergency map save\n"; 3821 info "emergency_perl_save: end map save\n";
3279 3822
3280 warn "begin emergency database checkpoint\n"; 3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3825 info "emergency_perl_save: begin database checkpoint\n";
3281 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3282 warn "end emergency database checkpoint\n"; 3827 info "emergency_perl_save: end database checkpoint\n";
3828
3829 info "emergency_perl_save: begin write uuid\n";
3830 write_uuid_sync 1;
3831 info "emergency_perl_save: end write uuid\n";
3832
3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3835 trace "emergency_perl_save: syncing database to disk";
3836 BDB::db_env_txn_checkpoint $DB_ENV;
3837
3838 info "emergency_perl_save: starting sync\n";
3839 IO::AIO::aio_sync sub {
3840 info "emergency_perl_save: finished sync\n";
3841 };
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848 }
3849
3850 cf::write_runtime_sync; # external watchdog should not bark
3283 }; 3851 };
3284 3852
3285 warn "leave emergency perl save\n"; 3853 info "emergency_perl_save: leave\n";
3286} 3854}
3287 3855
3288sub post_cleanup { 3856sub post_cleanup {
3289 my ($make_core) = @_; 3857 my ($make_core) = @_;
3290 3858
3859 IO::AIO::flush;
3860
3291 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
3292 if $make_core; 3862 if $make_core;
3863
3864 my $fh = pidfile;
3865 unlink $PIDFILE if <$fh> == $$;
3866}
3867
3868# a safer delete_package, copied from Symbol
3869sub clear_package($) {
3870 my $pkg = shift;
3871
3872 # expand to full symbol table name if needed
3873 unless ($pkg =~ /^main::.*::$/) {
3874 $pkg = "main$pkg" if $pkg =~ /^::/;
3875 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3876 $pkg .= '::' unless $pkg =~ /::$/;
3877 }
3878
3879 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3880 my $stem_symtab = *{$stem}{HASH};
3881
3882 defined $stem_symtab and exists $stem_symtab->{$leaf}
3883 or return;
3884
3885 # clear all symbols
3886 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3887 for my $name (keys %$leaf_symtab) {
3888 _gv_clear *{"$pkg$name"};
3889# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3890 }
3293} 3891}
3294 3892
3295sub do_reload_perl() { 3893sub do_reload_perl() {
3296 # can/must only be called in main 3894 # can/must only be called in main
3297 if ($Coro::current != $Coro::main) { 3895 unless (in_main) {
3298 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
3299 return; 3897 return;
3300 } 3898 }
3301 3899
3302 warn "reloading..."; 3900 return if $RELOAD++;
3303 3901
3304 warn "entering sync_job"; 3902 my $t1 = AE::time;
3305 3903
3904 while ($RELOAD) {
3905 cf::get_slot 0.1, -1, "reload_perl";
3906 info "perl_reload: reloading...";
3907
3908 trace "perl_reload: entering sync_job";
3909
3306 cf::sync_job { 3910 cf::sync_job {
3307 cf::write_runtime; # external watchdog should not bark
3308 cf::emergency_save; 3911 #cf::emergency_save;
3309 cf::write_runtime; # external watchdog should not bark
3310 3912
3311 warn "syncing database to disk";
3312 BDB::db_env_txn_checkpoint $DB_ENV;
3313
3314 # if anything goes wrong in here, we should simply crash as we already saved
3315
3316 warn "cancelling all WF_AUTOCANCEL watchers";
3317 for (Event::all_watchers) {
3318 $_->cancel if $_->data & WF_AUTOCANCEL;
3319 }
3320
3321 warn "flushing outstanding aio requests";
3322 for (;;) {
3323 BDB::flush;
3324 IO::AIO::flush;
3325 Coro::cede;
3326 last unless IO::AIO::nreqs || BDB::nreqs;
3327 warn "iterate...";
3328 }
3329
3330 ++$RELOAD;
3331
3332 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
3333 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
3334 %EXT_CORO = (); 3915 %EXT_CORO = ();
3335 3916
3336 warn "removing commands"; 3917 trace "perl_reload: removing commands";
3337 %COMMAND = (); 3918 %COMMAND = ();
3338 3919
3339 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3340 %EXTCMD = (); 3921 %EXTCMD = ();
3341 %EXTICMD = (); 3922 %EXTICMD = ();
3342 3923
3343 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3344 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3345 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
3346 3927
3347 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3348 eval { 3929 eval {
3349 $cb->($pkg); 3930 $cb->($pkg);
3350 1 3931 1
3351 } or warn "$pkg unloaded, but with errors: $@"; 3932 } or error "$pkg unloaded, but with errors: $@";
3933 }
3934
3935 trace "... clearing $pkg";
3936 clear_package $pkg;
3352 } 3937 }
3353 3938
3354 warn "... nuking $pkg";
3355 Symbol::delete_package $pkg;
3356 }
3357
3358 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3359 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3361 3942
3362 warn "... unloading $k"; 3943 trace "... unloading $k";
3363 delete $INC{$k}; 3944 delete $INC{$k};
3364 3945
3365 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
3366 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
3367 3948
3368 if (my $cb = $k->can ("unload_module")) { 3949 if (my $cb = $k->can ("unload_module")) {
3369 $cb->(); 3950 $cb->();
3951 }
3952
3953 clear_package $k;
3370 } 3954 }
3371 3955
3372 Symbol::delete_package $k;
3373 }
3374
3375 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3376 Symbol::delete_package "safe::$_" 3957 clear_package "safe::$_"
3377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3958 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3378 3959
3379 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3380 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3381 delete $INC{"cf/pod.pm"}; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3382 3963
3383 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3384 # and global variables created in xs 3965 # and global variables created in xs
3385 #Symbol::delete_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3386 3967
3387 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3388 3969
3389 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3390 require cf; 3971 require cf;
3391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3972 cf::_connect_to_perl_1;
3392 3973
3393 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3394 cf::reload_config; 3975 cf::reload_config;
3395 3976
3396 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3397 cf::load_extensions; 3978 cf::load_extensions;
3398 3979
3980 if ($REATTACH_ON_RELOAD) {
3399 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3400 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3401 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3402 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3403 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3404 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3987 }
3405 3988
3406 warn "leaving sync_job"; 3989 cf::_post_init 1;
3407 3990
3991 trace "perl_reload: leaving sync_job";
3992
3408 1 3993 1
3409 } or do { 3994 } or do {
3410 warn $@; 3995 error $@;
3411 warn "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3412 exit 1; 3997 };
3998
3999 --$RELOAD;
3413 }; 4000 }
3414 4001
3415 warn "reloaded"; 4002 $t1 = AE::time - $t1;
4003 info "perl_reload: completed in ${t1}s\n";
3416}; 4004};
3417 4005
3418our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3419 4007
3420sub reload_perl() { 4008sub reload_perl() {
3421 # doing reload synchronously and two reloads happen back-to-back, 4009 # doing reload synchronously and two reloads happen back-to-back,
3422 # coro crashes during coro_state_free->destroy here. 4010 # coro crashes during coro_state_free->destroy here.
3423 4011
3424 $RELOAD_WATCHER ||= Event->timer ( 4012 $RELOAD_WATCHER ||= cf::async {
3425 reentrant => 0, 4013 Coro::AIO::aio_wait cache_extensions;
3426 after => 0, 4014
3427 data => WF_AUTOCANCEL, 4015 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3428 cb => sub {
3429 do_reload_perl; 4016 do_reload_perl;
3430 undef $RELOAD_WATCHER; 4017 undef $RELOAD_WATCHER;
3431 }, 4018 };
3432 ); 4019 };
3433} 4020}
3434 4021
3435register_command "reload" => sub { 4022register_command "reload" => sub {
3436 my ($who, $arg) = @_; 4023 my ($who, $arg) = @_;
3437 4024
3438 if ($who->flag (FLAG_WIZ)) { 4025 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 4026 $who->message ("reloading server.");
4027 async {
4028 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 4029 reload_perl;
4030 };
3441 } 4031 }
3442}; 4032};
3443 4033
3444unshift @INC, $LIBDIR; 4034#############################################################################
3445 4035
3446my $bug_warning = 0; 4036my $bug_warning = 0;
3447 4037
3448our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3449our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3450 4040
3451sub wait_for_tick { 4041sub wait_for_tick() {
3452 return unless $TICK_WATCHER->is_active;
3453 return if $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3454 4043
3455 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3456 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3457 $signal->wait; 4046 $signal->wait;
3458} 4047}
3459 4048
3460sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3461 return unless $TICK_WATCHER->is_active;
3462 return if $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3463 4051
3464 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 4054 $signal->wait;
3467} 4055}
3468 4056
3469$TICK_WATCHER = Event->timer ( 4057sub tick {
3470 reentrant => 0,
3471 parked => 1,
3472 prio => 0,
3473 at => $NEXT_TICK || $TICK,
3474 data => WF_AUTOCANCEL,
3475 cb => sub {
3476 if ($Coro::current != $Coro::main) { 4058 if ($Coro::current != $Coro::main) {
3477 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4059 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3478 unless ++$bug_warning > 10; 4060 unless ++$bug_warning > 10;
3479 return; 4061 return;
3480 } 4062 }
3481 4063
3482 $NOW = $tick_start = Event::time;
3483
3484 cf::server_tick; # one server iteration 4064 cf::server_tick; # one server iteration
3485 4065
3486 $RUNTIME += $TICK; 4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3487 $NEXT_TICK += $TICK;
3488 4067
3489 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3490 $NEXT_RUNTIME_WRITE = $NOW + 10; 4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3491 Coro::async_pool { 4070 Coro::async_pool {
4071 $Coro::current->{desc} = "runtime saver";
3492 write_runtime 4072 write_runtime_sync
3493 or warn "ERROR: unable to write runtime file: $!"; 4073 or error "ERROR: unable to write runtime file: $!";
3494 };
3495 } 4074 };
4075 }
3496 4076
3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3498 $sig->send; 4078 $sig->send;
3499 } 4079 }
3500 while (my $sig = shift @WAIT_FOR_TICK) { 4080 while (my $sig = shift @WAIT_FOR_TICK) {
3501 $sig->send; 4081 $sig->send;
3502 } 4082 }
3503 4083
3504 $NOW = Event::time; 4084 $LOAD = ($NOW - $TICK_START) / $TICK;
3505
3506 # if we are delayed by four ticks or more, skip them all
3507 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3508
3509 $TICK_WATCHER->at ($NEXT_TICK);
3510 $TICK_WATCHER->start;
3511
3512 $LOAD = ($NOW - $tick_start) / $TICK;
3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4085 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3514 4086
3515 _post_tick; 4087 if (0) {
4088 if ($NEXT_TICK) {
4089 my $jitter = $TICK_START - $NEXT_TICK;
4090 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4091 debug "jitter $JITTER\n";#d#
4092 }
3516 }, 4093 }
3517); 4094}
3518 4095
3519{ 4096{
4097 # configure BDB
4098
3520 BDB::min_parallel 8; 4099 BDB::min_parallel 16;
3521 BDB::max_poll_time $TICK * 0.1; 4100 BDB::max_poll_reqs $TICK * 0.1;
3522 $BDB_POLL_WATCHER = Event->io ( 4101 $AnyEvent::BDB::WATCHER->priority (1);
3523 reentrant => 0,
3524 fd => BDB::poll_fileno,
3525 poll => 'r',
3526 prio => 0,
3527 data => WF_AUTOCANCEL,
3528 cb => \&BDB::poll_cb,
3529 );
3530
3531 BDB::set_sync_prepare {
3532 my $status;
3533 my $current = $Coro::current;
3534 (
3535 sub {
3536 $status = $!;
3537 $current->ready; undef $current;
3538 },
3539 sub {
3540 Coro::schedule while defined $current;
3541 $! = $status;
3542 },
3543 )
3544 };
3545 4102
3546 unless ($DB_ENV) { 4103 unless ($DB_ENV) {
3547 $DB_ENV = BDB::db_env_create; 4104 $DB_ENV = BDB::db_env_create;
4105 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4106 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4107 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4108 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4109 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3548 4110
3549 cf::sync_job { 4111 cf::sync_job {
3550 eval { 4112 eval {
3551 BDB::db_env_open 4113 BDB::db_env_open
3552 $DB_ENV, 4114 $DB_ENV,
3554 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4116 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3555 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4117 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3556 0666; 4118 0666;
3557 4119
3558 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4120 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3559
3560 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3561 | BDB::LOG_AUTOREMOVE, 1);
3562 $DB_ENV->set_lk_detect;
3563 }; 4121 };
3564 4122
3565 cf::cleanup "db_env_open(db): $@" if $@; 4123 cf::cleanup "db_env_open(db): $@" if $@;
3566 }; 4124 };
3567 } 4125 }
3568 4126
3569 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4127 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3570 after => 11, 4128 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3571 interval => 60, 4129 };
3572 hard => 1, 4130 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573 prio => 0,
3574 data => WF_AUTOCANCEL,
3575 cb => sub {
3576 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4131 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3577 },
3578 ); 4132 };
3579 $BDB_TRICKLE_WATCHER = Event->timer ( 4133 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3580 after => 5,
3581 interval => 10,
3582 hard => 1,
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => sub {
3586 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4134 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3587 },
3588 ); 4135 };
3589} 4136}
3590 4137
3591{ 4138{
4139 # configure IO::AIO
4140
3592 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
3593
3594 undef $Coro::AIO::WATCHER;
3595 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
3596 $AIO_POLL_WATCHER = Event->io ( 4143 undef $AnyEvent::AIO::WATCHER;
3597 reentrant => 0,
3598 data => WF_AUTOCANCEL,
3599 fd => IO::AIO::poll_fileno,
3600 poll => 'r',
3601 prio => 6,
3602 cb => \&IO::AIO::poll_cb,
3603 );
3604} 4144}
3605 4145
3606my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
3607 4148
3608sub _log_backtrace { 4149sub _log_backtrace {
3609 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
3610 4151
3611 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
3612 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3613 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
3614 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
3615 ++$_log_backtrace; 4160 ++$_log_backtrace;
4161 my $perl_bt = Carp::longmess $msg;
3616 async { 4162 async {
4163 $Coro::current->{desc} = "abt $msg";
4164
3617 my @bt = fork_call { 4165 my @bt = fork_call {
3618 @addr = map { sprintf "%x", $_ } @addr; 4166 @addr = map { sprintf "%x", $_ } @addr;
3619 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4167 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3620 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4168 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3621 or die "addr2line: $!"; 4169 or die "addr2line: $!";
3629 } 4177 }
3630 4178
3631 @funcs 4179 @funcs
3632 }; 4180 };
3633 4181
3634 LOG llevInfo, "[ABT] $msg\n"; 4182 LOG llevInfo, "[ABT] $perl_bt\n";
4183 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3635 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
3636 --$_log_backtrace; 4185 --$_log_backtrace;
3637 }; 4186 };
3638 } else { 4187 } else {
3639 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
3640 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3641 } 4190 }
3642} 4191}
3643 4192
3644# load additional modules 4193# load additional modules
3645use cf::pod; 4194require "cf/$_.pm" for @EXTRA_MODULES;
4195cf::_connect_to_perl_2;
3646 4196
3647END { cf::emergency_save } 4197END { cf::emergency_save }
3648 4198
36491 41991
3650 4200

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines