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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines