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.309 by elmex, Mon Jul 16 15:27:06 2007 UTC vs.
Revision 1.554 by root, Sat Jun 26 22:10:18 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines