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.303 by root, Wed Jul 11 15:57:31 2007 UTC vs.
Revision 1.555 by root, Wed Jun 30 01:32:56 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines