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.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.550 by root, Fri May 14 22:56:47 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines