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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines