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.363 by root, Mon Sep 10 17:24:36 2007 UTC vs.
Revision 1.553 by root, Tue May 18 21:30:16 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) = @_;
1863
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865
1639 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1867 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1644 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1645 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1646 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1647 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1662 1889
1663sub register { 1890sub register {
1664 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1665 my $pkg = caller; 1892 my $pkg = caller;
1666 1893
1667 no strict;
1668 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1669 1895
1670 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1671} 1897}
1672 1898
1673# also paths starting with '/' 1899# also paths starting with '/'
1674$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1675 1901
1676sub thawer_merge { 1902sub thawer_merge {
1677 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1678 1904
1679 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
1684} 1910}
1685 1911
1686sub normalise { 1912sub normalise {
1687 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1688 1914
1689 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1690 1916
1691 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1692 1918
1693 # map plan: 1919 # map plan:
1694 # 1920 #
1709 $base =~ s{[^/]+/?$}{}; 1935 $base =~ s{[^/]+/?$}{};
1710 $path = "$base/$path"; 1936 $path = "$base/$path";
1711 } 1937 }
1712 1938
1713 for ($path) { 1939 for ($path) {
1714 redo if s{//}{/};
1715 redo if s{/\.?/}{/}; 1940 redo if s{/\.?/}{/};
1716 redo if s{/[^/]+/\.\./}{/}; 1941 redo if s{/[^/]+/\.\./}{/};
1717 } 1942 }
1718 1943
1719 $path 1944 $path
1733 $self->init; # pass $1 etc. 1958 $self->init; # pass $1 etc.
1734 return $self; 1959 return $self;
1735 } 1960 }
1736 } 1961 }
1737 1962
1738 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1963 Carp::cluck "unable to resolve path '$path' (base '$base')";
1739 () 1964 ()
1740} 1965}
1741 1966
1742sub init { 1967sub init {
1743 my ($self) = @_; 1968 my ($self) = @_;
1765 1990
1766# the temporary/swap location 1991# the temporary/swap location
1767sub save_path { 1992sub save_path {
1768 my ($self) = @_; 1993 my ($self) = @_;
1769 1994
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1995 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1996 "$TMPDIR/$path.map"
1772} 1997}
1773 1998
1774# the unique path, undef == no special unique path 1999# the unique path, undef == no special unique path
1775sub uniq_path { 2000sub uniq_path {
1776 my ($self) = @_; 2001 my ($self) = @_;
1777 2002
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2003 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 2004 "$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} 2005}
1790 2006
1791sub decay_objects { 2007sub decay_objects {
1792 my ($self) = @_; 2008 my ($self) = @_;
1793 2009
1875 2091
1876sub find; 2092sub find;
1877sub find { 2093sub find {
1878 my ($path, $origin) = @_; 2094 my ($path, $origin) = @_;
1879 2095
2096 cf::cede_to_tick;
2097
1880 $path = normalise $path, $origin && $origin->path; 2098 $path = normalise $path, $origin && $origin->path;
1881 2099
1882 cf::lock_wait "map_data:$path";#d#remove 2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2101 my $guard2 = cf::lock_acquire "map_find:$path";
1884 2102
1885 $cf::MAP{$path} || do { 2103 $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 2104 my $map = new_from_path cf::map $path
1890 or return; 2105 or return;
1891 2106
1892 $map->{last_save} = $cf::RUNTIME; 2107 $map->{last_save} = $cf::RUNTIME;
1893 2108
1895 or return; 2110 or return;
1896 2111
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2112 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2113 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2114 #$cf::WAIT_FOR_TICK->wait;
2115 undef $guard2;
1900 undef $guard1; 2116 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2117 $map->reset;
1903 return find $path; 2118 return find $path;
1904 } 2119 }
1905 2120
1906 $cf::MAP{$path} = $map 2121 $cf::MAP{$path} = $map
1907 } 2122 }
1908} 2123}
1909 2124
1910sub pre_load { } 2125sub pre_load { }
1911sub post_load { } 2126#sub post_load { } # XS
1912 2127
1913sub load { 2128sub load {
1914 my ($self) = @_; 2129 my ($self) = @_;
1915 2130
1916 local $self->{deny_reset} = 1; # loading can take a long time 2131 local $self->{deny_reset} = 1; # loading can take a long time
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2148 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2149 $f->skip_block;
1935 $self->_load_objects ($f) 2150 $self->_load_objects ($f)
1936 or return; 2151 or return;
1937 2152
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2153 $self->post_load_original
1939 if delete $self->{load_original}; 2154 if delete $self->{load_original};
1940 2155
1941 if (my $uniq = $self->uniq_path) { 2156 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2157 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2158 unless (aio_stat $uniq) {
1961 unless ($self->{deny_activate}) { 2176 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2177 $self->decay_objects;
1963 $self->fix_auto_apply; 2178 $self->fix_auto_apply;
1964 $self->update_buttons; 2179 $self->update_buttons;
1965 cf::cede_to_tick; 2180 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2181 $self->activate;
1969 } 2182 }
1970 2183
1971 $self->{last_save} = $cf::RUNTIME; 2184 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2185 $self->last_access ($cf::RUNTIME);
1973 2186
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2187 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2188 }
1976 2189
1977 $self->post_load; 2190 $self->post_load;
1978}
1979 2191
2192 1
2193}
2194
2195# customize the map for a given player, i.e.
2196# return the _real_ map. used by e.g. per-player
2197# maps to change the path to ~playername/mappath
1980sub customise_for { 2198sub customise_for {
1981 my ($self, $ob) = @_; 2199 my ($self, $ob) = @_;
1982 2200
1983 return find "~" . $ob->name . "/" . $self->{path} 2201 return find "~" . $ob->name . "/" . $self->{path}
1984 if $self->per_player; 2202 if $self->per_player;
2000 or next; 2218 or next;
2001 $neigh = find $neigh, $map 2219 $neigh = find $neigh, $map
2002 or next; 2220 or next;
2003 $neigh->load; 2221 $neigh->load;
2004 2222
2223 # now find the diagonal neighbours
2005 push @neigh, 2224 push @neigh,
2006 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2225 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2007 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2226 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2008 } 2227 }
2009 2228
2016} 2235}
2017 2236
2018sub find_sync { 2237sub find_sync {
2019 my ($path, $origin) = @_; 2238 my ($path, $origin) = @_;
2020 2239
2021 cf::sync_job { find $path, $origin } 2240 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2241 if $Coro::current == $Coro::main;
2242
2243 find $path, $origin
2022} 2244}
2023 2245
2024sub do_load_sync { 2246sub do_load_sync {
2025 my ($map) = @_; 2247 my ($map) = @_;
2026 2248
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2249 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main; 2250 if $Coro::current == $Coro::main;
2029 2251
2030 cf::sync_job { $map->load }; 2252 $map->load;
2031} 2253}
2032 2254
2033our %MAP_PREFETCH; 2255our %MAP_PREFETCH;
2034our $MAP_PREFETCHER = undef; 2256our $MAP_PREFETCHER = undef;
2035 2257
2037 my ($path, $origin, $load) = @_; 2259 my ($path, $origin, $load) = @_;
2038 2260
2039 $path = normalise $path, $origin && $origin->{path}; 2261 $path = normalise $path, $origin && $origin->{path};
2040 2262
2041 if (my $map = $cf::MAP{$path}) { 2263 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2264 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2265 }
2044 2266
2045 $MAP_PREFETCH{$path} |= $load; 2267 $MAP_PREFETCH{$path} |= $load;
2046 2268
2047 $MAP_PREFETCHER ||= cf::async { 2269 $MAP_PREFETCHER ||= cf::async {
2270 $Coro::current->{desc} = "map prefetcher";
2271
2048 while (%MAP_PREFETCH) { 2272 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2273 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2274 if (my $map = find $k) {
2051 $map->load if $v; 2275 $map->load if $v;
2052 } 2276 }
2059 $MAP_PREFETCHER->prio (6); 2283 $MAP_PREFETCHER->prio (6);
2060 2284
2061 () 2285 ()
2062} 2286}
2063 2287
2288# common code, used by both ->save and ->swapout
2064sub save { 2289sub _save {
2065 my ($self) = @_; 2290 my ($self) = @_;
2066
2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
2068 2291
2069 $self->{last_save} = $cf::RUNTIME; 2292 $self->{last_save} = $cf::RUNTIME;
2070 2293
2071 return unless $self->dirty; 2294 return unless $self->dirty;
2072 2295
2078 return if $self->{deny_save}; 2301 return if $self->{deny_save};
2079 2302
2080 local $self->{last_access} = $self->last_access;#d# 2303 local $self->{last_access} = $self->last_access;#d#
2081 2304
2082 cf::async { 2305 cf::async {
2306 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2307 $_->contr->save for $self->players;
2084 }; 2308 };
2309
2310 cf::get_slot 0.02;
2085 2311
2086 if ($uniq) { 2312 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2313 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2314 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2315 } else {
2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2316 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2091 } 2317 }
2092} 2318}
2093 2319
2320sub save {
2321 my ($self) = @_;
2322
2323 my $lock = cf::lock_acquire "map_data:$self->{path}";
2324
2325 $self->_save;
2326}
2327
2094sub swap_out { 2328sub swap_out {
2095 my ($self) = @_; 2329 my ($self) = @_;
2096 2330
2097 # save first because save cedes
2098 $self->save;
2099
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2331 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2332
2333 return if $self->in_memory != cf::MAP_ACTIVE;
2334 return if $self->{deny_save};
2102 return if $self->players; 2335 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2104 return if $self->{deny_save};
2105 2336
2337 # first deactivate the map and "unlink" it from the core
2338 $self->deactivate;
2339 $_->clear_links_to ($self) for values %cf::MAP;
2106 $self->in_memory (cf::MAP_SWAPPED); 2340 $self->in_memory (cf::MAP_SWAPPED);
2341
2342 # then atomically save
2343 $self->_save;
2344
2345 # then free the map
2346 $self->clear;
2347}
2348
2349sub reset_at {
2350 my ($self) = @_;
2351
2352 # TODO: safety, remove and allow resettable per-player maps
2353 return 1e99 if $self->{deny_reset};
2354
2355 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2356 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2357
2358 $time + $to
2359}
2360
2361sub should_reset {
2362 my ($self) = @_;
2363
2364 $self->reset_at <= $cf::RUNTIME
2365}
2366
2367sub reset {
2368 my ($self) = @_;
2369
2370 my $lock = cf::lock_acquire "map_data:$self->{path}";
2371
2372 return if $self->players;
2373
2374 cf::trace "resetting map ", $self->path, "\n";
2375
2376 $self->in_memory (cf::MAP_SWAPPED);
2377
2378 # need to save uniques path
2379 unless ($self->{deny_save}) {
2380 my $uniq = $self->uniq_path; utf8::encode $uniq;
2381
2382 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2383 if $uniq;
2384 }
2385
2386 delete $cf::MAP{$self->path};
2107 2387
2108 $self->deactivate; 2388 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP; 2389 $_->clear_links_to ($self) for values %cf::MAP;
2110 $self->clear; 2390 $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 2391
2156 $self->unlink_save; 2392 $self->unlink_save;
2157 $self->destroy; 2393 $self->destroy;
2158} 2394}
2159 2395
2167 2403
2168 delete $cf::MAP{$self->path}; 2404 delete $cf::MAP{$self->path};
2169 2405
2170 $self->unlink_save; 2406 $self->unlink_save;
2171 2407
2172 bless $self, "cf::map"; 2408 bless $self, "cf::map::wrap";
2173 delete $self->{deny_reset}; 2409 delete $self->{deny_reset};
2174 $self->{deny_save} = 1; 2410 $self->{deny_save} = 1;
2175 $self->reset_timeout (1); 2411 $self->reset_timeout (1);
2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2412 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2177 2413
2226 2462
2227sub unique_maps() { 2463sub unique_maps() {
2228 [ 2464 [
2229 map { 2465 map {
2230 utf8::decode $_; 2466 utf8::decode $_;
2231 /\.map$/ 2467 s/\.map$//; # TODO future compatibility hack
2468 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2469 ? ()
2232 ? normalise $_ 2470 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2471 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2472 ]
2236} 2473}
2237 2474
2238package cf; 2475=item cf::map::static_maps
2476
2477Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2478file in the shared directory excluding F</styles> and F</editor>). May
2479block.
2480
2481=cut
2482
2483sub static_maps() {
2484 my @dirs = "";
2485 my @maps;
2486
2487 while (@dirs) {
2488 my $dir = shift @dirs;
2489
2490 next if $dir eq "/styles" || $dir eq "/editor";
2491
2492 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2493 or return;
2494
2495 for (@$files) {
2496 s/\.map$// or next;
2497 utf8::decode $_;
2498 push @maps, "$dir/$_";
2499 }
2500
2501 push @dirs, map "$dir/$_", @$dirs;
2502 }
2503
2504 \@maps
2505}
2239 2506
2240=back 2507=back
2241 2508
2242=head3 cf::object 2509=head3 cf::object
2243 2510
2247 2514
2248=over 4 2515=over 4
2249 2516
2250=item $ob->inv_recursive 2517=item $ob->inv_recursive
2251 2518
2252Returns the inventory of the object _and_ their inventories, recursively. 2519Returns the inventory of the object I<and> their inventories, recursively,
2520but I<not> the object itself.
2253 2521
2254=cut 2522=cut
2255 2523
2256sub inv_recursive_; 2524sub inv_recursive_;
2257sub inv_recursive_ { 2525sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2530 inv_recursive_ inv $_[0]
2263} 2531}
2264 2532
2265=item $ref = $ob->ref 2533=item $ref = $ob->ref
2266 2534
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2535Creates and returns a persistent reference to an object that can be stored as a string.
2268 2536
2269=item $ob = cf::object::deref ($refstring) 2537=item $ob = cf::object::deref ($refstring)
2270 2538
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2539returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2540even if the object actually exists. May block.
2274=cut 2542=cut
2275 2543
2276sub deref { 2544sub deref {
2277 my ($ref) = @_; 2545 my ($ref) = @_;
2278 2546
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2547 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2548 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2549 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2550 or return;
2286 $pl->ob->uuid eq $uuid 2551 $pl->ob->uuid eq $uuid
2287 or return; 2552 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2572can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2573dialogue with the given NPC character.
2309 2574
2310=cut 2575=cut
2311 2576
2577our $SAY_CHANNEL = {
2578 id => "say",
2579 title => "Map",
2580 reply => "say ",
2581 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2582};
2583
2584our $CHAT_CHANNEL = {
2585 id => "chat",
2586 title => "Chat",
2587 reply => "chat ",
2588 tooltip => "Player chat and shouts, global to the server.",
2589};
2590
2312# rough implementation of a future "reply" method that works 2591# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2592# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2593#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2594sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2595 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2606 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2607 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2608
2330 } else { 2609 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2610 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2611 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2612 }
2334 } 2613 }
2335} 2614}
2336 2615
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2616=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2641
2363=item $player_object->enter_link 2642=item $player_object->enter_link
2364 2643
2365Freezes the player and moves him/her to a special map (C<{link}>). 2644Freezes the player and moves him/her to a special map (C<{link}>).
2366 2645
2367The player should be reasonably safe there for short amounts of time. You 2646The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2647for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2648though, as the player cannot control the character while it is on the link
2649map.
2369 2650
2370Will never block. 2651Will never block.
2371 2652
2372=item $player_object->leave_link ($map, $x, $y) 2653=item $player_object->leave_link ($map, $x, $y)
2373 2654
2393sub cf::object::player::enter_link { 2674sub cf::object::player::enter_link {
2394 my ($self) = @_; 2675 my ($self) = @_;
2395 2676
2396 $self->deactivate_recursive; 2677 $self->deactivate_recursive;
2397 2678
2679 ++$self->{_link_recursion};
2680
2398 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2681 return if UNIVERSAL::isa $self->map, "ext::map_link";
2399 2682
2400 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2683 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2401 if $self->map && $self->map->{path} ne "{link}"; 2684 if $self->map && $self->map->{path} ne "{link}";
2402 2685
2403 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2686 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2404} 2687}
2405 2688
2406sub cf::object::player::leave_link { 2689sub cf::object::player::leave_link {
2407 my ($self, $map, $x, $y) = @_; 2690 my ($self, $map, $x, $y) = @_;
2408 2691
2425 ($x, $y) = (-1, -1) 2708 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2709 unless (defined $x) && (defined $y);
2427 2710
2428 # use -1 or undef as default coordinates, not 0, 0 2711 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2712 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2713 if $x <= 0 && $y <= 0;
2431 2714
2432 $map->load; 2715 $map->load;
2433 $map->load_neighbours; 2716 $map->load_neighbours;
2434 2717
2435 return unless $self->contr->active; 2718 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2719
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2720 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2721 if ($self->enter_map ($map, $x, $y)) {
2440} 2722 # entering was successful
2723 delete $self->{_link_recursion};
2724 # only activate afterwards, to support waiting in hooks
2725 $self->activate_recursive;
2726 }
2441 2727
2728}
2729
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2730=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2443 2731
2444Moves the player to the given map-path and coordinates by first freezing 2732Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2733her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2734that 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 2735the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2736be called at the end of this process.
2449 2737
2738Note that $check will be called with a potentially non-loaded map, so if
2739it needs a loaded map it has to call C<< ->load >>.
2740
2450=cut 2741=cut
2451 2742
2452our $GOTOGEN; 2743our $GOTOGEN;
2453 2744
2454sub cf::object::player::goto { 2745sub cf::object::player::goto {
2455 my ($self, $path, $x, $y, $check, $done) = @_; 2746 my ($self, $path, $x, $y, $check, $done) = @_;
2456 2747
2748 if ($self->{_link_recursion} >= $MAX_LINKS) {
2749 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2750 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2751 ($path, $x, $y) = @$EMERGENCY_POSITION;
2752 }
2753
2457 # do generation counting so two concurrent goto's will be executed in-order 2754 # do generation counting so two concurrent goto's will be executed in-order
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2755 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2756
2460 $self->enter_link; 2757 $self->enter_link;
2461 2758
2462 (async { 2759 (async {
2760 $Coro::current->{desc} = "player::goto $path $x $y";
2761
2762 # *tag paths override both path and x|y
2763 if ($path =~ /^\*(.*)$/) {
2764 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2765 my $ob = $obs[rand @obs];
2766
2767 # see if we actually can go there
2768 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2769 $ob = $obs[rand @obs];
2770 } else {
2771 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2772 }
2773 # else put us there anyways for now #d#
2774
2775 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2776 } else {
2777 ($path, $x, $y) = (undef, undef, undef);
2778 }
2779 }
2780
2463 my $map = eval { 2781 my $map = eval {
2464 my $map = cf::map::find $path; 2782 my $map = defined $path ? cf::map::find $path : undef;
2465 2783
2466 if ($map) { 2784 if ($map) {
2467 $map = $map->customise_for ($self); 2785 $map = $map->customise_for ($self);
2468 $map = $check->($map) if $check && $map; 2786 $map = $check->($map, $x, $y, $self) if $check && $map;
2469 } else { 2787 } else {
2470 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2788 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2471 } 2789 }
2472 2790
2473 $map 2791 $map
2474 }; 2792 };
2475 2793
2481 if ($gen == $self->{_goto_generation}) { 2799 if ($gen == $self->{_goto_generation}) {
2482 delete $self->{_goto_generation}; 2800 delete $self->{_goto_generation};
2483 $self->leave_link ($map, $x, $y); 2801 $self->leave_link ($map, $x, $y);
2484 } 2802 }
2485 2803
2486 $done->() if $done; 2804 $done->($self) if $done;
2487 })->prio (1); 2805 })->prio (1);
2488} 2806}
2489 2807
2490=item $player_object->enter_exit ($exit_object) 2808=item $player_object->enter_exit ($exit_object)
2491 2809
2511} 2829}
2512 2830
2513sub prepare_random_map { 2831sub prepare_random_map {
2514 my ($exit) = @_; 2832 my ($exit) = @_;
2515 2833
2516 my $guard = cf::lock_acquire "exit_prepare:$exit";
2517
2518 # all this does is basically replace the /! path by 2834 # all this does is basically replace the /! path by
2519 # a new random map path (?random/...) with a seed 2835 # a new random map path (?random/...) with a seed
2520 # that depends on the exit object 2836 # that depends on the exit object
2521 2837
2522 my $rmp = parse_random_map_params $exit->msg; 2838 my $rmp = parse_random_map_params $exit->msg;
2524 if ($exit->map) { 2840 if ($exit->map) {
2525 $rmp->{region} = $exit->region->name; 2841 $rmp->{region} = $exit->region->name;
2526 $rmp->{origin_map} = $exit->map->path; 2842 $rmp->{origin_map} = $exit->map->path;
2527 $rmp->{origin_x} = $exit->x; 2843 $rmp->{origin_x} = $exit->x;
2528 $rmp->{origin_y} = $exit->y; 2844 $rmp->{origin_y} = $exit->y;
2845
2846 $exit->map->touch;
2529 } 2847 }
2530 2848
2531 $rmp->{random_seed} ||= $exit->random_seed; 2849 $rmp->{random_seed} ||= $exit->random_seed;
2532 2850
2533 my $data = cf::to_json $rmp; 2851 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2534 my $md5 = Digest::MD5::md5_hex $data; 2852 my $md5 = Digest::MD5::md5_hex $data;
2535 my $meta = "$RANDOMDIR/$md5.meta"; 2853 my $meta = "$RANDOMDIR/$md5.meta";
2536 2854
2537 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2855 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2538 aio_write $fh, 0, (length $data), $data, 0; 2856 aio_write $fh, 0, (length $data), $data, 0;
2539 undef $fh; 2857 undef $fh;
2540 aio_rename "$meta~", $meta; 2858 aio_rename "$meta~", $meta;
2541 2859
2860 my $slaying = "?random/$md5";
2861
2862 if ($exit->valid) {
2542 $exit->slaying ("?random/$md5"); 2863 $exit->slaying ("?random/$md5");
2543 $exit->msg (undef); 2864 $exit->msg (undef);
2865 }
2544 } 2866 }
2545} 2867}
2546 2868
2547sub cf::object::player::enter_exit { 2869sub cf::object::player::enter_exit {
2548 my ($self, $exit) = @_; 2870 my ($self, $exit) = @_;
2549 2871
2550 return unless $self->type == cf::PLAYER; 2872 return unless $self->type == cf::PLAYER;
2551 2873
2552 if ($exit->slaying eq "/!") {
2553 #TODO: this should de-fi-ni-te-ly not be a sync-job
2554 # the problem is that $exit might not survive long enough
2555 # so it needs to be done right now, right here
2556 cf::sync_job { prepare_random_map $exit };
2557 }
2558
2559 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2560 my $hp = $exit->stats->hp;
2561 my $sp = $exit->stats->sp;
2562
2563 $self->enter_link; 2874 $self->enter_link;
2564 2875
2565 # if exit is damned, update players death & WoR home-position
2566 $self->contr->savebed ($slaying, $hp, $sp)
2567 if $exit->flag (FLAG_DAMNED);
2568
2569 (async { 2876 (async {
2570 $self->deactivate_recursive; # just to be sure 2877 $Coro::current->{desc} = "enter_exit";
2878
2571 unless (eval { 2879 unless (eval {
2880 $self->deactivate_recursive; # just to be sure
2881
2882 # random map handling
2883 {
2884 my $guard = cf::lock_acquire "exit_prepare:$exit";
2885
2886 prepare_random_map $exit
2887 if $exit->slaying eq "/!";
2888 }
2889
2890 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2891 my $x = $exit->stats->hp;
2892 my $y = $exit->stats->sp;
2893
2572 $self->goto ($slaying, $hp, $sp); 2894 $self->goto ($map, $x, $y);
2573 2895
2896 # if exit is damned, update players death & WoR home-position
2897 $self->contr->savebed ($map, $x, $y)
2898 if $exit->flag (cf::FLAG_DAMNED);
2899
2574 1; 2900 1
2575 }) { 2901 }) {
2576 $self->message ("Something went wrong deep within the crossfire server. " 2902 $self->message ("Something went wrong deep within the deliantra server. "
2577 . "I'll try to bring you back to the map you were before. " 2903 . "I'll try to bring you back to the map you were before. "
2578 . "Please report this to the dungeon master!", 2904 . "Please report this to the dungeon master!",
2579 cf::NDI_UNIQUE | cf::NDI_RED); 2905 cf::NDI_UNIQUE | cf::NDI_RED);
2580 2906
2581 warn "ERROR in enter_exit: $@"; 2907 error "ERROR in enter_exit: $@";
2582 $self->leave_link; 2908 $self->leave_link;
2583 } 2909 }
2584 })->prio (1); 2910 })->prio (1);
2585} 2911}
2586 2912
2598sub cf::client::send_drawinfo { 2924sub cf::client::send_drawinfo {
2599 my ($self, $text, $flags) = @_; 2925 my ($self, $text, $flags) = @_;
2600 2926
2601 utf8::encode $text; 2927 utf8::encode $text;
2602 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2928 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2929}
2930
2931=item $client->send_big_packet ($pkt)
2932
2933Like C<send_packet>, but tries to compress large packets, and fragments
2934them as required.
2935
2936=cut
2937
2938our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2939
2940sub cf::client::send_big_packet {
2941 my ($self, $pkt) = @_;
2942
2943 # try lzf for large packets
2944 $pkt = "lzf " . Compress::LZF::compress $pkt
2945 if 1024 <= length $pkt and $self->{can_lzf};
2946
2947 # split very large packets
2948 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2949 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2950 $pkt = "frag";
2951 }
2952
2953 $self->send_packet ($pkt);
2603} 2954}
2604 2955
2605=item $client->send_msg ($channel, $msg, $color, [extra...]) 2956=item $client->send_msg ($channel, $msg, $color, [extra...])
2606 2957
2607Send a drawinfo or msg packet to the client, formatting the msg for the 2958Send a drawinfo or msg packet to the client, formatting the msg for the
2609the message, with C<log> being the default. If C<$color> is negative, suppress 2960the message, with C<log> being the default. If C<$color> is negative, suppress
2610the message unless the client supports the msg packet. 2961the message unless the client supports the msg packet.
2611 2962
2612=cut 2963=cut
2613 2964
2965# non-persistent channels (usually the info channel)
2614our %CHANNEL = ( 2966our %CHANNEL = (
2967 "c/motd" => {
2968 id => "infobox",
2969 title => "MOTD",
2970 reply => undef,
2971 tooltip => "The message of the day",
2972 },
2615 "c/identify" => { 2973 "c/identify" => {
2616 id => "identify", 2974 id => "infobox",
2617 title => "Identify", 2975 title => "Identify",
2618 reply => undef, 2976 reply => undef,
2619 tooltip => "Items recently identified", 2977 tooltip => "Items recently identified",
2620 }, 2978 },
2621 "c/examine" => { 2979 "c/examine" => {
2622 id => "examine", 2980 id => "infobox",
2623 title => "Examine", 2981 title => "Examine",
2624 reply => undef, 2982 reply => undef,
2625 tooltip => "Signs and other items you examined", 2983 tooltip => "Signs and other items you examined",
2626 }, 2984 },
2985 "c/shopinfo" => {
2986 id => "infobox",
2987 title => "Shop Info",
2988 reply => undef,
2989 tooltip => "What your bargaining skill tells you about the shop",
2990 },
2991 "c/book" => {
2992 id => "infobox",
2993 title => "Book",
2994 reply => undef,
2995 tooltip => "The contents of a note or book",
2996 },
2997 "c/lookat" => {
2998 id => "infobox",
2999 title => "Look",
3000 reply => undef,
3001 tooltip => "What you saw there",
3002 },
3003 "c/who" => {
3004 id => "infobox",
3005 title => "Players",
3006 reply => undef,
3007 tooltip => "Shows players who are currently online",
3008 },
3009 "c/body" => {
3010 id => "infobox",
3011 title => "Body Parts",
3012 reply => undef,
3013 tooltip => "Shows which body parts you posess and are available",
3014 },
3015 "c/statistics" => {
3016 id => "infobox",
3017 title => "Statistics",
3018 reply => undef,
3019 tooltip => "Shows your primary statistics",
3020 },
3021 "c/skills" => {
3022 id => "infobox",
3023 title => "Skills",
3024 reply => undef,
3025 tooltip => "Shows your experience per skill and item power",
3026 },
3027 "c/shopitems" => {
3028 id => "infobox",
3029 title => "Shop Items",
3030 reply => undef,
3031 tooltip => "Shows the items currently for sale in this shop",
3032 },
3033 "c/resistances" => {
3034 id => "infobox",
3035 title => "Resistances",
3036 reply => undef,
3037 tooltip => "Shows your resistances",
3038 },
3039 "c/pets" => {
3040 id => "infobox",
3041 title => "Pets",
3042 reply => undef,
3043 tooltip => "Shows information abotu your pets/a specific pet",
3044 },
3045 "c/perceiveself" => {
3046 id => "infobox",
3047 title => "Perceive Self",
3048 reply => undef,
3049 tooltip => "You gained detailed knowledge about yourself",
3050 },
3051 "c/uptime" => {
3052 id => "infobox",
3053 title => "Uptime",
3054 reply => undef,
3055 tooltip => "How long the server has been running since last restart",
3056 },
3057 "c/mapinfo" => {
3058 id => "infobox",
3059 title => "Map Info",
3060 reply => undef,
3061 tooltip => "Information related to the maps",
3062 },
3063 "c/party" => {
3064 id => "party",
3065 title => "Party",
3066 reply => "gsay ",
3067 tooltip => "Messages and chat related to your party",
3068 },
3069 "c/death" => {
3070 id => "death",
3071 title => "Death",
3072 reply => undef,
3073 tooltip => "Reason for and more info about your most recent death",
3074 },
3075 "c/say" => $SAY_CHANNEL,
3076 "c/chat" => $CHAT_CHANNEL,
2627); 3077);
2628 3078
2629sub cf::client::send_msg { 3079sub cf::client::send_msg {
2630 my ($self, $channel, $msg, $color, @extra) = @_; 3080 my ($self, $channel, $msg, $color, @extra) = @_;
2631 3081
2632 $msg = $self->pl->expand_cfpod ($msg); 3082 $msg = $self->pl->expand_cfpod ($msg)
3083 unless $color & cf::NDI_VERBATIM;
2633 3084
2634 $color &= cf::NDI_CLIENT_MASK; # just in case... 3085 $color &= cf::NDI_CLIENT_MASK; # just in case...
2635 3086
2636 # check predefined channels, for the benefit of C 3087 # check predefined channels, for the benefit of C
2637 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3088 if ($CHANNEL{$channel}) {
3089 $channel = $CHANNEL{$channel};
2638 3090
3091 $self->ext_msg (channel_info => $channel);
3092 $channel = $channel->{id};
3093
2639 if (ref $channel) { 3094 } elsif (ref $channel) {
2640 # send meta info to client, if not yet sent 3095 # send meta info to client, if not yet sent
2641 unless (exists $self->{channel}{$channel->{id}}) { 3096 unless (exists $self->{channel}{$channel->{id}}) {
2642 $self->{channel}{$channel->{id}} = $channel; 3097 $self->{channel}{$channel->{id}} = $channel;
2643 $self->ext_msg (channel_info => $channel) 3098 $self->ext_msg (channel_info => $channel);
2644 if $self->can_msg;
2645 } 3099 }
2646 3100
2647 $channel = $channel->{id}; 3101 $channel = $channel->{id};
2648 } 3102 }
2649 3103
2650 return unless @extra || length $msg; 3104 return unless @extra || length $msg;
2651 3105
2652 if ($self->can_msg) {
2653 # default colour, mask it out 3106 # default colour, mask it out
2654 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3107 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2655 if $color & cf::NDI_DEF; 3108 if $color & cf::NDI_DEF;
2656 3109
2657 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3110 my $pkt = "msg "
3111 . $self->{json_coder}->encode (
2658 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3112 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2659 } else { 3113 );
2660 if ($color >= 0) {
2661 # replace some tags by gcfclient-compatible ones
2662 for ($msg) {
2663 1 while
2664 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2665 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2666 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2667 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2668 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2669 }
2670 3114
2671 $color &= cf::NDI_COLOR_MASK; 3115 $self->send_big_packet ($pkt);
2672
2673 utf8::encode $msg;
2674
2675 if (0 && $msg =~ /\[/) {
2676 # COMMAND/INFO
2677 $self->send_packet ("drawextinfo $color 10 8 $msg")
2678 } else {
2679 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2680 $self->send_packet ("drawinfo $color $msg")
2681 }
2682 }
2683 }
2684} 3116}
2685 3117
2686=item $client->ext_msg ($type, @msg) 3118=item $client->ext_msg ($type, @msg)
2687 3119
2688Sends an ext event to the client. 3120Sends an ext event to the client.
2691 3123
2692sub cf::client::ext_msg($$@) { 3124sub cf::client::ext_msg($$@) {
2693 my ($self, $type, @msg) = @_; 3125 my ($self, $type, @msg) = @_;
2694 3126
2695 if ($self->extcmd == 2) { 3127 if ($self->extcmd == 2) {
2696 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3128 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2697 } elsif ($self->extcmd == 1) { # TODO: remove 3129 } elsif ($self->extcmd == 1) { # TODO: remove
2698 push @msg, msgtype => "event_$type"; 3130 push @msg, msgtype => "event_$type";
2699 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2700 } 3132 }
2701} 3133}
2702 3134
2703=item $client->ext_reply ($msgid, @msg) 3135=item $client->ext_reply ($msgid, @msg)
2704 3136
2708 3140
2709sub cf::client::ext_reply($$@) { 3141sub cf::client::ext_reply($$@) {
2710 my ($self, $id, @msg) = @_; 3142 my ($self, $id, @msg) = @_;
2711 3143
2712 if ($self->extcmd == 2) { 3144 if ($self->extcmd == 2) {
2713 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3145 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2714 } elsif ($self->extcmd == 1) { 3146 } elsif ($self->extcmd == 1) {
2715 #TODO: version 1, remove 3147 #TODO: version 1, remove
2716 unshift @msg, msgtype => "reply", msgid => $id; 3148 unshift @msg, msgtype => "reply", msgid => $id;
2717 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3149 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2718 } 3150 }
2719} 3151}
2720 3152
2721=item $success = $client->query ($flags, "text", \&cb) 3153=item $success = $client->query ($flags, "text", \&cb)
2722 3154
2793 3225
2794 $ns->ext_reply ($reply, @reply) 3226 $ns->ext_reply ($reply, @reply)
2795 if $reply; 3227 if $reply;
2796 3228
2797 } else { 3229 } else {
2798 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3230 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2799 } 3231 }
2800 3232
2801 cf::override; 3233 cf::override;
2802 }, 3234 },
2803); 3235);
2823 3255
2824 $coro 3256 $coro
2825} 3257}
2826 3258
2827cf::client->attach ( 3259cf::client->attach (
2828 on_destroy => sub { 3260 on_client_destroy => sub {
2829 my ($ns) = @_; 3261 my ($ns) = @_;
2830 3262
2831 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3263 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2832 }, 3264 },
2833); 3265);
2849our $safe_hole = new Safe::Hole; 3281our $safe_hole = new Safe::Hole;
2850 3282
2851$SIG{FPE} = 'IGNORE'; 3283$SIG{FPE} = 'IGNORE';
2852 3284
2853$safe->permit_only (Opcode::opset qw( 3285$safe->permit_only (Opcode::opset qw(
2854 :base_core :base_mem :base_orig :base_math 3286 :base_core :base_mem :base_orig :base_math :base_loop
2855 grepstart grepwhile mapstart mapwhile 3287 grepstart grepwhile mapstart mapwhile
2856 sort time 3288 sort time
2857)); 3289));
2858 3290
2859# here we export the classes and methods available to script code 3291# here we export the classes and methods available to script code
2861=pod 3293=pod
2862 3294
2863The following functions and methods are available within a safe environment: 3295The following functions and methods are available within a safe environment:
2864 3296
2865 cf::object 3297 cf::object
2866 contr pay_amount pay_player map x y force_find force_add 3298 contr pay_amount pay_player map x y force_find force_add destroy
2867 insert remove name archname title slaying race decrease_ob_nr 3299 insert remove name archname title slaying race decrease split
3300 value
2868 3301
2869 cf::object::player 3302 cf::object::player
2870 player 3303 player
2871 3304
2872 cf::player 3305 cf::player
2877 3310
2878=cut 3311=cut
2879 3312
2880for ( 3313for (
2881 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3314 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2882 insert remove inv name archname title slaying race 3315 insert remove inv nrof name archname title slaying race
2883 decrease_ob_nr)], 3316 decrease split destroy change_exp value msg lore send_msg)],
2884 ["cf::object::player" => qw(player)], 3317 ["cf::object::player" => qw(player)],
2885 ["cf::player" => qw(peaceful)], 3318 ["cf::player" => qw(peaceful send_msg)],
2886 ["cf::map" => qw(trigger)], 3319 ["cf::map" => qw(trigger)],
2887) { 3320) {
2888 no strict 'refs';
2889 my ($pkg, @funs) = @$_; 3321 my ($pkg, @funs) = @$_;
2890 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3322 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2891 for @funs; 3323 for @funs;
2892} 3324}
2893 3325
2908 3340
2909 my $qcode = $code; 3341 my $qcode = $code;
2910 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3342 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2911 $qcode =~ s/\n/\\n/g; 3343 $qcode =~ s/\n/\\n/g;
2912 3344
3345 %vars = (_dummy => 0) unless %vars;
3346
3347 my @res;
2913 local $_; 3348 local $_;
2914 local @safe::cf::_safe_eval_args = values %vars;
2915 3349
2916 my $eval = 3350 my $eval =
2917 "do {\n" 3351 "do {\n"
2918 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3352 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2919 . "#line 0 \"{$qcode}\"\n" 3353 . "#line 0 \"{$qcode}\"\n"
2920 . $code 3354 . $code
2921 . "\n}" 3355 . "\n}"
2922 ; 3356 ;
2923 3357
3358 if ($CFG{safe_eval}) {
2924 sub_generation_inc; 3359 sub_generation_inc;
3360 local @safe::cf::_safe_eval_args = values %vars;
2925 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3361 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2926 sub_generation_inc; 3362 sub_generation_inc;
3363 } else {
3364 local @cf::_safe_eval_args = values %vars;
3365 @res = wantarray ? eval eval : scalar eval $eval;
3366 }
2927 3367
2928 if ($@) { 3368 if ($@) {
2929 warn "$@"; 3369 warn "$@",
2930 warn "while executing safe code '$code'\n"; 3370 "while executing safe code '$code'\n",
2931 warn "with arguments " . (join " ", %vars) . "\n"; 3371 "with arguments " . (join " ", %vars) . "\n";
2932 } 3372 }
2933 3373
2934 wantarray ? @res : $res[0] 3374 wantarray ? @res : $res[0]
2935} 3375}
2936 3376
2950=cut 3390=cut
2951 3391
2952sub register_script_function { 3392sub register_script_function {
2953 my ($fun, $cb) = @_; 3393 my ($fun, $cb) = @_;
2954 3394
2955 no strict 'refs'; 3395 $fun = "safe::$fun" if $CFG{safe_eval};
2956 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3396 *$fun = $safe_hole->wrap ($cb);
2957} 3397}
2958 3398
2959=back 3399=back
2960 3400
2961=cut 3401=cut
2970 # for this (global event?) 3410 # for this (global event?)
2971 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
2972 3412
2973 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2974 3414
2975 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
2976 3416
2977 my $facedata;
2978 0 < aio_load $path, $facedata 3417 0 < aio_load $path, my $facedata
2979 or die "$path: $!"; 3418 or die "$path: $!";
2980 3419
2981 $facedata = Coro::Storable::thaw $facedata; 3420 $facedata = Coro::Storable::thaw $facedata;
2982 3421
2983 $facedata->{version} == 2 3422 $facedata->{version} == 2
2984 or cf::cleanup "$path: version mismatch, cannot proceed."; 3423 or cf::cleanup "$path: version mismatch, cannot proceed.";
2985 3424
2986 # patch in the exptable 3425 # patch in the exptable
3426 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2987 $facedata->{resource}{"res/exp_table"} = { 3427 $facedata->{resource}{"res/exp_table"} = {
2988 type => FT_RSRC, 3428 type => FT_RSRC,
2989 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3429 data => $exp_table,
3430 hash => (Digest::MD5::md5 $exp_table),
2990 }; 3431 };
2991 cf::cede_to_tick; 3432 cf::cede_to_tick;
2992 3433
2993 { 3434 {
2994 my $faces = $facedata->{faceinfo}; 3435 my $faces = $facedata->{faceinfo};
2995 3436
2996 while (my ($face, $info) = each %$faces) { 3437 while (my ($face, $info) = each %$faces) {
2997 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3438 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3439
2998 cf::face::set_visibility $idx, $info->{visibility}; 3440 cf::face::set_visibility $idx, $info->{visibility};
2999 cf::face::set_magicmap $idx, $info->{magicmap}; 3441 cf::face::set_magicmap $idx, $info->{magicmap};
3000 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3442 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3001 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3443 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3002 3444
3003 cf::cede_to_tick; 3445 cf::cede_to_tick;
3004 } 3446 }
3005 3447
3006 while (my ($face, $info) = each %$faces) { 3448 while (my ($face, $info) = each %$faces) {
3007 next unless $info->{smooth}; 3449 next unless $info->{smooth};
3450
3008 my $idx = cf::face::find $face 3451 my $idx = cf::face::find $face
3009 or next; 3452 or next;
3453
3010 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
3011 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
3012 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3013 } else { 3457 } else {
3014 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
3015 } 3459 }
3016 3460
3017 cf::cede_to_tick; 3461 cf::cede_to_tick;
3018 } 3462 }
3019 } 3463 }
3028 3472
3029 cf::anim::invalidate_all; # d'oh 3473 cf::anim::invalidate_all; # d'oh
3030 } 3474 }
3031 3475
3032 { 3476 {
3033 # TODO: for gcfclient pleasure, we should give resources
3034 # that gcfclient doesn't grok a >10000 face index.
3035 my $res = $facedata->{resource}; 3477 my $res = $facedata->{resource};
3036 3478
3037 my $soundconf = delete $res->{"res/sound.conf"};
3038
3039 while (my ($name, $info) = each %$res) { 3479 while (my ($name, $info) = each %$res) {
3480 if (defined $info->{type}) {
3040 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3041 my $data;
3042 3482
3043 if ($info->{type} & 1) { 3483 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3044 # prepend meta info 3484 cf::face::set_type $idx, $info->{type};
3045
3046 my $meta = $enc->encode ({
3047 name => $name,
3048 %{ $info->{meta} || {} },
3049 });
3050
3051 $data = pack "(w/a*)*", $meta, $info->{data};
3052 } else { 3485 } else {
3053 $data = $info->{data}; 3486 $RESOURCE{$name} = $info; # unused
3054 } 3487 }
3055 3488
3056 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3057 cf::face::set_type $idx, $info->{type};
3058
3059 cf::cede_to_tick; 3489 cf::cede_to_tick;
3060 } 3490 }
3061
3062 if ($soundconf) {
3063 $soundconf = $enc->decode (delete $soundconf->{data});
3064
3065 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3066 my $sound = $soundconf->{compat}[$_]
3067 or next;
3068
3069 my $face = cf::face::find "sound/$sound->[1]";
3070 cf::sound::set $sound->[0] => $face;
3071 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3072 }
3073
3074 while (my ($k, $v) = each %{$soundconf->{event}}) {
3075 my $face = cf::face::find "sound/$v";
3076 cf::sound::set $k => $face;
3077 }
3078 }
3079 } 3491 }
3492
3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3080 3494
3081 1 3495 1
3082} 3496}
3083 3497
3084register_exticmd fx_want => sub { 3498register_exticmd fx_want => sub {
3086 3500
3087 while (my ($k, $v) = each %$want) { 3501 while (my ($k, $v) = each %$want) {
3088 $ns->fx_want ($k, $v); 3502 $ns->fx_want ($k, $v);
3089 } 3503 }
3090}; 3504};
3505
3506sub load_resource_file($) {
3507 my $guard = lock_acquire "load_resource_file";
3508
3509 my $status = load_resource_file_ $_[0];
3510 get_slot 0.1, 100;
3511 cf::arch::commit_load;
3512
3513 $status
3514}
3091 3515
3092sub reload_regions { 3516sub reload_regions {
3093 # HACK to clear player env face cache, we need some signal framework 3517 # HACK to clear player env face cache, we need some signal framework
3094 # for this (global event?) 3518 # for this (global event?)
3095 %ext::player_env::MUSIC_FACE_CACHE = (); 3519 %ext::player_env::MUSIC_FACE_CACHE = ();
3109} 3533}
3110 3534
3111sub reload_archetypes { 3535sub reload_archetypes {
3112 load_resource_file "$DATADIR/archetypes" 3536 load_resource_file "$DATADIR/archetypes"
3113 or die "unable to load archetypes\n"; 3537 or die "unable to load archetypes\n";
3114 #d# NEED to laod twice to resolve forward references
3115 # this really needs to be done in an extra post-pass
3116 # (which needs to be synchronous, so solve it differently)
3117 load_resource_file "$DATADIR/archetypes"
3118 or die "unable to load archetypes\n";
3119} 3538}
3120 3539
3121sub reload_treasures { 3540sub reload_treasures {
3122 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
3123 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
3124} 3543}
3125 3544
3545sub reload_sound {
3546 trace "loading sound config from $DATADIR/sound\n";
3547
3548 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549 or die "$DATADIR/sound $!";
3550
3551 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3552
3553 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554 my $sound = $soundconf->{compat}[$_]
3555 or next;
3556
3557 my $face = cf::face::find "sound/$sound->[1]";
3558 cf::sound::set $sound->[0] => $face;
3559 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3560 }
3561
3562 while (my ($k, $v) = each %{$soundconf->{event}}) {
3563 my $face = cf::face::find "sound/$v";
3564 cf::sound::set $k => $face;
3565 }
3566}
3567
3126sub reload_resources { 3568sub reload_resources {
3127 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
3128 3570
3571 reload_exp_table;
3572 reload_materials;
3573 reload_facedata;
3574 reload_sound;
3575 reload_archetypes;
3129 reload_regions; 3576 reload_regions;
3130 reload_facedata;
3131 #reload_archetypes;#d#
3132 reload_archetypes;
3133 reload_treasures; 3577 reload_treasures;
3134 3578
3135 warn "finished reloading resource files\n"; 3579 trace "finished reloading resource files\n";
3136}
3137
3138sub init {
3139 reload_resources;
3140} 3580}
3141 3581
3142sub reload_config { 3582sub reload_config {
3143 open my $fh, "<:utf8", "$CONFDIR/config" 3583 trace "reloading config file...\n";
3144 or return;
3145 3584
3146 local $/; 3585 0 < aio_load "$CONFDIR/config", my $config
3147 *CFG = YAML::Syck::Load <$fh>; 3586 or die "$CONFDIR/config: $!";
3148 3587
3588 utf8::decode $config;
3589 *CFG = yaml_load $config;
3590
3149 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3591 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3150 3592
3151 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3593 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3152 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3594 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3153 3595
3154 if (exists $CFG{mlockall}) { 3596 if (exists $CFG{mlockall}) {
3158 }; 3600 };
3159 warn $@ if $@; 3601 warn $@ if $@;
3160 } 3602 }
3161} 3603}
3162 3604
3605sub pidfile() {
3606 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3607 or die "$PIDFILE: $!";
3608 flock $fh, &Fcntl::LOCK_EX
3609 or die "$PIDFILE: flock: $!";
3610 $fh
3611}
3612
3613# make sure only one server instance is running at any one time
3614sub atomic {
3615 my $fh = pidfile;
3616
3617 my $pid = <$fh>;
3618 kill 9, $pid if $pid > 0;
3619
3620 seek $fh, 0, 0;
3621 print $fh $$;
3622}
3623
3624sub main_loop {
3625 trace "EV::loop starting\n";
3626 if (1) {
3627 EV::loop;
3628 }
3629 trace "EV::loop returned\n";
3630 goto &main_loop unless $REALLY_UNLOOP;
3631}
3632
3163sub main { 3633sub main {
3634 cf::init_globals; # initialise logging
3635
3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3637 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3639 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3640
3641 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3642
3164 # we must not ever block the main coroutine 3643 # we must not ever block the main coroutine
3165 local $Coro::idle = sub { 3644 local $Coro::idle = sub {
3166 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3645 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3167 (async { 3646 (async {
3168 Event::one_event; 3647 $Coro::current->{desc} = "IDLE BUG HANDLER";
3648 EV::loop EV::LOOP_ONESHOT;
3169 })->prio (Coro::PRIO_MAX); 3649 })->prio (Coro::PRIO_MAX);
3170 }; 3650 };
3171 3651
3652 evthread_start IO::AIO::poll_fileno;
3653
3654 cf::sync_job {
3655 cf::incloader::init ();
3656
3657 cf::init_anim;
3658 cf::init_attackmess;
3659 cf::init_dynamic;
3660
3661 cf::load_settings;
3662
3663 reload_resources;
3172 reload_config; 3664 reload_config;
3173 db_init; 3665 db_init;
3666
3667 cf::init_uuid;
3668 cf::init_signals;
3669 cf::init_skills;
3670
3671 cf::init_beforeplay;
3672
3673 atomic;
3674
3174 load_extensions; 3675 load_extensions;
3175 3676
3176 $TICK_WATCHER->start; 3677 utime time, time, $RUNTIMEFILE;
3177 Event::loop; 3678
3679 # no (long-running) fork's whatsoever before this point(!)
3680 use POSIX ();
3681 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3682
3683 cf::_post_init 0;
3684 };
3685
3686 cf::object::thawer::errors_are_fatal 0;
3687 info "parse errors in files are no longer fatal from this point on.\n";
3688
3689 my $free_main; $free_main = EV::idle sub {
3690 undef $free_main;
3691 undef &main; # free gobs of memory :)
3692 };
3693
3694 goto &main_loop;
3178} 3695}
3179 3696
3180############################################################################# 3697#############################################################################
3181# initialisation and cleanup 3698# initialisation and cleanup
3182 3699
3183# install some emergency cleanup handlers 3700# install some emergency cleanup handlers
3184BEGIN { 3701BEGIN {
3702 our %SIGWATCHER = ();
3185 for my $signal (qw(INT HUP TERM)) { 3703 for my $signal (qw(INT HUP TERM)) {
3186 Event->signal ( 3704 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3187 reentrant => 0,
3188 data => WF_AUTOCANCEL,
3189 signal => $signal,
3190 prio => 0,
3191 cb => sub {
3192 cf::cleanup "SIG$signal"; 3705 cf::cleanup "SIG$signal";
3193 },
3194 ); 3706 };
3195 } 3707 }
3196} 3708}
3197 3709
3198sub write_runtime { 3710sub write_runtime_sync {
3199 my $runtime = "$LOCALDIR/runtime"; 3711 my $t0 = AE::time;
3200 3712
3201 # first touch the runtime file to show we are still running: 3713 # first touch the runtime file to show we are still running:
3202 # the fsync below can take a very very long time. 3714 # the fsync below can take a very very long time.
3203 3715
3204 IO::AIO::aio_utime $runtime, undef, undef; 3716 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3205 3717
3206 my $guard = cf::lock_acquire "write_runtime"; 3718 my $guard = cf::lock_acquire "write_runtime";
3207 3719
3208 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3720 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3209 or return; 3721 or return;
3210 3722
3211 my $value = $cf::RUNTIME + 90 + 10; 3723 my $value = $cf::RUNTIME + 90 + 10;
3212 # 10 is the runtime save interval, for a monotonic clock 3724 # 10 is the runtime save interval, for a monotonic clock
3213 # 60 allows for the watchdog to kill the server. 3725 # 60 allows for the watchdog to kill the server.
3223 aio_utime $fh, undef, undef; 3735 aio_utime $fh, undef, undef;
3224 3736
3225 close $fh 3737 close $fh
3226 or return; 3738 or return;
3227 3739
3228 aio_rename "$runtime~", $runtime 3740 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3229 and return; 3741 and return;
3230 3742
3231 warn "runtime file written.\n"; 3743 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3232 3744
3233 1 3745 1
3746}
3747
3748our $uuid_lock;
3749our $uuid_skip;
3750
3751sub write_uuid_sync($) {
3752 $uuid_skip ||= $_[0];
3753
3754 return if $uuid_lock;
3755 local $uuid_lock = 1;
3756
3757 my $uuid = "$LOCALDIR/uuid";
3758
3759 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3760 or return;
3761
3762 my $value = uuid_seq uuid_cur;
3763
3764 unless ($value) {
3765 info "cowardly refusing to write zero uuid value!\n";
3766 return;
3767 }
3768
3769 my $value = uuid_str $value + $uuid_skip;
3770 $uuid_skip = 0;
3771
3772 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3773 and return;
3774
3775 # always fsync - this file is important
3776 aio_fsync $fh
3777 and return;
3778
3779 close $fh
3780 or return;
3781
3782 aio_rename "$uuid~", $uuid
3783 and return;
3784
3785 trace "uuid file written ($value).\n";
3786
3787 1
3788
3789}
3790
3791sub write_uuid($$) {
3792 my ($skip, $sync) = @_;
3793
3794 $sync ? write_uuid_sync $skip
3795 : async { write_uuid_sync $skip };
3234} 3796}
3235 3797
3236sub emergency_save() { 3798sub emergency_save() {
3237 my $freeze_guard = cf::freeze_mainloop; 3799 my $freeze_guard = cf::freeze_mainloop;
3238 3800
3239 warn "enter emergency perl save\n"; 3801 info "emergency_perl_save: enter\n";
3802
3803 # this is a trade-off: we want to be very quick here, so
3804 # save all maps without fsync, and later call a global sync
3805 # (which in turn might be very very slow)
3806 local $USE_FSYNC = 0;
3240 3807
3241 cf::sync_job { 3808 cf::sync_job {
3809 cf::write_runtime_sync; # external watchdog should not bark
3810
3242 # use a peculiar iteration method to avoid tripping on perl 3811 # use a peculiar iteration method to avoid tripping on perl
3243 # refcount bugs in for. also avoids problems with players 3812 # refcount bugs in for. also avoids problems with players
3244 # and maps saved/destroyed asynchronously. 3813 # and maps saved/destroyed asynchronously.
3245 warn "begin emergency player save\n"; 3814 info "emergency_perl_save: begin player save\n";
3246 for my $login (keys %cf::PLAYER) { 3815 for my $login (keys %cf::PLAYER) {
3247 my $pl = $cf::PLAYER{$login} or next; 3816 my $pl = $cf::PLAYER{$login} or next;
3248 $pl->valid or next; 3817 $pl->valid or next;
3818 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3249 $pl->save; 3819 $pl->save;
3250 } 3820 }
3251 warn "end emergency player save\n"; 3821 info "emergency_perl_save: end player save\n";
3252 3822
3253 warn "begin emergency map save\n"; 3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3825 info "emergency_perl_save: begin map save\n";
3254 for my $path (keys %cf::MAP) { 3826 for my $path (keys %cf::MAP) {
3255 my $map = $cf::MAP{$path} or next; 3827 my $map = $cf::MAP{$path} or next;
3256 $map->valid or next; 3828 $map->valid or next;
3257 $map->save; 3829 $map->save;
3258 } 3830 }
3259 warn "end emergency map save\n"; 3831 info "emergency_perl_save: end map save\n";
3260 3832
3261 warn "begin emergency database checkpoint\n"; 3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3835 info "emergency_perl_save: begin database checkpoint\n";
3262 BDB::db_env_txn_checkpoint $DB_ENV; 3836 BDB::db_env_txn_checkpoint $DB_ENV;
3263 warn "end emergency database checkpoint\n"; 3837 info "emergency_perl_save: end database checkpoint\n";
3838
3839 info "emergency_perl_save: begin write uuid\n";
3840 write_uuid_sync 1;
3841 info "emergency_perl_save: end write uuid\n";
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: syncing database to disk";
3846 BDB::db_env_txn_checkpoint $DB_ENV;
3847
3848 info "emergency_perl_save: starting sync\n";
3849 IO::AIO::aio_sync sub {
3850 info "emergency_perl_save: finished sync\n";
3851 };
3852
3853 cf::write_runtime_sync; # external watchdog should not bark
3854
3855 trace "emergency_perl_save: flushing outstanding aio requests";
3856 while (IO::AIO::nreqs || BDB::nreqs) {
3857 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3858 }
3859
3860 cf::write_runtime_sync; # external watchdog should not bark
3264 }; 3861 };
3265 3862
3266 warn "leave emergency perl save\n"; 3863 info "emergency_perl_save: leave\n";
3267} 3864}
3268 3865
3269sub post_cleanup { 3866sub post_cleanup {
3270 my ($make_core) = @_; 3867 my ($make_core) = @_;
3271 3868
3869 IO::AIO::flush;
3870
3272 warn Carp::longmess "post_cleanup backtrace" 3871 error Carp::longmess "post_cleanup backtrace"
3273 if $make_core; 3872 if $make_core;
3873
3874 my $fh = pidfile;
3875 unlink $PIDFILE if <$fh> == $$;
3876}
3877
3878# a safer delete_package, copied from Symbol
3879sub clear_package($) {
3880 my $pkg = shift;
3881
3882 # expand to full symbol table name if needed
3883 unless ($pkg =~ /^main::.*::$/) {
3884 $pkg = "main$pkg" if $pkg =~ /^::/;
3885 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3886 $pkg .= '::' unless $pkg =~ /::$/;
3887 }
3888
3889 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3890 my $stem_symtab = *{$stem}{HASH};
3891
3892 defined $stem_symtab and exists $stem_symtab->{$leaf}
3893 or return;
3894
3895 # clear all symbols
3896 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3897 for my $name (keys %$leaf_symtab) {
3898 _gv_clear *{"$pkg$name"};
3899# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3900 }
3274} 3901}
3275 3902
3276sub do_reload_perl() { 3903sub do_reload_perl() {
3277 # can/must only be called in main 3904 # can/must only be called in main
3278 if ($Coro::current != $Coro::main) { 3905 unless (in_main) {
3279 warn "can only reload from main coroutine"; 3906 error "can only reload from main coroutine";
3280 return; 3907 return;
3281 } 3908 }
3282 3909
3283 warn "reloading..."; 3910 return if $RELOAD++;
3284 3911
3285 warn "entering sync_job"; 3912 my $t1 = AE::time;
3286 3913
3914 while ($RELOAD) {
3915 cf::get_slot 0.1, -1, "reload_perl";
3916 info "perl_reload: reloading...";
3917
3918 trace "perl_reload: entering sync_job";
3919
3287 cf::sync_job { 3920 cf::sync_job {
3288 cf::write_runtime; # external watchdog should not bark
3289 cf::emergency_save; 3921 #cf::emergency_save;
3290 cf::write_runtime; # external watchdog should not bark
3291 3922
3292 warn "syncing database to disk";
3293 BDB::db_env_txn_checkpoint $DB_ENV;
3294
3295 # if anything goes wrong in here, we should simply crash as we already saved
3296
3297 warn "cancelling all WF_AUTOCANCEL watchers";
3298 for (Event::all_watchers) {
3299 $_->cancel if $_->data & WF_AUTOCANCEL;
3300 }
3301
3302 warn "flushing outstanding aio requests";
3303 for (;;) {
3304 BDB::flush;
3305 IO::AIO::flush;
3306 Coro::cede;
3307 last unless IO::AIO::nreqs || BDB::nreqs;
3308 warn "iterate...";
3309 }
3310
3311 ++$RELOAD;
3312
3313 warn "cancelling all extension coros"; 3923 trace "perl_reload: cancelling all extension coros";
3314 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3315 %EXT_CORO = (); 3925 %EXT_CORO = ();
3316 3926
3317 warn "removing commands"; 3927 trace "perl_reload: removing commands";
3318 %COMMAND = (); 3928 %COMMAND = ();
3319 3929
3320 warn "removing ext/exti commands"; 3930 trace "perl_reload: removing ext/exti commands";
3321 %EXTCMD = (); 3931 %EXTCMD = ();
3322 %EXTICMD = (); 3932 %EXTICMD = ();
3323 3933
3324 warn "unloading/nuking all extensions"; 3934 trace "perl_reload: unloading/nuking all extensions";
3325 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3326 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3327 3937
3328 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3329 eval { 3939 eval {
3330 $cb->($pkg); 3940 $cb->($pkg);
3331 1 3941 1
3332 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3943 }
3944
3945 trace "... clearing $pkg";
3946 clear_package $pkg;
3333 } 3947 }
3334 3948
3335 warn "... nuking $pkg";
3336 Symbol::delete_package $pkg;
3337 }
3338
3339 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3340 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3341 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3342 3952
3343 warn "... unloading $k"; 3953 trace "... unloading $k";
3344 delete $INC{$k}; 3954 delete $INC{$k};
3345 3955
3346 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3347 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3348 3958
3349 if (my $cb = $k->can ("unload_module")) { 3959 if (my $cb = $k->can ("unload_module")) {
3350 $cb->(); 3960 $cb->();
3961 }
3962
3963 clear_package $k;
3351 } 3964 }
3352 3965
3353 Symbol::delete_package $k;
3354 }
3355
3356 warn "getting rid of safe::, as good as possible"; 3966 trace "perl_reload: getting rid of safe::, as good as possible";
3357 Symbol::delete_package "safe::$_" 3967 clear_package "safe::$_"
3358 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3359 3969
3360 warn "unloading cf.pm \"a bit\""; 3970 trace "perl_reload: unloading cf.pm \"a bit\"";
3361 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3362 delete $INC{"cf/pod.pm"}; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3363 3973
3364 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3365 # and global variables created in xs 3975 # and global variables created in xs
3366 #Symbol::delete_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3367 3977
3368 warn "unload completed, starting to reload now"; 3978 info "perl_reload: unload completed, starting to reload now";
3369 3979
3370 warn "reloading cf.pm"; 3980 trace "perl_reload: reloading cf.pm";
3371 require cf; 3981 require cf;
3372 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3982 cf::_connect_to_perl_1;
3373 3983
3374 warn "loading config and database again"; 3984 trace "perl_reload: loading config and database again";
3375 cf::reload_config; 3985 cf::reload_config;
3376 3986
3377 warn "loading extensions"; 3987 trace "perl_reload: loading extensions";
3378 cf::load_extensions; 3988 cf::load_extensions;
3379 3989
3990 if ($REATTACH_ON_RELOAD) {
3380 warn "reattaching attachments to objects/players"; 3991 trace "perl_reload: reattaching attachments to objects/players";
3381 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3382 warn "reattaching attachments to maps"; 3993 trace "perl_reload: reattaching attachments to maps";
3383 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3384 warn "reattaching attachments to players"; 3995 trace "perl_reload: reattaching attachments to players";
3385 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3997 }
3386 3998
3387 warn "leaving sync_job"; 3999 cf::_post_init 1;
3388 4000
4001 trace "perl_reload: leaving sync_job";
4002
3389 1 4003 1
3390 } or do { 4004 } or do {
3391 warn $@; 4005 error $@;
3392 warn "error while reloading, exiting."; 4006 cf::cleanup "perl_reload: error, exiting.";
3393 exit 1; 4007 };
4008
4009 --$RELOAD;
3394 }; 4010 }
3395 4011
3396 warn "reloaded"; 4012 $t1 = AE::time - $t1;
4013 info "perl_reload: completed in ${t1}s\n";
3397}; 4014};
3398 4015
3399our $RELOAD_WATCHER; # used only during reload 4016our $RELOAD_WATCHER; # used only during reload
3400 4017
3401sub reload_perl() { 4018sub reload_perl() {
3402 # doing reload synchronously and two reloads happen back-to-back, 4019 # doing reload synchronously and two reloads happen back-to-back,
3403 # coro crashes during coro_state_free->destroy here. 4020 # coro crashes during coro_state_free->destroy here.
3404 4021
3405 $RELOAD_WATCHER ||= Event->timer ( 4022 $RELOAD_WATCHER ||= cf::async {
3406 reentrant => 0, 4023 Coro::AIO::aio_wait cache_extensions;
3407 after => 0, 4024
3408 data => WF_AUTOCANCEL, 4025 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3409 cb => sub {
3410 do_reload_perl; 4026 do_reload_perl;
3411 undef $RELOAD_WATCHER; 4027 undef $RELOAD_WATCHER;
3412 }, 4028 };
3413 ); 4029 };
3414} 4030}
3415 4031
3416register_command "reload" => sub { 4032register_command "reload" => sub {
3417 my ($who, $arg) = @_; 4033 my ($who, $arg) = @_;
3418 4034
3419 if ($who->flag (FLAG_WIZ)) { 4035 if ($who->flag (FLAG_WIZ)) {
3420 $who->message ("reloading server."); 4036 $who->message ("reloading server.");
4037 async {
4038 $Coro::current->{desc} = "perl_reload";
3421 async { reload_perl }; 4039 reload_perl;
4040 };
3422 } 4041 }
3423}; 4042};
3424 4043
3425unshift @INC, $LIBDIR; 4044#############################################################################
3426 4045
3427my $bug_warning = 0; 4046my $bug_warning = 0;
3428 4047
3429our @WAIT_FOR_TICK; 4048our @WAIT_FOR_TICK;
3430our @WAIT_FOR_TICK_BEGIN; 4049our @WAIT_FOR_TICK_BEGIN;
3431 4050
3432sub wait_for_tick { 4051sub wait_for_tick() {
3433 return unless $TICK_WATCHER->is_active;
3434 return if $Coro::current == $Coro::main; 4052 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3435 4053
3436 my $signal = new Coro::Signal; 4054 my $signal = new Coro::Signal;
3437 push @WAIT_FOR_TICK, $signal; 4055 push @WAIT_FOR_TICK, $signal;
3438 $signal->wait; 4056 $signal->wait;
3439} 4057}
3440 4058
3441sub wait_for_tick_begin { 4059sub wait_for_tick_begin() {
3442 return unless $TICK_WATCHER->is_active;
3443 return if $Coro::current == $Coro::main; 4060 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3444 4061
3445 my $signal = new Coro::Signal; 4062 my $signal = new Coro::Signal;
3446 push @WAIT_FOR_TICK_BEGIN, $signal; 4063 push @WAIT_FOR_TICK_BEGIN, $signal;
3447 $signal->wait; 4064 $signal->wait;
3448} 4065}
3449 4066
3450 my $min = 1e6;#d# 4067sub tick {
3451 my $avg = 10;
3452$TICK_WATCHER = Event->timer (
3453 reentrant => 0,
3454 parked => 1,
3455 prio => 0,
3456 at => $NEXT_TICK || $TICK,
3457 data => WF_AUTOCANCEL,
3458 cb => sub {
3459 if ($Coro::current != $Coro::main) { 4068 if ($Coro::current != $Coro::main) {
3460 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4069 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3461 unless ++$bug_warning > 10; 4070 unless ++$bug_warning > 10;
3462 return; 4071 return;
3463 } 4072 }
3464 4073
3465 $NOW = $tick_start = Event::time;
3466
3467 cf::server_tick; # one server iteration 4074 cf::server_tick; # one server iteration
3468 4075
3469 0 && sync_job {#d# 4076 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3470 for(1..10) {
3471 my $t = Event::time;
3472 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3473 or die;
3474 4077
3475 $map->width (50); 4078 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3476 $map->height (50); 4079 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3477 $map->alloc; 4080 Coro::async_pool {
3478 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 4081 $Coro::current->{desc} = "runtime saver";
3479 my $t = Event::time - $t; 4082 write_runtime_sync
3480 4083 or error "ERROR: unable to write runtime file: $!";
3481 #next unless $t < 0.0013;#d#
3482 if ($t < $min) {
3483 $min = $t;
3484 }
3485 $avg = $avg * 0.99 + $t * 0.01;
3486 }
3487 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3488 exit 0;
3489 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3490 }; 4084 };
4085 }
3491 4086
3492 $RUNTIME += $TICK;
3493 $NEXT_TICK += $TICK;
3494
3495 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3496 $NEXT_RUNTIME_WRITE = $NOW + 10;
3497 Coro::async_pool {
3498 write_runtime
3499 or warn "ERROR: unable to write runtime file: $!";
3500 };
3501 }
3502
3503# my $AFTER = Event::time;
3504# warn $AFTER - $NOW;#d#
3505
3506 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4087 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3507 $sig->send; 4088 $sig->send;
3508 } 4089 }
3509 while (my $sig = shift @WAIT_FOR_TICK) { 4090 while (my $sig = shift @WAIT_FOR_TICK) {
3510 $sig->send; 4091 $sig->send;
3511 } 4092 }
3512 4093
3513 $NOW = Event::time; 4094 $LOAD = ($NOW - $TICK_START) / $TICK;
3514
3515 # if we are delayed by four ticks or more, skip them all
3516 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3517
3518 $TICK_WATCHER->at ($NEXT_TICK);
3519 $TICK_WATCHER->start;
3520
3521 $LOAD = ($NOW - $tick_start) / $TICK;
3522 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4095 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3523 4096
3524 _post_tick; 4097 if (0) {
3525 4098 if ($NEXT_TICK) {
3526 4099 my $jitter = $TICK_START - $NEXT_TICK;
4100 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4101 debug "jitter $JITTER\n";#d#
4102 }
3527 }, 4103 }
3528); 4104}
3529 4105
3530{ 4106{
4107 # configure BDB
4108
3531 BDB::min_parallel 8; 4109 BDB::min_parallel 16;
3532 BDB::max_poll_time $TICK * 0.1; 4110 BDB::max_poll_reqs $TICK * 0.1;
3533 $BDB_POLL_WATCHER = Event->io ( 4111 $AnyEvent::BDB::WATCHER->priority (1);
3534 reentrant => 0,
3535 fd => BDB::poll_fileno,
3536 poll => 'r',
3537 prio => 0,
3538 data => WF_AUTOCANCEL,
3539 cb => \&BDB::poll_cb,
3540 );
3541
3542 BDB::set_sync_prepare {
3543 my $status;
3544 my $current = $Coro::current;
3545 (
3546 sub {
3547 $status = $!;
3548 $current->ready; undef $current;
3549 },
3550 sub {
3551 Coro::schedule while defined $current;
3552 $! = $status;
3553 },
3554 )
3555 };
3556 4112
3557 unless ($DB_ENV) { 4113 unless ($DB_ENV) {
3558 $DB_ENV = BDB::db_env_create; 4114 $DB_ENV = BDB::db_env_create;
4115 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4116 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4117 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4118 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4119 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3559 4120
3560 cf::sync_job { 4121 cf::sync_job {
3561 eval { 4122 eval {
3562 BDB::db_env_open 4123 BDB::db_env_open
3563 $DB_ENV, 4124 $DB_ENV,
3565 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4126 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3566 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4127 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3567 0666; 4128 0666;
3568 4129
3569 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4130 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3570
3571 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3572 | BDB::LOG_AUTOREMOVE, 1);
3573 $DB_ENV->set_lk_detect;
3574 }; 4131 };
3575 4132
3576 cf::cleanup "db_env_open(db): $@" if $@; 4133 cf::cleanup "db_env_open(db): $@" if $@;
3577 }; 4134 };
3578 } 4135 }
3579 4136
3580 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4137 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3581 after => 11, 4138 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3582 interval => 60, 4139 };
3583 hard => 1, 4140 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4141 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 ); 4142 };
3590 $BDB_TRICKLE_WATCHER = Event->timer ( 4143 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4144 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 ); 4145 };
3600} 4146}
3601 4147
3602{ 4148{
4149 # configure IO::AIO
4150
3603 IO::AIO::min_parallel 8; 4151 IO::AIO::min_parallel 8;
3604
3605 undef $Coro::AIO::WATCHER;
3606 IO::AIO::max_poll_time $TICK * 0.1; 4152 IO::AIO::max_poll_time $TICK * 0.1;
3607 $AIO_POLL_WATCHER = Event->io ( 4153 undef $AnyEvent::AIO::WATCHER;
3608 reentrant => 0,
3609 data => WF_AUTOCANCEL,
3610 fd => IO::AIO::poll_fileno,
3611 poll => 'r',
3612 prio => 6,
3613 cb => \&IO::AIO::poll_cb,
3614 );
3615} 4154}
3616 4155
3617my $_log_backtrace; 4156our $_log_backtrace;
4157our $_log_backtrace_last;
3618 4158
3619sub _log_backtrace { 4159sub _log_backtrace {
3620 my ($msg, @addr) = @_; 4160 my ($msg, @addr) = @_;
3621 4161
3622 $msg =~ s/\n//; 4162 $msg =~ s/\n$//;
3623 4163
4164 if ($_log_backtrace_last eq $msg) {
4165 LOG llevInfo, "[ABT] $msg\n";
4166 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3624 # limit the # of concurrent backtraces 4167 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 4168 } elsif ($_log_backtrace < 2) {
4169 $_log_backtrace_last = $msg;
3626 ++$_log_backtrace; 4170 ++$_log_backtrace;
4171 my $perl_bt = Carp::longmess $msg;
3627 async { 4172 async {
4173 $Coro::current->{desc} = "abt $msg";
4174
3628 my @bt = fork_call { 4175 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 4176 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4177 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4178 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 4179 or die "addr2line: $!";
3640 } 4187 }
3641 4188
3642 @funcs 4189 @funcs
3643 }; 4190 };
3644 4191
3645 LOG llevInfo, "[ABT] $msg\n"; 4192 LOG llevInfo, "[ABT] $perl_bt\n";
4193 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3646 LOG llevInfo, "[ABT] $_\n" for @bt; 4194 LOG llevInfo, "[ABT] $_\n" for @bt;
3647 --$_log_backtrace; 4195 --$_log_backtrace;
3648 }; 4196 };
3649 } else { 4197 } else {
3650 LOG llevInfo, "[ABT] $msg\n"; 4198 LOG llevInfo, "[ABT] $msg\n";
3651 LOG llevInfo, "[ABT] [suppressed]\n"; 4199 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3652 } 4200 }
3653} 4201}
3654 4202
3655# load additional modules 4203# load additional modules
3656use cf::pod; 4204require "cf/$_.pm" for @EXTRA_MODULES;
4205cf::_connect_to_perl_2;
3657 4206
3658END { cf::emergency_save } 4207END { cf::emergency_save }
3659 4208
36601 42091
3661 4210

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines