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.305 by root, Thu Jul 12 08:40:14 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.61 (); 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;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5;
29use Fcntl; 56use Fcntl;
30use YAML::Syck (); 57use YAML::XS ();
31use IO::AIO 2.32 (); 58use IO::AIO ();
32use Time::HiRes; 59use Time::HiRes;
33use Compress::LZF; 60use Compress::LZF;
34use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
35 64
36# configure various modules to our taste 65# configure various modules to our taste
37# 66#
38$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
39Coro::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";
40Compress::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
41 75
42$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
43 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 78
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
53 85
54our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
64our $DATADIR = datadir; 98our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
73our $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;
74 118
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 121our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
82 123
124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 126our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 127our $DB_ENV;
128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
85 130
86our %CFG; 131our %CFG;
87 132
88our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 134our $RUNTIME;
135our $NOW;
90 136
91our %PLAYER; # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 138our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
94 140
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 143
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
100our $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 :)
101 153
102binmode STDOUT; 154binmode STDOUT;
103binmode STDERR; 155binmode STDERR;
104 156
105# read virtual server time, if available 157# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
110} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
111 165
112mkdir $_ 166mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 168
115our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
116 170
117sub 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::"} };
118 187
119############################################################################# 188#############################################################################
120 189
121=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
122 191
158 227
159The raw value load value from the last tick. 228The raw value load value from the last tick.
160 229
161=item %cf::CFG 230=item %cf::CFG
162 231
163Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 233from wherever your confdir points to.
165 234
166=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
167 236
168These 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
169returns 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
170per 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.
171 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
246=item @cf::INVOKE_RESULTS
247
248This array contains the results of the last C<invoke ()> call. When
249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
250that call.
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
172=back 258=back
173 259
174=cut 260=cut
175 261
176BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
177 *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 {
178 my $msg = join "", @_; 269 my $msg = join "", @_;
179 270
180 $msg .= "\n" 271 $msg .= "\n"
181 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
182 273
183 $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;
184 275
185 utf8::encode $msg;
186 LOG llevError, $msg; 276 LOG llevWarn, $msg;
187 }; 277};
188} 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};
189 292
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
200for my $pkg (qw( 303for my $pkg (qw(
201 cf::global cf::attachable 304 cf::global cf::attachable
202 cf::object cf::object::player 305 cf::object cf::object::player
203 cf::client cf::player 306 cf::client cf::player
204 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
205 cf::map cf::party cf::region 309 cf::party cf::region
206)) { 310)) {
207 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 312}
210 313
211$Event::DIED = sub { 314$EV::DIED = sub {
212 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
213}; 316};
214 317
215############################################################################# 318#############################################################################
216 319
217=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
239 $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;
240 $d 343 $d
241 } || "[unable to dump $_[0]: '$@']"; 344 } || "[unable to dump $_[0]: '$@']";
242} 345}
243 346
244=item $ref = cf::from_json $json 347=item $ref = cf::decode_json $json
245 348
246Converts a JSON string into the corresponding perl data structure. 349Converts a JSON string into the corresponding perl data structure.
247 350
248=item $json = cf::to_json $ref 351=item $json = cf::encode_json $ref
249 352
250Converts a perl data structure into its JSON representation. 353Converts a perl data structure into its JSON representation.
251 354
252=cut 355=cut
253 356
254our $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
255 358
256sub to_json ($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
257sub 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}
258 404
259=item cf::lock_wait $string 405=item cf::lock_wait $string
260 406
261Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
262 408
263=item my $lock = cf::lock_acquire $string 409=item my $lock = cf::lock_acquire $string
264 410
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 413for example when the coroutine gets canceled), the lock is automatically
268returned. 414returned.
269 415
416Locks are *not* recursive, locking from the same coro twice results in a
417deadlocked coro.
418
270Lock names should begin with a unique identifier (for example, cf::map::find 419Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 420uses map_find and cf::map::load uses map_load).
272 421
273=item $locked = cf::lock_active $string 422=item $locked = cf::lock_active $string
274 423
275Return 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.
276 425
277=cut 426=cut
278 427
279our %LOCK; 428our $LOCKS = new Coro::SemaphoreSet;
280 429
281sub lock_wait($) { 430sub lock_wait($) {
282 my ($key) = @_; 431 $LOCKS->wait ($_[0]);
283
284 # wait for lock, if any
285 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule;
288 }
289} 432}
290 433
291sub lock_acquire($) { 434sub lock_acquire($) {
292 my ($key) = @_; 435 $LOCKS->guard ($_[0])
293
294 # wait, to be sure we are not locked
295 lock_wait $key;
296
297 $LOCK{$key} = [];
298
299 Coro::guard {
300 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} };
302 }
303} 436}
304 437
305sub lock_active($) { 438sub lock_active($) {
306 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
307
308 ! ! $LOCK{$key}
309} 440}
310 441
311sub freeze_mainloop { 442sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 443 tick_inhibit_inc;
313 444
314 my $guard = Coro::guard { 445 &Guard::guard (\&tick_inhibit_dec);
315 $TICK_WATCHER->start; 446}
447
448=item cf::periodic $interval, $cb
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
461}
462
463=item cf::get_slot $time[, $priority[, $name]]
464
465Allocate $time seconds of blocking CPU time at priority C<$priority>:
466This call blocks and returns only when you have at least C<$time> seconds
467of cpu time till the next tick. The slot is only valid till the next cede.
468
469The optional C<$name> can be used to identify the job to run. It might be
470used for statistical purposes and should identify the same time-class.
471
472Useful for short background jobs.
473
474=cut
475
476our @SLOT_QUEUE;
477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
479
480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
481$SLOT_QUEUE = Coro::async {
482 $Coro::current->desc ("timeslot manager");
483
484 my $signal = new Coro::Signal;
485 my $busy;
486
487 while () {
488 next_job:
489
490 my $avail = cf::till_tick;
491
492 for (0 .. $#SLOT_QUEUE) {
493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
495 my $job = splice @SLOT_QUEUE, $_, 1, ();
496 $job->[2]->send;
497 Coro::cede;
498 goto next_job;
499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
501 }
502 }
503
504 if (@SLOT_QUEUE) {
505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
506 push @cf::WAIT_FOR_TICK, $signal;
507 $signal->wait;
508 } else {
509 $busy = 0;
510 Coro::schedule;
511 }
316 }; 512 }
317 $TICK_WATCHER->stop; 513};
318 $guard 514
515sub get_slot($;$$) {
516 return if tick_inhibit || $Coro::current == $Coro::main;
517
518 my ($time, $pri, $name) = @_;
519
520 $time = clamp $time, 0.01, $TICK * .6;
521
522 my $sig = new Coro::Signal;
523
524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
526 $SLOT_QUEUE->ready;
527 $sig->wait;
319} 528}
320 529
321=item cf::async { BLOCK } 530=item cf::async { BLOCK }
322 531
323Currently the same as Coro::async_pool, meaning you cannot use 532Currently the same as Coro::async_pool, meaning you cannot use
328 537
329BEGIN { *async = \&Coro::async_pool } 538BEGIN { *async = \&Coro::async_pool }
330 539
331=item cf::sync_job { BLOCK } 540=item cf::sync_job { BLOCK }
332 541
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 542The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 543is always able to handle events or runnable, as Deliantra is only
335partly 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
336acceptable. 545acceptable.
337 546
338If 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
339the given BLOCK in another coroutine while waiting for the result. The 548the given BLOCK in another coroutine while waiting for the result. The
343=cut 552=cut
344 553
345sub sync_job(&) { 554sub sync_job(&) {
346 my ($job) = @_; 555 my ($job) = @_;
347 556
348 if ($Coro::current == $Coro::main) { 557 if (in_main) {
349 my $time = Event::time; 558 my $time = AE::time;
350 559
351 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
353 562
354 # TODO: use suspend/resume instead 563 #LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 564
356 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
357 566
358 my $busy = 1; 567 my $busy = 1;
359 my @res; 568 my @res;
360 569
361 (async { 570 (async {
571 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 572 @res = eval { $job->() };
363 warn $@ if $@; 573 error $@ if $@;
364 undef $busy; 574 undef $busy;
365 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
366 576
367 while ($busy) { 577 while ($busy) {
368 Coro::cede or Event::one_event; 578 if (Coro::nready) {
579 Coro::cede_notself;
580 } else {
581 EV::loop EV::LOOP_ONESHOT;
369 } 582 }
583 }
370 584
371 $time = Event::time - $time; 585 my $time = AE::time - $time;
372 586
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
377 588
378 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
379 } else { 590 } else {
380 # we are in another coroutine, how wonderful, everything just works 591 # we are in another coroutine, how wonderful, everything just works
381 592
401 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
402 613
403 $coro 614 $coro
404} 615}
405 616
406=item fork_call { }, $args 617=item fork_call { }, @args
407 618
408Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 622never block itself or use any form of event handling.
412 623
413=cut 624=cut
414 625
415sub _store_scalar { 626sub post_fork {
416 open my $fh, ">", \my $buf 627 reset_signals;
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422} 628}
423 629
424sub fork_call(&@) { 630sub fork_call(&@) {
425 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
426 632
427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 633 # we seemingly have to make a local copy of the whole thing,
428# or die "socketpair: $!"; 634 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 635 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 636
432 if (my $pid = fork) { 637 my @res = Coro::Util::fork_eval {
433 close $fh2; 638 cf::post_fork;
639 &$cb
640 } @args;
434 641
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 642 wantarray ? @res : $res[-1]
436 warn "pst<$res>" unless $res =~ /^pst/; 643}
437 $res = Coro::Storable::thaw $res;
438 644
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 645sub objinfo {
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals;
446 local $SIG{__WARN__};
447 local $SIG{__DIE__};
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453
454 eval {
455 close $fh1;
456
457 my @res = eval { $cb->(@args) };
458
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
461 };
462
463 warn $@ if $@;
464 _exit 0;
465 } 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
466} 681}
467 682
468=item $value = cf::db_get $family => $key 683=item $value = cf::db_get $family => $key
469 684
470Returns a single value from the environment database. 685Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 687=item cf::db_put $family => $key => $value
473 688
474Stores the given C<$value> in the family. It can currently store binary 689Stores the given C<$value> in the family. It can currently store binary
475data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 690data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476 691
692=item $db = cf::db_table "name"
693
694Create and/or open a new database table. The string must not be "db" and must be unique
695within each server.
696
477=cut 697=cut
698
699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
703 my ($name) = @_;
704 my $db = BDB::db_create $DB_ENV;
705
706 eval {
707 $db->set_flags (BDB::CHKSUM);
708
709 utf8::encode $name;
710 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
711 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
712 cf::cleanup "db_open(db): $!" if $!;
713 };
714 cf::cleanup "db_open(db): $@" if $@;
715
716 $db
717}
478 718
479our $DB; 719our $DB;
480 720
481sub db_init { 721sub db_init {
482 unless ($DB) { 722 $DB ||= db_table "db";
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job {
486 eval {
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 }
496} 723}
497 724
498sub db_get($$) { 725sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
500 727
501 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
502 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
503 732
504 $! ? () 733 $! ? ()
505 : $data 734 : $data
506 }
507} 735}
508 736
509sub db_put($$$) { 737sub db_put($$$) {
510 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
511 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
550 if (1) { 778 if (1) {
551 $md5 = 779 $md5 =
552 join "\x00", 780 join "\x00",
553 $processversion, 781 $processversion,
554 map { 782 map {
555 Coro::cede; 783 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 784 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 785 } 0.. $#$src;
558 786
559 787
560 my $dbmd5 = db_get cache => "$id/md5"; 788 my $dbmd5 = db_get cache => "$id/md5";
567 795
568 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
569 my $data = $process->(\@data); 797 my $data = $process->(\@data);
570 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
571 799
572 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
573 801
574 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
575 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
576 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
577 805
587 815
588=cut 816=cut
589 817
590sub datalog($@) { 818sub datalog($@) {
591 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
592 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
593} 821}
594 822
595=back 823=back
596 824
597=cut 825=cut
598 826
599############################################################################# 827#############################################################################
600 828
601=head2 ATTACHABLE OBJECTS 829=head2 ATTACHABLE OBJECTS
602 830
603Many 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
604attach callbacks/event handlers (a collection of which is called an "attachment") 832attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 833to it. All such attachable objects support the following methods.
606 834
607In 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>
608C<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
609Crossfire TRT). 837Deliantra).
610 838
611=over 4 839=over 4
612 840
613=item $attachable->attach ($attachment, key => $value...) 841=item $attachable->attach ($attachment, key => $value...)
614 842
658=item cf::CLASS::attachment $name, ... 886=item cf::CLASS::attachment $name, ...
659 887
660Register an attachment by C<$name> through which attachable objects of the 888Register an attachment by C<$name> through which attachable objects of the
661given CLASS can refer to this attachment. 889given CLASS can refer to this attachment.
662 890
663Some classes such as crossfire maps and objects can specify attachments 891Some classes such as deliantra maps and objects can specify attachments
664that 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.
665 893
666These calls expect any number of the following handler/hook descriptions: 894These calls expect any number of the following handler/hook descriptions:
667 895
668=over 4 896=over 4
792 1020
793 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
794 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
795 1023
796 } elsif (ref $type) { 1024 } elsif (ref $type) {
797 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
798 1026
799 } else { 1027 } else {
800 shift @arg; 1028 shift @arg;
801 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
802 } 1030 }
803 } 1031 }
804} 1032}
805 1033
806sub _object_attach { 1034sub _object_attach {
816 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
817 } 1045 }
818 1046
819 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
820 } else { 1048 } else {
821 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
822 } 1050 }
823 1051
824 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
825} 1053}
826 1054
866 "; 1094 ";
867 die if $@; 1095 die if $@;
868} 1096}
869 1097
870our $override; 1098our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1099our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 1100
873sub override { 1101sub override {
874 $override = 1; 1102 $override = 1;
875 @invoke_results = (); 1103 @INVOKE_RESULTS = (@_);
876} 1104}
877 1105
878sub do_invoke { 1106sub do_invoke {
879 my $event = shift; 1107 my $event = shift;
880 my $callbacks = shift; 1108 my $callbacks = shift;
881 1109
882 @invoke_results = (); 1110 @INVOKE_RESULTS = ();
883 1111
884 local $override; 1112 local $override;
885 1113
886 for (@$callbacks) { 1114 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
888 1116
889 if ($@) { 1117 if ($@) {
890 warn "$@";
891 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
892 override; 1119 override;
893 } 1120 }
894 1121
895 return 1 if $override; 1122 return 1 if $override;
896 } 1123 }
897 1124
898 0 1125 0
899} 1126}
900 1127
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1128=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1129
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1130=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1131
905Generate an object-specific event with the given arguments. 1132Generate an object-specific event with the given arguments.
906 1133
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1134This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 1135removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 1136results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1137
911=back 1138=back
912 1139
913=cut 1140=cut
914 1141
915############################################################################# 1142#############################################################################
916# object support 1143# object support
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#
1178sub _can_merge {
1179 my ($ob1, $ob2) = @_;
1180
1181 ++$SLOW_MERGES;#d#
1182
1183 # we do the slow way here
1184 return _object_equal $ob1, $ob2
1185}
917 1186
918sub reattach { 1187sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1188 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1189 my ($obj) = @_;
921 1190
1191 # no longer needed after getting rid of delete_package?
922 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
923 1193
924 my $registry = $obj->registry; 1194 my $registry = $obj->registry;
925 1195
926 @$registry = (); 1196 @$registry = ();
927 1197
932 for (@$attach) { 1202 for (@$attach) {
933 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
934 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
935 } 1205 }
936 } else { 1206 } else {
937 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
938 } 1208 }
939 } 1209 }
940} 1210}
941 1211
942cf::attachable->attach ( 1212cf::attachable->attach (
943 prio => -1000000, 1213 prio => -1000000,
944 on_instantiate => sub { 1214 on_instantiate => sub {
945 my ($obj, $data) = @_; 1215 my ($obj, $data) = @_;
946 1216
947 $data = from_json $data; 1217 $data = decode_json $data;
948 1218
949 for (@$data) { 1219 for (@$data) {
950 my ($name, $args) = @$_; 1220 my ($name, $args) = @$_;
951 1221
952 $obj->attach ($name, %{$args || {} }); 1222 $obj->attach ($name, %{$args || {} });
968sub object_freezer_save { 1238sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
970 1240
971 sync_job { 1241 sync_job {
972 if (length $$rdata) { 1242 if (length $$rdata) {
1243 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
975 1247
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1249 aio_chmod $fh, SAVE_MODE;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 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 }
980 close $fh; 1255 aio_close $fh;
981 1256
982 if (@$objs) { 1257 if (@$objs) {
983 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) {
984 chmod SAVE_MODE, $fh; 1259 aio_chmod $fh, SAVE_MODE;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
987 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 }
988 close $fh; 1266 aio_close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
990 } 1268 }
991 } else { 1269 } else {
992 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
993 } 1271 }
994 1272
995 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
996 } else { 1277 } else {
997 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
998 } 1279 }
999 } else { 1280 } else {
1000 aio_unlink $filename; 1281 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1002 } 1283 }
1003 } 1284 };
1004} 1285}
1005 1286
1006sub object_freezer_as_string { 1287sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1288 my ($rdata, $objs) = @_;
1008 1289
1020 or return; 1301 or return;
1021 1302
1022 unless (aio_stat "$filename.pst") { 1303 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1304 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1305 or return;
1306
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1307 my $st = eval { Coro::Storable::thaw $av };
1308 $av = $st->{objs};
1026 } 1309 }
1027 1310
1311 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1315
1030 return ($data, $av); 1316 ($data, $av)
1031} 1317}
1032 1318
1033=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1034 1320
1035=over 4 1321=over 4
1089 my ($name, $cb) = @_; 1375 my ($name, $cb) = @_;
1090 1376
1091 $EXTICMD{$name} = $cb; 1377 $EXTICMD{$name} = $cb;
1092} 1378}
1093 1379
1380use File::Glob ();
1381
1094cf::player->attach ( 1382cf::player->attach (
1095 on_command => sub { 1383 on_unknown_command => sub {
1096 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1097 1385
1098 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1099 or return; 1387 or return;
1100 1388
1108 my ($pl, $buf) = @_; 1396 my ($pl, $buf) = @_;
1109 1397
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1398 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1399
1112 if (ref $msg) { 1400 if (ref $msg) {
1401 my ($type, $reply, @payload) =
1402 "ARRAY" eq ref $msg
1403 ? @$msg
1404 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1405
1406 my @reply;
1407
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1408 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1409 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1410 }
1411
1412 $pl->ext_reply ($reply, @reply)
1413 if $reply;
1414
1118 } else { 1415 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1417 }
1121 1418
1122 cf::override; 1419 cf::override;
1123 }, 1420 },
1124); 1421);
1125 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
1126sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1127 cf::sync_job { 1439 cf::sync_job {
1128 my %todo; 1440 my %todo;
1129 1441
1130 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1131 next unless -r $path; 1443 next unless -r $path;
1149 1461
1150 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1151 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1152 1464
1153 $ext{source} = 1465 $ext{source} =
1154 "package $pkg; use strict; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1155 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1156 . $source 1468 . $source
1157 . "\n};\n1"; 1469 . "\n};\n1";
1158 1470
1159 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1160 } 1472 }
1161 1473
1474 my $pass = 0;
1162 my %done; 1475 my %done;
1163 while (%todo) { 1476 while (%todo) {
1164 my $progress; 1477 my $progress;
1165 1478
1479 ++$pass;
1480
1481 ext:
1166 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1167 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1168 goto skip 1484 next ext
1169 unless exists $done{$_}; 1485 unless exists $done{$_};
1170 } 1486 }
1171 1487
1172 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1173 1489
1174 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1175 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1176 : "$v->{base}: extension inactive.\n";
1177 1494
1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1178 if (exists $v->{meta}{mandatory}) { 1496 if exists $v->{meta}{mandatory};
1179 warn $msg; 1497
1180 warn "mandatory extension failed to load, exiting.\n"; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1181 exit 1; 1499 delete $todo{$k};
1182 } 1500 } else {
1183 1501 $done{$k} = delete $todo{$k};
1184 warn $msg; 1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1185 } 1507 }
1186
1187 $done{$k} = delete $todo{$k};
1188 push @EXTS, $v->{pkg};
1189 $progress = 1;
1190 } 1508 }
1191 1509
1192 skip: 1510 unless ($progress) {
1193 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1194 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 }
1195 } 1518 }
1196 }; 1519 };
1197} 1520}
1198 1521
1199############################################################################# 1522#############################################################################
1200 1523
1201=back 1524=back
1202 1525
1203=head2 CORE EXTENSIONS 1526=head2 CORE EXTENSIONS
1204 1527
1205Functions and methods that extend core crossfire objects. 1528Functions and methods that extend core deliantra objects.
1206 1529
1207=cut 1530=cut
1208 1531
1209package cf::player; 1532package cf::player;
1210 1533
1211use Coro::AIO; 1534use Coro::AIO;
1212 1535
1213=head3 cf::player 1536=head3 cf::player
1214 1537
1215=over 4 1538=over 4
1539
1540=item cf::player::num_playing
1541
1542Returns the official number of playing players, as per the Crossfire metaserver rules.
1543
1544=cut
1545
1546sub num_playing {
1547 scalar grep
1548 $_->ob->map
1549 && !$_->hidden
1550 && !$_->ob->flag (cf::FLAG_WIZ),
1551 cf::player::list
1552}
1216 1553
1217=item cf::player::find $login 1554=item cf::player::find $login
1218 1555
1219Returns the given player object, loading it if necessary (might block). 1556Returns the given player object, loading it if necessary (might block).
1220 1557
1239 1576
1240sub exists($) { 1577sub exists($) {
1241 my ($login) = @_; 1578 my ($login) = @_;
1242 1579
1243 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1244 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1245} 1582}
1246 1583
1247sub find($) { 1584sub find($) {
1248 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1249 my $login = $_[0]; 1586 my $login = $_[0];
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1593 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1594 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1595 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1596 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1597
1261 my $pl = load_pl path $login 1598 my $f = new_from_file cf::object::thawer path $login
1262 or return; 1599 or return;
1600
1601 my $pl = cf::player::load_pl $f
1602 or return;
1603
1604 local $cf::PLAYER_LOADING{$login} = $pl;
1605 $f->resolve_delayed_derefs;
1263 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1264 } 1607 }
1265 } 1608 }
1266} 1609}
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);
1267 1623
1268sub save($) { 1624sub save($) {
1269 my ($pl) = @_; 1625 my ($pl) = @_;
1270 1626
1271 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1276 return if $pl->{deny_save}; 1632 return if $pl->{deny_save};
1277 1633
1278 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1280 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];
1641
1281 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1282 Coro::cede; 1643 cf::cede_to_tick;
1283} 1644}
1284 1645
1285sub new($) { 1646sub new($) {
1286 my ($login) = @_; 1647 my ($login) = @_;
1287 1648
1293 $cf::PLAYER{$login} = $self; 1654 $cf::PLAYER{$login} = $self;
1294 1655
1295 $self 1656 $self
1296} 1657}
1297 1658
1659=item $player->send_msg ($channel, $msg, $color, [extra...])
1660
1661=cut
1662
1663sub send_msg {
1664 my $ns = shift->ns
1665 or return;
1666 $ns->send_msg (@_);
1667}
1668
1298=item $pl->quit_character 1669=item $pl->quit_character
1299 1670
1300Nukes the player without looking back. If logged in, the connection will 1671Nukes the player without looking back. If logged in, the connection will
1301be destroyed. May block for a long time. 1672be destroyed. May block for a long time.
1302 1673
1306 my ($pl) = @_; 1677 my ($pl) = @_;
1307 1678
1308 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1309 1680
1310 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1311 $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
1312 1683
1313 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1314 $pl->deactivate; 1685 $pl->deactivate;
1686
1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1315 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1316 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1317 1692
1318 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1319 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1320 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1355 or return []; 1730 or return [];
1356 1731
1357 my @logins; 1732 my @logins;
1358 1733
1359 for my $login (@$dirs) { 1734 for my $login (@$dirs) {
1735 my $path = path $login;
1736
1737 # a .pst is a dead give-away for a valid player
1738 # if no pst file found, open and chekc for blocked users
1739 if (aio_stat "$path.pst") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1740 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1741 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1742 $buf !~ /^password -------------$/m or next; # official not-valid tag
1743 }
1363 1744
1364 utf8::decode $login; 1745 utf8::decode $login;
1365 push @logins, $login; 1746 push @logins, $login;
1366 } 1747 }
1367 1748
1368 \@logins 1749 \@logins
1369} 1750}
1370 1751
1371=item $player->maps 1752=item $player->maps
1753
1754=item cf::player::maps $login
1372 1755
1373Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1374player. May block. 1757player. May block.
1375 1758
1376=cut 1759=cut
1394 } 1777 }
1395 1778
1396 \@paths 1779 \@paths
1397} 1780}
1398 1781
1399=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1782=item $protocol_xml = $player->expand_cfpod ($cfpod)
1400 1783
1401Expand crossfire pod fragments into protocol xml. 1784Expand deliantra pod fragments into protocol xml.
1402 1785
1403=cut
1404
1405sub expand_cfpod {
1406 ((my $self), (local $_)) = @_;
1407
1408 # escape & and <
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411
1412 # this is buggy, it needs to properly take care of nested <'s
1413
1414 1 while
1415 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/
1419 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1
1422 }ge
1423 # replace H<hint text>
1424 || s{H<([^\>]*)>}
1425 {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "")
1429 [$self->{hintmode}]
1430 }ge;
1431
1432 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g;
1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1449=item $player->ext_reply ($msgid, %msg) 1786=item $player->ext_reply ($msgid, @msg)
1450 1787
1451Sends an ext reply to the player. 1788Sends an ext reply to the player.
1452 1789
1453=cut 1790=cut
1454 1791
1455sub ext_reply($$%) { 1792sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1793 my ($self, $id, @msg) = @_;
1457 1794
1458 $msg{msgid} = $id; 1795 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1796}
1461 1797
1462=item $player->ext_event ($type, %msg) 1798=item $player->ext_msg ($type, @msg)
1463 1799
1464Sends an ext event to the client. 1800Sends an ext event to the client.
1465 1801
1466=cut 1802=cut
1467 1803
1468sub ext_event($$%) { 1804sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1805 my ($self, $type, @msg) = @_;
1470 1806
1471 $self->ns->ext_event ($type, %msg); 1807 $self->ns->ext_msg ($type, @msg);
1472} 1808}
1473 1809
1474=head3 cf::region 1810=head3 cf::region
1475 1811
1476=over 4 1812=over 4
1485 1821
1486=cut 1822=cut
1487 1823
1488sub find_by_path($) { 1824sub find_by_path($) {
1489 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1490 1828
1491 my ($match, $specificity); 1829 my ($match, $specificity);
1492 1830
1493 for my $region (list) { 1831 for my $region (list) {
1494 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1520our $MAX_RESET = 3600; 1858our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1859our $DEFAULT_RESET = 3000;
1522 1860
1523sub generate_random_map { 1861sub generate_random_map {
1524 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
1525 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1526 $self->_create_random_map ( 1867 $self->_create_random_map (
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1530 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1531 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1532 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1533 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1548 1889
1549sub register { 1890sub register {
1550 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1551 my $pkg = caller; 1892 my $pkg = caller;
1552 1893
1553 no strict;
1554 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1555 1895
1556 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1557} 1897}
1558 1898
1559# also paths starting with '/' 1899# also paths starting with '/'
1560$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1561 1901
1562sub thawer_merge { 1902sub thawer_merge {
1563 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1564 1904
1565 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
1570} 1910}
1571 1911
1572sub normalise { 1912sub normalise {
1573 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1574 1914
1575 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1576 1916
1577 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1578 1918
1579 # map plan: 1919 # map plan:
1580 # 1920 #
1595 $base =~ s{[^/]+/?$}{}; 1935 $base =~ s{[^/]+/?$}{};
1596 $path = "$base/$path"; 1936 $path = "$base/$path";
1597 } 1937 }
1598 1938
1599 for ($path) { 1939 for ($path) {
1600 redo if s{//}{/};
1601 redo if s{/\.?/}{/}; 1940 redo if s{/\.?/}{/};
1602 redo if s{/[^/]+/\.\./}{/}; 1941 redo if s{/[^/]+/\.\./}{/};
1603 } 1942 }
1604 1943
1605 $path 1944 $path
1619 $self->init; # pass $1 etc. 1958 $self->init; # pass $1 etc.
1620 return $self; 1959 return $self;
1621 } 1960 }
1622 } 1961 }
1623 1962
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1963 Carp::cluck "unable to resolve path '$path' (base '$base')";
1625 () 1964 ()
1626} 1965}
1627 1966
1628sub init { 1967sub init {
1629 my ($self) = @_; 1968 my ($self) = @_;
1651 1990
1652# the temporary/swap location 1991# the temporary/swap location
1653sub save_path { 1992sub save_path {
1654 my ($self) = @_; 1993 my ($self) = @_;
1655 1994
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1995 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 1996 "$TMPDIR/$path.map"
1658} 1997}
1659 1998
1660# the unique path, undef == no special unique path 1999# the unique path, undef == no special unique path
1661sub uniq_path { 2000sub uniq_path {
1662 my ($self) = @_; 2001 my ($self) = @_;
1663 2002
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2003 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 2004 "$UNIQUEDIR/$path"
1666}
1667
1668# and all this just because we cannot iterate over
1669# all maps in C++...
1670sub change_all_map_light {
1671 my ($change) = @_;
1672
1673 $_->change_map_light ($change)
1674 for grep $_->outdoor, values %cf::MAP;
1675} 2005}
1676 2006
1677sub decay_objects { 2007sub decay_objects {
1678 my ($self) = @_; 2008 my ($self) = @_;
1679 2009
1692 2022
1693sub load_header_from($) { 2023sub load_header_from($) {
1694 my ($self, $path) = @_; 2024 my ($self, $path) = @_;
1695 2025
1696 utf8::encode $path; 2026 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 2027 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 2028 or return;
2029
2030 $self->_load_header ($f)
2031 or return;
2032
2033 local $MAP_LOADING{$self->{path}} = $self;
2034 $f->resolve_delayed_derefs;
1702 2035
1703 $self->{load_path} = $path; 2036 $self->{load_path} = $path;
1704 2037
1705 1 2038 1
1706} 2039}
1758 2091
1759sub find; 2092sub find;
1760sub find { 2093sub find {
1761 my ($path, $origin) = @_; 2094 my ($path, $origin) = @_;
1762 2095
2096 cf::cede_to_tick;
2097
1763 $path = normalise $path, $origin && $origin->path; 2098 $path = normalise $path, $origin && $origin->path;
1764 2099
2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 2101 my $guard2 = cf::lock_acquire "map_find:$path";
1766 2102
1767 $cf::MAP{$path} || do { 2103 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path";
1769 my $map = new_from_path cf::map $path 2104 my $map = new_from_path cf::map $path
1770 or return; 2105 or return;
1771 2106
1772 $map->{last_save} = $cf::RUNTIME; 2107 $map->{last_save} = $cf::RUNTIME;
1773 2108
1775 or return; 2110 or return;
1776 2111
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2112 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2113 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2114 #$cf::WAIT_FOR_TICK->wait;
2115 undef $guard2;
2116 undef $guard1;
1780 $map->reset; 2117 $map->reset;
1781 undef $guard;
1782 return find $path; 2118 return find $path;
1783 } 2119 }
1784 2120
1785 $cf::MAP{$path} = $map 2121 $cf::MAP{$path} = $map
1786 } 2122 }
1787} 2123}
1788 2124
1789sub pre_load { } 2125sub pre_load { }
1790sub post_load { } 2126#sub post_load { } # XS
1791 2127
1792sub load { 2128sub load {
1793 my ($self) = @_; 2129 my ($self) = @_;
1794 2130
1795 local $self->{deny_reset} = 1; # loading can take a long time 2131 local $self->{deny_reset} = 1; # loading can take a long time
1796 2132
1797 my $path = $self->{path}; 2133 my $path = $self->{path};
1798 2134
1799 { 2135 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2136 my $guard = cf::lock_acquire "map_data:$path";
1801 2137
2138 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2139 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2140
1804 $self->in_memory (cf::MAP_LOADING); 2141 $self->in_memory (cf::MAP_LOADING);
1805 2142
1806 $self->alloc; 2143 $self->alloc;
1807 2144
1808 $self->pre_load; 2145 $self->pre_load;
1809 Coro::cede; 2146 cf::cede_to_tick;
1810 2147
2148 my $f = new_from_file cf::object::thawer $self->{load_path};
2149 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2150 $self->_load_objects ($f)
1812 or return; 2151 or return;
1813 2152
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2153 $self->post_load_original
1815 if delete $self->{load_original}; 2154 if delete $self->{load_original};
1816 2155
1817 if (my $uniq = $self->uniq_path) { 2156 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2157 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2158 unless (aio_stat $uniq) {
2159 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2160 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2161 $self->_load_objects ($f);
2162 $f->resolve_delayed_derefs;
2163 }
1822 } 2164 }
1823 } 2165 }
1824 2166
1825 Coro::cede; 2167 $f->resolve_delayed_derefs;
2168
2169 cf::cede_to_tick;
1826 # now do the right thing for maps 2170 # now do the right thing for maps
1827 $self->link_multipart_objects; 2171 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2172 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2173 unless $self->difficulty;
1830 Coro::cede; 2174 cf::cede_to_tick;
1831 2175
1832 unless ($self->{deny_activate}) { 2176 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2177 $self->decay_objects;
1834 $self->fix_auto_apply; 2178 $self->fix_auto_apply;
1835 $self->update_buttons; 2179 $self->update_buttons;
1836 Coro::cede; 2180 cf::cede_to_tick;
1837 $self->set_darkness_map;
1838 Coro::cede;
1839 $self->activate; 2181 $self->activate;
1840 } 2182 }
1841 2183
2184 $self->{last_save} = $cf::RUNTIME;
2185 $self->last_access ($cf::RUNTIME);
2186
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2187 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2188 }
1844 2189
1845 $self->post_load; 2190 $self->post_load;
1846}
1847 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
1848sub customise_for { 2198sub customise_for {
1849 my ($self, $ob) = @_; 2199 my ($self, $ob) = @_;
1850 2200
1851 return find "~" . $ob->name . "/" . $self->{path} 2201 return find "~" . $ob->name . "/" . $self->{path}
1852 if $self->per_player; 2202 if $self->per_player;
1856 2206
1857 $self 2207 $self
1858} 2208}
1859 2209
1860# find and load all maps in the 3x3 area around a map 2210# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2211sub load_neighbours {
1862 my ($map) = @_; 2212 my ($map) = @_;
1863 2213
1864 my @diag; # diagonal neighbours 2214 my @neigh; # diagonal neighbours
1865 2215
1866 for (0 .. 3) { 2216 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2217 my $neigh = $map->tile_path ($_)
1868 or next; 2218 or next;
1869 $neigh = find $neigh, $map 2219 $neigh = find $neigh, $map
1870 or next; 2220 or next;
1871 $neigh->load; 2221 $neigh->load;
1872 2222
2223 # now find the diagonal neighbours
2224 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2225 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2226 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2227 }
1876 2228
1877 for (@diag) { 2229 for (grep defined $_->[0], @neigh) {
2230 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2231 my $neigh = find $path, $origin
1879 or next; 2232 or next;
1880 $neigh->load; 2233 $neigh->load;
1881 } 2234 }
1882} 2235}
1883 2236
1884sub find_sync { 2237sub find_sync {
1885 my ($path, $origin) = @_; 2238 my ($path, $origin) = @_;
1886 2239
1887 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
1888} 2244}
1889 2245
1890sub do_load_sync { 2246sub do_load_sync {
1891 my ($map) = @_; 2247 my ($map) = @_;
1892 2248
1893 cf::sync_job { $map->load }; 2249 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2250 if $Coro::current == $Coro::main;
2251
2252 $map->load;
1894} 2253}
1895 2254
1896our %MAP_PREFETCH; 2255our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2256our $MAP_PREFETCHER = undef;
1898 2257
1899sub find_async { 2258sub find_async {
1900 my ($path, $origin) = @_; 2259 my ($path, $origin, $load) = @_;
1901 2260
1902 $path = normalise $path, $origin && $origin->{path}; 2261 $path = normalise $path, $origin && $origin->{path};
1903 2262
1904 if (my $map = $cf::MAP{$path}) { 2263 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2264 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2265 }
1907 2266
1908 undef $MAP_PREFETCH{$path}; 2267 $MAP_PREFETCH{$path} |= $load;
2268
1909 $MAP_PREFETCHER ||= cf::async { 2269 $MAP_PREFETCHER ||= cf::async {
2270 $Coro::current->{desc} = "map prefetcher";
2271
1910 while (%MAP_PREFETCH) { 2272 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2273 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2274 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2275 $map->load if $v;
2276 }
1915 2277
1916 delete $MAP_PREFETCH{$path}; 2278 delete $MAP_PREFETCH{$k};
1917 } 2279 }
1918 } 2280 }
1919 undef $MAP_PREFETCHER; 2281 undef $MAP_PREFETCHER;
1920 }; 2282 };
1921 $MAP_PREFETCHER->prio (6); 2283 $MAP_PREFETCHER->prio (6);
1922 2284
1923 () 2285 ()
1924} 2286}
1925 2287
2288# common code, used by both ->save and ->swapout
1926sub save { 2289sub _save {
1927 my ($self) = @_; 2290 my ($self) = @_;
1928
1929 my $lock = cf::lock_acquire "map_data:" . $self->path;
1930 2291
1931 $self->{last_save} = $cf::RUNTIME; 2292 $self->{last_save} = $cf::RUNTIME;
1932 2293
1933 return unless $self->dirty; 2294 return unless $self->dirty;
1934 2295
1940 return if $self->{deny_save}; 2301 return if $self->{deny_save};
1941 2302
1942 local $self->{last_access} = $self->last_access;#d# 2303 local $self->{last_access} = $self->last_access;#d#
1943 2304
1944 cf::async { 2305 cf::async {
2306 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2307 $_->contr->save for $self->players;
1946 }; 2308 };
2309
2310 cf::get_slot 0.02;
1947 2311
1948 if ($uniq) { 2312 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2313 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2314 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2315 } else {
1952 $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);
1953 } 2317 }
1954} 2318}
1955 2319
2320sub save {
2321 my ($self) = @_;
2322
2323 my $lock = cf::lock_acquire "map_data:$self->{path}";
2324
2325 $self->_save;
2326}
2327
1956sub swap_out { 2328sub swap_out {
1957 my ($self) = @_; 2329 my ($self) = @_;
1958 2330
1959 # save first because save cedes
1960 $self->save;
1961
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2331 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2332
2333 return if $self->in_memory != cf::MAP_ACTIVE;
2334 return if $self->{deny_save};
1964 return if $self->players; 2335 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save};
1967 2336
2337 # first deactivate the map and "unlink" it from the core
2338 $self->deactivate;
2339 $_->clear_links_to ($self) for values %cf::MAP;
2340 $self->in_memory (cf::MAP_SWAPPED);
2341
2342 # then atomically save
2343 $self->_save;
2344
2345 # then free the map
1968 $self->clear; 2346 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2347}
1971 2348
1972sub reset_at { 2349sub reset_at {
1973 my ($self) = @_; 2350 my ($self) = @_;
1974 2351
1992 2369
1993 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2370 my $lock = cf::lock_acquire "map_data:$self->{path}";
1994 2371
1995 return if $self->players; 2372 return if $self->players;
1996 2373
1997 warn "resetting map ", $self->path; 2374 cf::trace "resetting map ", $self->path, "\n";
1998 2375
1999 $self->in_memory (cf::MAP_SWAPPED); 2376 $self->in_memory (cf::MAP_SWAPPED);
2000 2377
2001 # need to save uniques path 2378 # need to save uniques path
2002 unless ($self->{deny_save}) { 2379 unless ($self->{deny_save}) {
2006 if $uniq; 2383 if $uniq;
2007 } 2384 }
2008 2385
2009 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2010 2387
2388 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2390 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2391
2015 $self->unlink_save; 2392 $self->unlink_save;
2016 $self->destroy; 2393 $self->destroy;
2017} 2394}
2018 2395
2019my $nuke_counter = "aaaa"; 2396my $nuke_counter = "aaaa";
2020 2397
2021sub nuke { 2398sub nuke {
2022 my ($self) = @_; 2399 my ($self) = @_;
2023 2400
2401 {
2402 my $lock = cf::lock_acquire "map_data:$self->{path}";
2403
2024 delete $cf::MAP{$self->path}; 2404 delete $cf::MAP{$self->path};
2025 2405
2026 $self->unlink_save; 2406 $self->unlink_save;
2027 2407
2028 bless $self, "cf::map"; 2408 bless $self, "cf::map::wrap";
2029 delete $self->{deny_reset}; 2409 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2410 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2411 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2412 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2413
2034 $cf::MAP{$self->path} = $self; 2414 $cf::MAP{$self->path} = $self;
2415 }
2035 2416
2036 $self->reset; # polite request, might not happen 2417 $self->reset; # polite request, might not happen
2037} 2418}
2038 2419
2039=item $maps = cf::map::tmp_maps 2420=item $maps = cf::map::tmp_maps
2081 2462
2082sub unique_maps() { 2463sub unique_maps() {
2083 [ 2464 [
2084 map { 2465 map {
2085 utf8::decode $_; 2466 utf8::decode $_;
2086 /\.map$/ 2467 s/\.map$//; # TODO future compatibility hack
2468 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2469 ? ()
2087 ? normalise $_ 2470 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2471 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2472 ]
2091} 2473}
2092 2474
2093package 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}
2094 2506
2095=back 2507=back
2096 2508
2097=head3 cf::object 2509=head3 cf::object
2098 2510
2102 2514
2103=over 4 2515=over 4
2104 2516
2105=item $ob->inv_recursive 2517=item $ob->inv_recursive
2106 2518
2107Returns 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.
2108 2521
2109=cut 2522=cut
2110 2523
2111sub inv_recursive_; 2524sub inv_recursive_;
2112sub inv_recursive_ { 2525sub inv_recursive_ {
2115 2528
2116sub inv_recursive { 2529sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2530 inv_recursive_ inv $_[0]
2118} 2531}
2119 2532
2533=item $ref = $ob->ref
2534
2535Creates and returns a persistent reference to an object that can be stored as a string.
2536
2537=item $ob = cf::object::deref ($refstring)
2538
2539returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2540even if the object actually exists. May block.
2541
2542=cut
2543
2544sub deref {
2545 my ($ref) = @_;
2546
2547 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2548 my ($uuid, $name) = ($1, $2);
2549 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2550 or return;
2551 $pl->ob->uuid eq $uuid
2552 or return;
2553
2554 $pl->ob
2555 } else {
2556 warn "$ref: cannot resolve object reference\n";
2557 undef
2558 }
2559}
2560
2120package cf; 2561package cf;
2121 2562
2122=back 2563=back
2123 2564
2124=head3 cf::object::player 2565=head3 cf::object::player
2130Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2571Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2131can 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
2132dialogue with the given NPC character. 2573dialogue with the given NPC character.
2133 2574
2134=cut 2575=cut
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};
2135 2590
2136# rough implementation of a future "reply" method that works 2591# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2592# with dialog boxes.
2138#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
2139sub cf::object::player::reply($$$;$) { 2594sub cf::object::player::reply($$$;$) {
2146 2601
2147 } else { 2602 } else {
2148 my $pl = $self->contr; 2603 my $pl = $self->contr;
2149 2604
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2605 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2606 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2607 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2608
2159 } else { 2609 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2610 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2611 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2612 }
2163 } 2613 }
2614}
2615
2616=item $object->send_msg ($channel, $msg, $color, [extra...])
2617
2618=cut
2619
2620sub cf::object::send_msg {
2621 my $pl = shift->contr
2622 or return;
2623 $pl->send_msg (@_);
2164} 2624}
2165 2625
2166=item $player_object->may ("access") 2626=item $player_object->may ("access")
2167 2627
2168Returns wether the given player is authorized to access resource "access" 2628Returns wether the given player is authorized to access resource "access"
2181 2641
2182=item $player_object->enter_link 2642=item $player_object->enter_link
2183 2643
2184Freezes 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}>).
2185 2645
2186The 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.
2187I<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.
2188 2650
2189Will never block. 2651Will never block.
2190 2652
2191=item $player_object->leave_link ($map, $x, $y) 2653=item $player_object->leave_link ($map, $x, $y)
2192 2654
2212sub cf::object::player::enter_link { 2674sub cf::object::player::enter_link {
2213 my ($self) = @_; 2675 my ($self) = @_;
2214 2676
2215 $self->deactivate_recursive; 2677 $self->deactivate_recursive;
2216 2678
2679 ++$self->{_link_recursion};
2680
2217 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2681 return if UNIVERSAL::isa $self->map, "ext::map_link";
2218 2682
2219 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2683 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2220 if $self->map && $self->map->{path} ne "{link}"; 2684 if $self->map && $self->map->{path} ne "{link}";
2221 2685
2222 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2686 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2223} 2687}
2224 2688
2225sub cf::object::player::leave_link { 2689sub cf::object::player::leave_link {
2226 my ($self, $map, $x, $y) = @_; 2690 my ($self, $map, $x, $y) = @_;
2227 2691
2244 ($x, $y) = (-1, -1) 2708 ($x, $y) = (-1, -1)
2245 unless (defined $x) && (defined $y); 2709 unless (defined $x) && (defined $y);
2246 2710
2247 # use -1 or undef as default coordinates, not 0, 0 2711 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2712 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2713 if $x <= 0 && $y <= 0;
2250 2714
2251 $map->load; 2715 $map->load;
2252 $map->load_diag; 2716 $map->load_neighbours;
2253 2717
2254 return unless $self->contr->active; 2718 return unless $self->contr->active;
2255 $self->activate_recursive;
2256 2719
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2720 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2721 if ($self->enter_map ($map, $x, $y)) {
2259} 2722 # entering was successful
2723 delete $self->{_link_recursion};
2724 # only activate afterwards, to support waiting in hooks
2725 $self->activate_recursive;
2726 }
2260 2727
2728}
2729
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2730=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2262 2731
2263Moves 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
2264her, loading and preparing them map, calling the provided $check callback 2733her, loading and preparing them map, calling the provided $check callback
2265that 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
2266the new (success) or old (failed) map position. 2735the new (success) or old (failed) map position. In either case, $done will
2736be called at the end of this process.
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 >>.
2267 2740
2268=cut 2741=cut
2269 2742
2270our $GOTOGEN; 2743our $GOTOGEN;
2271 2744
2272sub cf::object::player::goto { 2745sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2746 my ($self, $path, $x, $y, $check, $done) = @_;
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 }
2274 2753
2275 # 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
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2755 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2756
2278 $self->enter_link; 2757 $self->enter_link;
2279 2758
2280 (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
2281 my $map = eval { 2781 my $map = eval {
2282 my $map = cf::map::find $path; 2782 my $map = defined $path ? cf::map::find $path : undef;
2283 2783
2284 if ($map) { 2784 if ($map) {
2285 $map = $map->customise_for ($self); 2785 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map; 2786 $map = $check->($map, $x, $y, $self) if $check && $map;
2287 } else { 2787 } else {
2288 $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);
2289 } 2789 }
2290 2790
2291 $map 2791 $map
2292 }; 2792 };
2293 2793
2298 2798
2299 if ($gen == $self->{_goto_generation}) { 2799 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2800 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2801 $self->leave_link ($map, $x, $y);
2302 } 2802 }
2803
2804 $done->($self) if $done;
2303 })->prio (1); 2805 })->prio (1);
2304} 2806}
2305 2807
2306=item $player_object->enter_exit ($exit_object) 2808=item $player_object->enter_exit ($exit_object)
2307 2809
2327} 2829}
2328 2830
2329sub prepare_random_map { 2831sub prepare_random_map {
2330 my ($exit) = @_; 2832 my ($exit) = @_;
2331 2833
2332 my $guard = cf::lock_acquire "exit_prepare:$exit";
2333
2334 # all this does is basically replace the /! path by 2834 # all this does is basically replace the /! path by
2335 # a new random map path (?random/...) with a seed 2835 # a new random map path (?random/...) with a seed
2336 # that depends on the exit object 2836 # that depends on the exit object
2337 2837
2338 my $rmp = parse_random_map_params $exit->msg; 2838 my $rmp = parse_random_map_params $exit->msg;
2340 if ($exit->map) { 2840 if ($exit->map) {
2341 $rmp->{region} = $exit->region->name; 2841 $rmp->{region} = $exit->region->name;
2342 $rmp->{origin_map} = $exit->map->path; 2842 $rmp->{origin_map} = $exit->map->path;
2343 $rmp->{origin_x} = $exit->x; 2843 $rmp->{origin_x} = $exit->x;
2344 $rmp->{origin_y} = $exit->y; 2844 $rmp->{origin_y} = $exit->y;
2845
2846 $exit->map->touch;
2345 } 2847 }
2346 2848
2347 $rmp->{random_seed} ||= $exit->random_seed; 2849 $rmp->{random_seed} ||= $exit->random_seed;
2348 2850
2349 my $data = cf::to_json $rmp; 2851 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2350 my $md5 = Digest::MD5::md5_hex $data; 2852 my $md5 = Digest::MD5::md5_hex $data;
2351 my $meta = "$RANDOMDIR/$md5.meta"; 2853 my $meta = "$RANDOMDIR/$md5.meta";
2352 2854
2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2855 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2354 aio_write $fh, 0, (length $data), $data, 0; 2856 aio_write $fh, 0, (length $data), $data, 0;
2355 undef $fh; 2857 undef $fh;
2356 aio_rename "$meta~", $meta; 2858 aio_rename "$meta~", $meta;
2357 2859
2860 my $slaying = "?random/$md5";
2861
2862 if ($exit->valid) {
2358 $exit->slaying ("?random/$md5"); 2863 $exit->slaying ("?random/$md5");
2359 $exit->msg (undef); 2864 $exit->msg (undef);
2865 }
2360 } 2866 }
2361} 2867}
2362 2868
2363sub cf::object::player::enter_exit { 2869sub cf::object::player::enter_exit {
2364 my ($self, $exit) = @_; 2870 my ($self, $exit) = @_;
2365 2871
2366 return unless $self->type == cf::PLAYER; 2872 return unless $self->type == cf::PLAYER;
2367 2873
2368 if ($exit->slaying eq "/!") {
2369 #TODO: this should de-fi-ni-te-ly not be a sync-job
2370 # the problem is that $exit might not survive long enough
2371 # so it needs to be done right now, right here
2372 cf::sync_job { prepare_random_map $exit };
2373 }
2374
2375 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2376 my $hp = $exit->stats->hp;
2377 my $sp = $exit->stats->sp;
2378
2379 $self->enter_link; 2874 $self->enter_link;
2380 2875
2381 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED);
2384
2385 (async { 2876 (async {
2386 $self->deactivate_recursive; # just to be sure 2877 $Coro::current->{desc} = "enter_exit";
2878
2387 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
2388 $self->goto ($slaying, $hp, $sp); 2894 $self->goto ($map, $x, $y);
2389 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
2390 1; 2900 1
2391 }) { 2901 }) {
2392 $self->message ("Something went wrong deep within the crossfire server. " 2902 $self->message ("Something went wrong deep within the deliantra server. "
2393 . "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. "
2394 . "Please report this to the dungeon master!", 2904 . "Please report this to the dungeon master!",
2395 cf::NDI_UNIQUE | cf::NDI_RED); 2905 cf::NDI_UNIQUE | cf::NDI_RED);
2396 2906
2397 warn "ERROR in enter_exit: $@"; 2907 error "ERROR in enter_exit: $@";
2398 $self->leave_link; 2908 $self->leave_link;
2399 } 2909 }
2400 })->prio (1); 2910 })->prio (1);
2401} 2911}
2402 2912
2416 2926
2417 utf8::encode $text; 2927 utf8::encode $text;
2418 $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);
2419} 2929}
2420 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);
2954}
2955
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2956=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2957
2423Send 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
2424client if neccessary. C<$type> should be a string identifying the type of 2959client if neccessary. C<$type> should be a string identifying the type of
2425the 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
2426the message unless the client supports the msg packet. 2961the message unless the client supports the msg packet.
2427 2962
2428=cut 2963=cut
2429 2964
2965# non-persistent channels (usually the info channel)
2966our %CHANNEL = (
2967 "c/motd" => {
2968 id => "infobox",
2969 title => "MOTD",
2970 reply => undef,
2971 tooltip => "The message of the day",
2972 },
2973 "c/identify" => {
2974 id => "infobox",
2975 title => "Identify",
2976 reply => undef,
2977 tooltip => "Items recently identified",
2978 },
2979 "c/examine" => {
2980 id => "infobox",
2981 title => "Examine",
2982 reply => undef,
2983 tooltip => "Signs and other items you examined",
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,
3077);
3078
2430sub cf::client::send_msg { 3079sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 3080 my ($self, $channel, $msg, $color, @extra) = @_;
2432 3081
2433 $msg = $self->pl->expand_cfpod ($msg); 3082 $msg = $self->pl->expand_cfpod ($msg)
3083 unless $color & cf::NDI_VERBATIM;
3084
3085 $color &= cf::NDI_CLIENT_MASK; # just in case...
3086
3087 # check predefined channels, for the benefit of C
3088 if ($CHANNEL{$channel}) {
3089 $channel = $CHANNEL{$channel};
3090
3091 $self->ext_msg (channel_info => $channel);
3092 $channel = $channel->{id};
3093
3094 } elsif (ref $channel) {
3095 # send meta info to client, if not yet sent
3096 unless (exists $self->{channel}{$channel->{id}}) {
3097 $self->{channel}{$channel->{id}} = $channel;
3098 $self->ext_msg (channel_info => $channel);
3099 }
3100
3101 $channel = $channel->{id};
3102 }
2434 3103
2435 return unless @extra || length $msg; 3104 return unless @extra || length $msg;
2436 3105
2437 if ($self->can_msg) { 3106 # default colour, mask it out
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 3107 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2439 } else { 3108 if $color & cf::NDI_DEF;
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449 3109
2450 if ($color >= 0) { 3110 my $pkt = "msg "
2451 if (0 && $msg =~ /\[/) { 3111 . $self->{json_coder}->encode (
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 3112 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2453 } else { 3113 );
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg")
2456 }
2457 }
2458 }
2459}
2460 3114
3115 $self->send_big_packet ($pkt);
3116}
3117
2461=item $client->ext_event ($type, %msg) 3118=item $client->ext_msg ($type, @msg)
2462 3119
2463Sends an ext event to the client. 3120Sends an ext event to the client.
2464 3121
2465=cut 3122=cut
2466 3123
2467sub cf::client::ext_event($$%) { 3124sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 3125 my ($self, $type, @msg) = @_;
2469 3126
2470 return unless $self->extcmd; 3127 if ($self->extcmd == 2) {
2471 3128 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3129 } elsif ($self->extcmd == 1) { # TODO: remove
2472 $msg{msgtype} = "event_$type"; 3130 push @msg, msgtype => "event_$type";
2473 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3132 }
3133}
3134
3135=item $client->ext_reply ($msgid, @msg)
3136
3137Sends an ext reply to the client.
3138
3139=cut
3140
3141sub cf::client::ext_reply($$@) {
3142 my ($self, $id, @msg) = @_;
3143
3144 if ($self->extcmd == 2) {
3145 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3146 } elsif ($self->extcmd == 1) {
3147 #TODO: version 1, remove
3148 unshift @msg, msgtype => "reply", msgid => $id;
3149 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3150 }
2474} 3151}
2475 3152
2476=item $success = $client->query ($flags, "text", \&cb) 3153=item $success = $client->query ($flags, "text", \&cb)
2477 3154
2478Queues a query to the client, calling the given callback with 3155Queues a query to the client, calling the given callback with
2533 my ($ns, $buf) = @_; 3210 my ($ns, $buf) = @_;
2534 3211
2535 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3212 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2536 3213
2537 if (ref $msg) { 3214 if (ref $msg) {
3215 my ($type, $reply, @payload) =
3216 "ARRAY" eq ref $msg
3217 ? @$msg
3218 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3219
3220 my @reply;
3221
2538 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3222 if (my $cb = $EXTICMD{$type}) {
2539 if (my %reply = $cb->($ns, $msg)) { 3223 @reply = $cb->($ns, @payload);
2540 $reply{msgid} = $msg->{msgid};
2541 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2542 }
2543 } 3224 }
3225
3226 $ns->ext_reply ($reply, @reply)
3227 if $reply;
3228
2544 } else { 3229 } else {
2545 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";
2546 } 3231 }
2547 3232
2548 cf::override; 3233 cf::override;
2549 }, 3234 },
2550); 3235);
2570 3255
2571 $coro 3256 $coro
2572} 3257}
2573 3258
2574cf::client->attach ( 3259cf::client->attach (
2575 on_destroy => sub { 3260 on_client_destroy => sub {
2576 my ($ns) = @_; 3261 my ($ns) = @_;
2577 3262
2578 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3263 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2579 }, 3264 },
2580); 3265);
2595our $safe = new Safe "safe"; 3280our $safe = new Safe "safe";
2596our $safe_hole = new Safe::Hole; 3281our $safe_hole = new Safe::Hole;
2597 3282
2598$SIG{FPE} = 'IGNORE'; 3283$SIG{FPE} = 'IGNORE';
2599 3284
2600$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3285$safe->permit_only (Opcode::opset qw(
3286 :base_core :base_mem :base_orig :base_math :base_loop
3287 grepstart grepwhile mapstart mapwhile
3288 sort time
3289));
2601 3290
2602# here we export the classes and methods available to script code 3291# here we export the classes and methods available to script code
2603 3292
2604=pod 3293=pod
2605 3294
2606The following functions and methods are available within a safe environment: 3295The following functions and methods are available within a safe environment:
2607 3296
2608 cf::object 3297 cf::object
2609 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
2610 insert remove 3299 insert remove name archname title slaying race decrease split
3300 value
2611 3301
2612 cf::object::player 3302 cf::object::player
2613 player 3303 player
2614 3304
2615 cf::player 3305 cf::player
2620 3310
2621=cut 3311=cut
2622 3312
2623for ( 3313for (
2624 ["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
2625 insert remove)], 3315 insert remove inv nrof name archname title slaying race
3316 decrease split destroy change_exp value msg lore send_msg)],
2626 ["cf::object::player" => qw(player)], 3317 ["cf::object::player" => qw(player)],
2627 ["cf::player" => qw(peaceful)], 3318 ["cf::player" => qw(peaceful send_msg)],
2628 ["cf::map" => qw(trigger)], 3319 ["cf::map" => qw(trigger)],
2629) { 3320) {
2630 no strict 'refs';
2631 my ($pkg, @funs) = @$_; 3321 my ($pkg, @funs) = @$_;
2632 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3322 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2633 for @funs; 3323 for @funs;
2634} 3324}
2635 3325
2650 3340
2651 my $qcode = $code; 3341 my $qcode = $code;
2652 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3342 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2653 $qcode =~ s/\n/\\n/g; 3343 $qcode =~ s/\n/\\n/g;
2654 3344
3345 %vars = (_dummy => 0) unless %vars;
3346
3347 my @res;
2655 local $_; 3348 local $_;
2656 local @safe::cf::_safe_eval_args = values %vars;
2657 3349
2658 my $eval = 3350 my $eval =
2659 "do {\n" 3351 "do {\n"
2660 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3352 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2661 . "#line 0 \"{$qcode}\"\n" 3353 . "#line 0 \"{$qcode}\"\n"
2662 . $code 3354 . $code
2663 . "\n}" 3355 . "\n}"
2664 ; 3356 ;
2665 3357
3358 if ($CFG{safe_eval}) {
2666 sub_generation_inc; 3359 sub_generation_inc;
3360 local @safe::cf::_safe_eval_args = values %vars;
2667 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3361 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2668 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 }
2669 3367
2670 if ($@) { 3368 if ($@) {
2671 warn "$@"; 3369 warn "$@",
2672 warn "while executing safe code '$code'\n"; 3370 "while executing safe code '$code'\n",
2673 warn "with arguments " . (join " ", %vars) . "\n"; 3371 "with arguments " . (join " ", %vars) . "\n";
2674 } 3372 }
2675 3373
2676 wantarray ? @res : $res[0] 3374 wantarray ? @res : $res[0]
2677} 3375}
2678 3376
2692=cut 3390=cut
2693 3391
2694sub register_script_function { 3392sub register_script_function {
2695 my ($fun, $cb) = @_; 3393 my ($fun, $cb) = @_;
2696 3394
2697 no strict 'refs'; 3395 $fun = "safe::$fun" if $CFG{safe_eval};
2698 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3396 *$fun = $safe_hole->wrap ($cb);
2699} 3397}
2700 3398
2701=back 3399=back
2702 3400
2703=cut 3401=cut
2706# the server's init and main functions 3404# the server's init and main functions
2707 3405
2708sub load_facedata($) { 3406sub load_facedata($) {
2709 my ($path) = @_; 3407 my ($path) = @_;
2710 3408
3409 # HACK to clear player env face cache, we need some signal framework
3410 # for this (global event?)
3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3412
3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3414
2711 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
2712 3416
2713 my $facedata;
2714 0 < aio_load $path, $facedata 3417 0 < aio_load $path, my $facedata
2715 or die "$path: $!"; 3418 or die "$path: $!";
2716 3419
2717 $facedata = Coro::Storable::thaw $facedata; 3420 $facedata = Coro::Storable::thaw $facedata;
2718 3421
2719 $facedata->{version} == 2 3422 $facedata->{version} == 2
2720 or cf::cleanup "$path: version mismatch, cannot proceed."; 3423 or cf::cleanup "$path: version mismatch, cannot proceed.";
2721 3424
3425 # patch in the exptable
3426 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3427 $facedata->{resource}{"res/exp_table"} = {
3428 type => FT_RSRC,
3429 data => $exp_table,
3430 hash => (Digest::MD5::md5 $exp_table),
3431 };
3432 cf::cede_to_tick;
3433
2722 { 3434 {
2723 my $faces = $facedata->{faceinfo}; 3435 my $faces = $facedata->{faceinfo};
2724 3436
2725 while (my ($face, $info) = each %$faces) { 3437 while (my ($face, $info) = each %$faces) {
2726 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3438 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3439
2727 cf::face::set_visibility $idx, $info->{visibility}; 3440 cf::face::set_visibility $idx, $info->{visibility};
2728 cf::face::set_magicmap $idx, $info->{magicmap}; 3441 cf::face::set_magicmap $idx, $info->{magicmap};
2729 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3442 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2730 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3443 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2731 3444
2732 cf::cede_to_tick; 3445 cf::cede_to_tick;
2733 } 3446 }
2734 3447
2735 while (my ($face, $info) = each %$faces) { 3448 while (my ($face, $info) = each %$faces) {
2736 next unless $info->{smooth}; 3449 next unless $info->{smooth};
3450
2737 my $idx = cf::face::find $face 3451 my $idx = cf::face::find $face
2738 or next; 3452 or next;
3453
2739 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
2740 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
2741 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2742 } else { 3457 } else {
2743 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
2744 } 3459 }
2745 3460
2746 cf::cede_to_tick; 3461 cf::cede_to_tick;
2747 } 3462 }
2748 } 3463 }
2757 3472
2758 cf::anim::invalidate_all; # d'oh 3473 cf::anim::invalidate_all; # d'oh
2759 } 3474 }
2760 3475
2761 { 3476 {
2762 # TODO: for gcfclient pleasure, we should give resources
2763 # that gcfclient doesn't grok a >10000 face index.
2764 my $res = $facedata->{resource}; 3477 my $res = $facedata->{resource};
2765 my $enc = JSON::XS->new->utf8->canonical;
2766 3478
2767 while (my ($name, $info) = each %$res) { 3479 while (my ($name, $info) = each %$res) {
2768 my $meta = $enc->encode ({ 3480 if (defined $info->{type}) {
2769 name => $name,
2770 type => $info->{type},
2771 copyright => $info->{copyright}, #TODO#
2772 });
2773 my $data = pack "(w/a*)*", $meta, $info->{data};
2774 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2775
2776 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3482
3483 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2777 cf::face::set_type $idx, 1; 3484 cf::face::set_type $idx, $info->{type};
2778 cf::face::set_data $idx, 0, $data, $chk; 3485 } else {
3486 $RESOURCE{$name} = $info; # unused
3487 }
2779 3488
2780 cf::cede_to_tick; 3489 cf::cede_to_tick;
2781 } 3490 }
2782 } 3491 }
2783 3492
3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3494
2784 1 3495 1
2785} 3496}
2786 3497
3498register_exticmd fx_want => sub {
3499 my ($ns, $want) = @_;
3500
3501 while (my ($k, $v) = each %$want) {
3502 $ns->fx_want ($k, $v);
3503 }
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}
3515
2787sub reload_regions { 3516sub reload_regions {
3517 # HACK to clear player env face cache, we need some signal framework
3518 # for this (global event?)
3519 %ext::player_env::MUSIC_FACE_CACHE = ();
3520
2788 load_resource_file "$MAPDIR/regions" 3521 load_resource_file "$MAPDIR/regions"
2789 or die "unable to load regions file\n"; 3522 or die "unable to load regions file\n";
2790 3523
2791 for (cf::region::list) { 3524 for (cf::region::list) {
2792 $_->{match} = qr/$_->{match}/ 3525 $_->{match} = qr/$_->{match}/
2800} 3533}
2801 3534
2802sub reload_archetypes { 3535sub reload_archetypes {
2803 load_resource_file "$DATADIR/archetypes" 3536 load_resource_file "$DATADIR/archetypes"
2804 or die "unable to load archetypes\n"; 3537 or die "unable to load archetypes\n";
2805 #d# NEED to laod twice to resolve forward references
2806 # this really needs to be done in an extra post-pass
2807 # (which needs to be synchronous, so solve it differently)
2808 load_resource_file "$DATADIR/archetypes"
2809 or die "unable to load archetypes\n";
2810} 3538}
2811 3539
2812sub reload_treasures { 3540sub reload_treasures {
2813 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
2814 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
2815} 3543}
2816 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
2817sub reload_resources { 3568sub reload_resources {
2818 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
2819 3570
3571 reload_exp_table;
3572 reload_materials;
3573 reload_facedata;
3574 reload_sound;
3575 reload_archetypes;
2820 reload_regions; 3576 reload_regions;
2821 reload_facedata;
2822 #reload_archetypes;#d#
2823 reload_archetypes;
2824 reload_treasures; 3577 reload_treasures;
2825 3578
2826 warn "finished reloading resource files\n"; 3579 trace "finished reloading resource files\n";
2827} 3580}
2828 3581
2829sub init { 3582sub reload_config {
2830 reload_resources; 3583 trace "reloading config file...\n";
2831}
2832 3584
2833sub cfg_load { 3585 0 < aio_load "$CONFDIR/config", my $config
2834 open my $fh, "<:utf8", "$CONFDIR/config" 3586 or die "$CONFDIR/config: $!";
2835 or return;
2836 3587
2837 local $/; 3588 utf8::decode $config;
2838 *CFG = YAML::Syck::Load <$fh>; 3589 *CFG = yaml_load $config;
2839 3590
2840 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3591 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2841 3592
2842 $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};
2843 $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};
2844 3595
2845 if (exists $CFG{mlockall}) { 3596 if (exists $CFG{mlockall}) {
2849 }; 3600 };
2850 warn $@ if $@; 3601 warn $@ if $@;
2851 } 3602 }
2852} 3603}
2853 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
2854sub 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
2855 # we must not ever block the main coroutine 3643 # we must not ever block the main coroutine
2856 local $Coro::idle = sub { 3644 local $Coro::idle = sub {
2857 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#
2858 (async { 3646 (async {
2859 Event::one_event; 3647 $Coro::current->{desc} = "IDLE BUG HANDLER";
3648 EV::loop EV::LOOP_ONESHOT;
2860 })->prio (Coro::PRIO_MAX); 3649 })->prio (Coro::PRIO_MAX);
2861 }; 3650 };
2862 3651
2863 cfg_load; 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;
3664 reload_config;
2864 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
2865 load_extensions; 3675 load_extensions;
2866 3676
2867 $TICK_WATCHER->start; 3677 utime time, time, $RUNTIMEFILE;
2868 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;
2869} 3695}
2870 3696
2871############################################################################# 3697#############################################################################
2872# initialisation and cleanup 3698# initialisation and cleanup
2873 3699
2874# install some emergency cleanup handlers 3700# install some emergency cleanup handlers
2875BEGIN { 3701BEGIN {
3702 our %SIGWATCHER = ();
2876 for my $signal (qw(INT HUP TERM)) { 3703 for my $signal (qw(INT HUP TERM)) {
2877 Event->signal ( 3704 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2878 reentrant => 0,
2879 data => WF_AUTOCANCEL,
2880 signal => $signal,
2881 prio => 0,
2882 cb => sub {
2883 cf::cleanup "SIG$signal"; 3705 cf::cleanup "SIG$signal";
2884 },
2885 ); 3706 };
2886 } 3707 }
2887} 3708}
2888 3709
2889sub write_runtime { 3710sub write_runtime_sync {
2890 my $runtime = "$LOCALDIR/runtime"; 3711 my $t0 = AE::time;
2891 3712
2892 # first touch the runtime file to show we are still running: 3713 # first touch the runtime file to show we are still running:
2893 # the fsync below can take a very very long time. 3714 # the fsync below can take a very very long time.
2894 3715
2895 IO::AIO::aio_utime $runtime, undef, undef; 3716 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2896 3717
2897 my $guard = cf::lock_acquire "write_runtime"; 3718 my $guard = cf::lock_acquire "write_runtime";
2898 3719
2899 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3720 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2900 or return; 3721 or return;
2901 3722
2902 my $value = $cf::RUNTIME + 90 + 10; 3723 my $value = $cf::RUNTIME + 90 + 10;
2903 # 10 is the runtime save interval, for a monotonic clock 3724 # 10 is the runtime save interval, for a monotonic clock
2904 # 60 allows for the watchdog to kill the server. 3725 # 60 allows for the watchdog to kill the server.
2914 aio_utime $fh, undef, undef; 3735 aio_utime $fh, undef, undef;
2915 3736
2916 close $fh 3737 close $fh
2917 or return; 3738 or return;
2918 3739
2919 aio_rename "$runtime~", $runtime 3740 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2920 and return; 3741 and return;
2921 3742
2922 warn "runtime file written.\n"; 3743 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2923 3744
2924 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 };
2925} 3796}
2926 3797
2927sub emergency_save() { 3798sub emergency_save() {
2928 my $freeze_guard = cf::freeze_mainloop; 3799 my $freeze_guard = cf::freeze_mainloop;
2929 3800
2930 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;
2931 3807
2932 cf::sync_job { 3808 cf::sync_job {
3809 cf::write_runtime_sync; # external watchdog should not bark
3810
2933 # use a peculiar iteration method to avoid tripping on perl 3811 # use a peculiar iteration method to avoid tripping on perl
2934 # refcount bugs in for. also avoids problems with players 3812 # refcount bugs in for. also avoids problems with players
2935 # and maps saved/destroyed asynchronously. 3813 # and maps saved/destroyed asynchronously.
2936 warn "begin emergency player save\n"; 3814 info "emergency_perl_save: begin player save\n";
2937 for my $login (keys %cf::PLAYER) { 3815 for my $login (keys %cf::PLAYER) {
2938 my $pl = $cf::PLAYER{$login} or next; 3816 my $pl = $cf::PLAYER{$login} or next;
2939 $pl->valid or next; 3817 $pl->valid or next;
3818 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2940 $pl->save; 3819 $pl->save;
2941 } 3820 }
2942 warn "end emergency player save\n"; 3821 info "emergency_perl_save: end player save\n";
2943 3822
2944 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";
2945 for my $path (keys %cf::MAP) { 3826 for my $path (keys %cf::MAP) {
2946 my $map = $cf::MAP{$path} or next; 3827 my $map = $cf::MAP{$path} or next;
2947 $map->valid or next; 3828 $map->valid or next;
2948 $map->save; 3829 $map->save;
2949 } 3830 }
2950 warn "end emergency map save\n"; 3831 info "emergency_perl_save: end map save\n";
2951 3832
2952 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";
2953 BDB::db_env_txn_checkpoint $DB_ENV; 3836 BDB::db_env_txn_checkpoint $DB_ENV;
2954 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
2955 }; 3861 };
2956 3862
2957 warn "leave emergency perl save\n"; 3863 info "emergency_perl_save: leave\n";
2958} 3864}
2959 3865
2960sub post_cleanup { 3866sub post_cleanup {
2961 my ($make_core) = @_; 3867 my ($make_core) = @_;
2962 3868
3869 IO::AIO::flush;
3870
2963 warn Carp::longmess "post_cleanup backtrace" 3871 error Carp::longmess "post_cleanup backtrace"
2964 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 }
2965} 3901}
2966 3902
2967sub do_reload_perl() { 3903sub do_reload_perl() {
2968 # can/must only be called in main 3904 # can/must only be called in main
2969 if ($Coro::current != $Coro::main) { 3905 unless (in_main) {
2970 warn "can only reload from main coroutine"; 3906 error "can only reload from main coroutine";
2971 return; 3907 return;
2972 } 3908 }
2973 3909
2974 warn "reloading..."; 3910 return if $RELOAD++;
2975 3911
2976 warn "entering sync_job"; 3912 my $t1 = AE::time;
2977 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
2978 cf::sync_job { 3920 cf::sync_job {
2979 cf::write_runtime; # external watchdog should not bark
2980 cf::emergency_save; 3921 #cf::emergency_save;
2981 cf::write_runtime; # external watchdog should not bark
2982 3922
2983 warn "syncing database to disk";
2984 BDB::db_env_txn_checkpoint $DB_ENV;
2985
2986 # if anything goes wrong in here, we should simply crash as we already saved
2987
2988 warn "cancelling all WF_AUTOCANCEL watchers";
2989 for (Event::all_watchers) {
2990 $_->cancel if $_->data & WF_AUTOCANCEL;
2991 }
2992
2993 warn "flushing outstanding aio requests";
2994 for (;;) {
2995 BDB::flush;
2996 IO::AIO::flush;
2997 Coro::cede;
2998 last unless IO::AIO::nreqs || BDB::nreqs;
2999 warn "iterate...";
3000 }
3001
3002 ++$RELOAD;
3003
3004 warn "cancelling all extension coros"; 3923 trace "perl_reload: cancelling all extension coros";
3005 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3006 %EXT_CORO = (); 3925 %EXT_CORO = ();
3007 3926
3008 warn "removing commands"; 3927 trace "perl_reload: removing commands";
3009 %COMMAND = (); 3928 %COMMAND = ();
3010 3929
3011 warn "removing ext/exti commands"; 3930 trace "perl_reload: removing ext/exti commands";
3012 %EXTCMD = (); 3931 %EXTCMD = ();
3013 %EXTICMD = (); 3932 %EXTICMD = ();
3014 3933
3015 warn "unloading/nuking all extensions"; 3934 trace "perl_reload: unloading/nuking all extensions";
3016 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3017 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3018 3937
3019 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3020 eval { 3939 eval {
3021 $cb->($pkg); 3940 $cb->($pkg);
3022 1 3941 1
3023 } 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;
3024 } 3947 }
3025 3948
3026 warn "... nuking $pkg";
3027 Symbol::delete_package $pkg;
3028 }
3029
3030 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3031 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3032 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3033 3952
3034 warn "... unloading $k"; 3953 trace "... unloading $k";
3035 delete $INC{$k}; 3954 delete $INC{$k};
3036 3955
3037 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3038 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3039 3958
3040 if (my $cb = $k->can ("unload_module")) { 3959 if (my $cb = $k->can ("unload_module")) {
3041 $cb->(); 3960 $cb->();
3961 }
3962
3963 clear_package $k;
3042 } 3964 }
3043 3965
3044 Symbol::delete_package $k;
3045 }
3046
3047 warn "getting rid of safe::, as good as possible"; 3966 trace "perl_reload: getting rid of safe::, as good as possible";
3048 Symbol::delete_package "safe::$_" 3967 clear_package "safe::$_"
3049 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);
3050 3969
3051 warn "unloading cf.pm \"a bit\""; 3970 trace "perl_reload: unloading cf.pm \"a bit\"";
3052 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3053 delete $INC{"cf/pod.pm"}; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3054 3973
3055 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3056 # and global variables created in xs 3975 # and global variables created in xs
3057 #Symbol::delete_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3058 3977
3059 warn "unload completed, starting to reload now"; 3978 info "perl_reload: unload completed, starting to reload now";
3060 3979
3061 warn "reloading cf.pm"; 3980 trace "perl_reload: reloading cf.pm";
3062 require cf; 3981 require cf;
3063 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3982 cf::_connect_to_perl_1;
3064 3983
3065 warn "loading config and database again"; 3984 trace "perl_reload: loading config and database again";
3066 cf::cfg_load; 3985 cf::reload_config;
3067 3986
3068 warn "loading extensions"; 3987 trace "perl_reload: loading extensions";
3069 cf::load_extensions; 3988 cf::load_extensions;
3070 3989
3990 if ($REATTACH_ON_RELOAD) {
3071 warn "reattaching attachments to objects/players"; 3991 trace "perl_reload: reattaching attachments to objects/players";
3072 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3073 warn "reattaching attachments to maps"; 3993 trace "perl_reload: reattaching attachments to maps";
3074 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3075 warn "reattaching attachments to players"; 3995 trace "perl_reload: reattaching attachments to players";
3076 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3997 }
3077 3998
3078 warn "leaving sync_job"; 3999 cf::_post_init 1;
3079 4000
4001 trace "perl_reload: leaving sync_job";
4002
3080 1 4003 1
3081 } or do { 4004 } or do {
3082 warn $@; 4005 error $@;
3083 warn "error while reloading, exiting."; 4006 cf::cleanup "perl_reload: error, exiting.";
3084 exit 1; 4007 };
4008
4009 --$RELOAD;
3085 }; 4010 }
3086 4011
3087 warn "reloaded"; 4012 $t1 = AE::time - $t1;
4013 info "perl_reload: completed in ${t1}s\n";
3088}; 4014};
3089 4015
3090our $RELOAD_WATCHER; # used only during reload 4016our $RELOAD_WATCHER; # used only during reload
3091 4017
3092sub reload_perl() { 4018sub reload_perl() {
3093 # doing reload synchronously and two reloads happen back-to-back, 4019 # doing reload synchronously and two reloads happen back-to-back,
3094 # coro crashes during coro_state_free->destroy here. 4020 # coro crashes during coro_state_free->destroy here.
3095 4021
3096 $RELOAD_WATCHER ||= Event->timer ( 4022 $RELOAD_WATCHER ||= cf::async {
3097 reentrant => 0, 4023 Coro::AIO::aio_wait cache_extensions;
3098 after => 0, 4024
3099 data => WF_AUTOCANCEL, 4025 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3100 cb => sub {
3101 do_reload_perl; 4026 do_reload_perl;
3102 undef $RELOAD_WATCHER; 4027 undef $RELOAD_WATCHER;
3103 }, 4028 };
3104 ); 4029 };
3105} 4030}
3106 4031
3107register_command "reload" => sub { 4032register_command "reload" => sub {
3108 my ($who, $arg) = @_; 4033 my ($who, $arg) = @_;
3109 4034
3110 if ($who->flag (FLAG_WIZ)) { 4035 if ($who->flag (FLAG_WIZ)) {
3111 $who->message ("reloading server."); 4036 $who->message ("reloading server.");
4037 async {
4038 $Coro::current->{desc} = "perl_reload";
3112 async { reload_perl }; 4039 reload_perl;
4040 };
3113 } 4041 }
3114}; 4042};
3115 4043
3116unshift @INC, $LIBDIR; 4044#############################################################################
3117 4045
3118my $bug_warning = 0; 4046my $bug_warning = 0;
3119 4047
3120our @WAIT_FOR_TICK; 4048our @WAIT_FOR_TICK;
3121our @WAIT_FOR_TICK_BEGIN; 4049our @WAIT_FOR_TICK_BEGIN;
3122 4050
3123sub wait_for_tick { 4051sub wait_for_tick() {
3124 return unless $TICK_WATCHER->is_active;
3125 return if $Coro::current == $Coro::main; 4052 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3126 4053
3127 my $signal = new Coro::Signal; 4054 my $signal = new Coro::Signal;
3128 push @WAIT_FOR_TICK, $signal; 4055 push @WAIT_FOR_TICK, $signal;
3129 $signal->wait; 4056 $signal->wait;
3130} 4057}
3131 4058
3132sub wait_for_tick_begin { 4059sub wait_for_tick_begin() {
3133 return unless $TICK_WATCHER->is_active;
3134 return if $Coro::current == $Coro::main; 4060 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3135 4061
3136 my $signal = new Coro::Signal; 4062 my $signal = new Coro::Signal;
3137 push @WAIT_FOR_TICK_BEGIN, $signal; 4063 push @WAIT_FOR_TICK_BEGIN, $signal;
3138 $signal->wait; 4064 $signal->wait;
3139} 4065}
3140 4066
3141 my $min = 1e6;#d# 4067sub tick {
3142 my $avg = 10;
3143$TICK_WATCHER = Event->timer (
3144 reentrant => 0,
3145 parked => 1,
3146 prio => 0,
3147 at => $NEXT_TICK || $TICK,
3148 data => WF_AUTOCANCEL,
3149 cb => sub {
3150 if ($Coro::current != $Coro::main) { 4068 if ($Coro::current != $Coro::main) {
3151 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"
3152 unless ++$bug_warning > 10; 4070 unless ++$bug_warning > 10;
3153 return; 4071 return;
3154 } 4072 }
3155 4073
3156 $NOW = $tick_start = Event::time;
3157
3158 cf::server_tick; # one server iteration 4074 cf::server_tick; # one server iteration
3159 4075
3160 0 && sync_job {#d# 4076 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3161 for(1..10) {
3162 my $t = Event::time;
3163 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3164 or die;
3165 4077
3166 $map->width (50); 4078 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3167 $map->height (50); 4079 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3168 $map->alloc; 4080 Coro::async_pool {
3169 $map->_load_objects ("/tmp/x.map", 1); 4081 $Coro::current->{desc} = "runtime saver";
3170 my $t = Event::time - $t; 4082 write_runtime_sync
3171 4083 or error "ERROR: unable to write runtime file: $!";
3172 #next unless $t < 0.0013;#d#
3173 if ($t < $min) {
3174 $min = $t;
3175 }
3176 $avg = $avg * 0.99 + $t * 0.01;
3177 }
3178 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3179 exit 0;
3180 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3181 }; 4084 };
4085 }
3182 4086
3183 $RUNTIME += $TICK;
3184 $NEXT_TICK += $TICK;
3185
3186 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3187 $NEXT_RUNTIME_WRITE = $NOW + 10;
3188 Coro::async_pool {
3189 write_runtime
3190 or warn "ERROR: unable to write runtime file: $!";
3191 };
3192 }
3193
3194# my $AFTER = Event::time;
3195# warn $AFTER - $NOW;#d#
3196
3197 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4087 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3198 $sig->send; 4088 $sig->send;
3199 } 4089 }
3200 while (my $sig = shift @WAIT_FOR_TICK) { 4090 while (my $sig = shift @WAIT_FOR_TICK) {
3201 $sig->send; 4091 $sig->send;
3202 } 4092 }
3203 4093
3204 $NOW = Event::time; 4094 $LOAD = ($NOW - $TICK_START) / $TICK;
3205
3206 # if we are delayed by four ticks or more, skip them all
3207 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3208
3209 $TICK_WATCHER->at ($NEXT_TICK);
3210 $TICK_WATCHER->start;
3211
3212 $LOAD = ($NOW - $tick_start) / $TICK;
3213 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4095 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3214 4096
3215 _post_tick; 4097 if (0) {
3216 4098 if ($NEXT_TICK) {
3217 4099 my $jitter = $TICK_START - $NEXT_TICK;
4100 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4101 debug "jitter $JITTER\n";#d#
4102 }
3218 }, 4103 }
3219); 4104}
3220 4105
3221{ 4106{
3222 BDB::max_poll_time $TICK * 0.1; 4107 # configure BDB
3223 $BDB_POLL_WATCHER = Event->io ( 4108
3224 reentrant => 0,
3225 fd => BDB::poll_fileno,
3226 poll => 'r',
3227 prio => 0,
3228 data => WF_AUTOCANCEL,
3229 cb => \&BDB::poll_cb,
3230 );
3231 BDB::min_parallel 8; 4109 BDB::min_parallel 16;
3232 4110 BDB::max_poll_reqs $TICK * 0.1;
3233 BDB::set_sync_prepare { 4111 $AnyEvent::BDB::WATCHER->priority (1);
3234 my $status;
3235 my $current = $Coro::current;
3236 (
3237 sub {
3238 $status = $!;
3239 $current->ready; undef $current;
3240 },
3241 sub {
3242 Coro::schedule while defined $current;
3243 $! = $status;
3244 },
3245 )
3246 };
3247 4112
3248 unless ($DB_ENV) { 4113 unless ($DB_ENV) {
3249 $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);
3250 4120
3251 cf::sync_job { 4121 cf::sync_job {
3252 eval { 4122 eval {
3253 BDB::db_env_open 4123 BDB::db_env_open
3254 $DB_ENV, 4124 $DB_ENV,
3256 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
3257 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4127 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3258 0666; 4128 0666;
3259 4129
3260 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4130 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3261
3262 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3263 $DB_ENV->set_lk_detect;
3264 }; 4131 };
3265 4132
3266 cf::cleanup "db_env_open(db): $@" if $@; 4133 cf::cleanup "db_env_open(db): $@" if $@;
3267 }; 4134 };
3268 } 4135 }
4136
4137 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4138 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4139 };
4140 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4141 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4142 };
4143 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4144 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4145 };
3269} 4146}
3270 4147
3271{ 4148{
4149 # configure IO::AIO
4150
3272 IO::AIO::min_parallel 8; 4151 IO::AIO::min_parallel 8;
3273
3274 undef $Coro::AIO::WATCHER;
3275 IO::AIO::max_poll_time $TICK * 0.1; 4152 IO::AIO::max_poll_time $TICK * 0.1;
3276 $AIO_POLL_WATCHER = Event->io ( 4153 undef $AnyEvent::AIO::WATCHER;
3277 reentrant => 0,
3278 data => WF_AUTOCANCEL,
3279 fd => IO::AIO::poll_fileno,
3280 poll => 'r',
3281 prio => 6,
3282 cb => \&IO::AIO::poll_cb,
3283 );
3284} 4154}
3285 4155
3286my $_log_backtrace; 4156our $_log_backtrace;
4157our $_log_backtrace_last;
3287 4158
3288sub _log_backtrace { 4159sub _log_backtrace {
3289 my ($msg, @addr) = @_; 4160 my ($msg, @addr) = @_;
3290 4161
3291 $msg =~ s/\n//; 4162 $msg =~ s/\n$//;
3292 4163
4164 if ($_log_backtrace_last eq $msg) {
4165 LOG llevInfo, "[ABT] $msg\n";
4166 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3293 # limit the # of concurrent backtraces 4167 # limit the # of concurrent backtraces
3294 if ($_log_backtrace < 2) { 4168 } elsif ($_log_backtrace < 2) {
4169 $_log_backtrace_last = $msg;
3295 ++$_log_backtrace; 4170 ++$_log_backtrace;
4171 my $perl_bt = Carp::longmess $msg;
3296 async { 4172 async {
4173 $Coro::current->{desc} = "abt $msg";
4174
3297 my @bt = fork_call { 4175 my @bt = fork_call {
3298 @addr = map { sprintf "%x", $_ } @addr; 4176 @addr = map { sprintf "%x", $_ } @addr;
3299 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4177 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3300 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 |"
3301 or die "addr2line: $!"; 4179 or die "addr2line: $!";
3309 } 4187 }
3310 4188
3311 @funcs 4189 @funcs
3312 }; 4190 };
3313 4191
3314 LOG llevInfo, "[ABT] $msg\n"; 4192 LOG llevInfo, "[ABT] $perl_bt\n";
4193 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3315 LOG llevInfo, "[ABT] $_\n" for @bt; 4194 LOG llevInfo, "[ABT] $_\n" for @bt;
3316 --$_log_backtrace; 4195 --$_log_backtrace;
3317 }; 4196 };
3318 } else { 4197 } else {
3319 LOG llevInfo, "[ABT] $msg\n"; 4198 LOG llevInfo, "[ABT] $msg\n";
3320 LOG llevInfo, "[ABT] [suppressed]\n"; 4199 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3321 } 4200 }
3322} 4201}
3323 4202
3324# load additional modules 4203# load additional modules
3325use cf::pod; 4204require "cf/$_.pm" for @EXTRA_MODULES;
4205cf::_connect_to_perl_2;
3326 4206
3327END { cf::emergency_save } 4207END { cf::emergency_save }
3328 4208
33291 42091
3330 4210

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines