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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines