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.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.551 by root, Sun May 16 13:48:07 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines