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.289 by root, Sat Jun 30 03:00:54 2007 UTC vs.
Revision 1.556 by root, Sat Jul 3 01:49:18 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5;
29use Fcntl; 56use Fcntl;
30use YAML::Syck (); 57use YAML::XS ();
31use IO::AIO 2.32 (); 58use IO::AIO ();
32use Time::HiRes; 59use Time::HiRes;
33use Compress::LZF; 60use Compress::LZF;
61use Digest::MD5 ();
62
63AnyEvent::detect;
34 64
35# configure various modules to our taste 65# configure various modules to our taste
36# 66#
37$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40 75
41$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
42 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 78
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
49 82
50our %COMMAND = (); 83our %COMMAND = ();
51our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
52 85
53our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
54our %EXTCMD = (); 87our %EXTCMD = ();
55our %EXTICMD = (); 88our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
58 91
59our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
61 96
62our $CONFDIR = confdir; 97our $CONFDIR = confdir;
63our $DATADIR = datadir; 98our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
73 118
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 121our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
81 123
124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 126our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 127our $DB_ENV;
128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
84 130
85our %CFG; 131our %CFG;
86 132
87our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 134our $RUNTIME;
135our $NOW;
89 136
90our %PLAYER; # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 138our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
93 140
94# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 143
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
100 153
101binmode STDOUT; 154binmode STDOUT;
102binmode STDERR; 155binmode STDERR;
103 156
104# read virtual server time, if available 157# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
109} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
110 165
111mkdir $_ 166mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
113 168
114our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
115 170
116sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
117 187
118############################################################################# 188#############################################################################
119 189
120=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
121 191
157 227
158The raw value load value from the last tick. 228The raw value load value from the last tick.
159 229
160=item %cf::CFG 230=item %cf::CFG
161 231
162Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 233from wherever your confdir points to.
164 234
165=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
166 236
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
246=item @cf::INVOKE_RESULTS
247
248This array contains the results of the last C<invoke ()> call. When
249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
250that call.
251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
171=back 258=back
172 259
173=cut 260=cut
174 261
175BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
176 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
177 my $msg = join "", @_; 269 my $msg = join "", @_;
178 270
179 $msg .= "\n" 271 $msg .= "\n"
180 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
181 273
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 275
184 utf8::encode $msg;
185 LOG llevError, $msg; 276 LOG llevWarn, $msg;
186 }; 277};
187} 278
279$Coro::State::DIEHOOK = sub {
280 return unless $^S eq 0; # "eq", not "=="
281
282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
285 error "DIEHOOK called in main context, Coro bug?\n";#d#
286 return;#d#
287 }#d#
288
289 # kill coroutine otherwise
290 Coro::terminate
291};
188 292
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
199for my $pkg (qw( 303for my $pkg (qw(
200 cf::global cf::attachable 304 cf::global cf::attachable
201 cf::object cf::object::player 305 cf::object cf::object::player
202 cf::client cf::player 306 cf::client cf::player
203 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
204 cf::map cf::party cf::region 309 cf::party cf::region
205)) { 310)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 312}
209 313
210$Event::DIED = sub { 314$EV::DIED = sub {
211 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
212}; 316};
213 317
214############################################################################# 318#############################################################################
215 319
216=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 343 $d
240 } || "[unable to dump $_[0]: '$@']"; 344 } || "[unable to dump $_[0]: '$@']";
241} 345}
242 346
243=item $ref = cf::from_json $json 347=item $ref = cf::decode_json $json
244 348
245Converts a JSON string into the corresponding perl data structure. 349Converts a JSON string into the corresponding perl data structure.
246 350
247=item $json = cf::to_json $ref 351=item $json = cf::encode_json $ref
248 352
249Converts a perl data structure into its JSON representation. 353Converts a perl data structure into its JSON representation.
250 354
251=cut 355=cut
252 356
253our $json_coder = JSON::XS->new->convert_blessed->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
1086 cf::override; 1393 cf::override;
1087 }, 1394 },
1088 on_extcmd => sub { 1395 on_extcmd => sub {
1089 my ($pl, $buf) = @_; 1396 my ($pl, $buf) = @_;
1090 1397
1091 my $msg = eval { from_json $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<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1406
1407 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g;
1409
1410 $_
1411}
1412
1413=item $player->ext_reply ($msgid, %msg) 1786=item $player->ext_reply ($msgid, @msg)
1414 1787
1415Sends an ext reply to the player. 1788Sends an ext reply to the player.
1416 1789
1417=cut 1790=cut
1418 1791
1419sub ext_reply($$%) { 1792sub ext_reply($$@) {
1420 my ($self, $id, %msg) = @_; 1793 my ($self, $id, @msg) = @_;
1421 1794
1422 $msg{msgid} = $id; 1795 $self->ns->ext_reply ($id, @msg)
1423 $self->send ("ext " . cf::to_json \%msg);
1424} 1796}
1425 1797
1426=item $player->ext_event ($type, %msg) 1798=item $player->ext_msg ($type, @msg)
1427 1799
1428Sends an ext event to the client. 1800Sends an ext event to the client.
1429 1801
1430=cut 1802=cut
1431 1803
1432sub ext_event($$%) { 1804sub ext_msg($$@) {
1433 my ($self, $type, %msg) = @_; 1805 my ($self, $type, @msg) = @_;
1434 1806
1435 $self->ns->ext_event ($type, %msg); 1807 $self->ns->ext_msg ($type, @msg);
1436} 1808}
1437 1809
1438=head3 cf::region 1810=head3 cf::region
1439 1811
1440=over 4 1812=over 4
1450=cut 1822=cut
1451 1823
1452sub find_by_path($) { 1824sub find_by_path($) {
1453 my ($path) = @_; 1825 my ($path) = @_;
1454 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1455 my ($match, $specificity); 1829 my ($match, $specificity);
1456 1830
1457 for my $region (list) { 1831 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1834 if $region->specificity > $specificity;
1461 } 1835 }
1462 } 1836 }
1463 1837
1484our $MAX_RESET = 3600; 1858our $MAX_RESET = 3600;
1485our $DEFAULT_RESET = 3000; 1859our $DEFAULT_RESET = 3000;
1486 1860
1487sub generate_random_map { 1861sub generate_random_map {
1488 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1489 # mit "rum" bekleckern, nicht 1863
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865
1490 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1491 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1492 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1493 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1494 $rmp->{exit_on_final_map},
1495 $rmp->{xsize}, $rmp->{ysize},
1496 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1497 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1498 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1499 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1500 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1501 (cf::region::find $rmp->{region}), $rmp->{custom}
1502 )
1503} 1867}
1504 1868
1505=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1506 1870
1507Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
1512 1876
1513sub register { 1877sub register {
1514 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1515 my $pkg = caller; 1879 my $pkg = caller;
1516 1880
1517 no strict;
1518 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1519 1882
1520 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1521} 1884}
1522 1885
1523# also paths starting with '/' 1886# also paths starting with '/'
1524$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1525 1888
1526sub thawer_merge { 1889sub thawer_merge {
1527 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1528 1891
1529 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1534} 1897}
1535 1898
1536sub normalise { 1899sub normalise {
1537 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1538 1901
1539 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1540 1903
1541 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1542 1905
1543 # map plan: 1906 # map plan:
1544 # 1907 #
1559 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1560 $path = "$base/$path"; 1923 $path = "$base/$path";
1561 } 1924 }
1562 1925
1563 for ($path) { 1926 for ($path) {
1564 redo if s{//}{/};
1565 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1566 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1567 } 1929 }
1568 1930
1569 $path 1931 $path
1583 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1584 return $self; 1946 return $self;
1585 } 1947 }
1586 } 1948 }
1587 1949
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1589 () 1951 ()
1590} 1952}
1591 1953
1592sub init { 1954sub init {
1593 my ($self) = @_; 1955 my ($self) = @_;
1615 1977
1616# the temporary/swap location 1978# the temporary/swap location
1617sub save_path { 1979sub save_path {
1618 my ($self) = @_; 1980 my ($self) = @_;
1619 1981
1620 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1982 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1621 "$TMPDIR/$path.map" 1983 "$TMPDIR/$path.map"
1622} 1984}
1623 1985
1624# the unique path, undef == no special unique path 1986# the unique path, undef == no special unique path
1625sub uniq_path { 1987sub uniq_path {
1626 my ($self) = @_; 1988 my ($self) = @_;
1627 1989
1628 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1990 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1629 "$UNIQUEDIR/$path" 1991 "$UNIQUEDIR/$path"
1630}
1631
1632# and all this just because we cannot iterate over
1633# all maps in C++...
1634sub change_all_map_light {
1635 my ($change) = @_;
1636
1637 $_->change_map_light ($change)
1638 for grep $_->outdoor, values %cf::MAP;
1639} 1992}
1640 1993
1641sub decay_objects { 1994sub decay_objects {
1642 my ($self) = @_; 1995 my ($self) = @_;
1643 1996
1656 2009
1657sub load_header_from($) { 2010sub load_header_from($) {
1658 my ($self, $path) = @_; 2011 my ($self, $path) = @_;
1659 2012
1660 utf8::encode $path; 2013 utf8::encode $path;
1661 #aio_open $path, O_RDONLY, 0 2014 my $f = new_from_file cf::object::thawer $path
1662 # or return;
1663
1664 $self->_load_header ($path)
1665 or return; 2015 or return;
2016
2017 $self->_load_header ($f)
2018 or return;
2019
2020 local $MAP_LOADING{$self->{path}} = $self;
2021 $f->resolve_delayed_derefs;
1666 2022
1667 $self->{load_path} = $path; 2023 $self->{load_path} = $path;
1668 2024
1669 1 2025 1
1670} 2026}
1722 2078
1723sub find; 2079sub find;
1724sub find { 2080sub find {
1725 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
1726 2082
2083 cf::cede_to_tick;
2084
1727 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1728 2086
2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1729 cf::lock_wait "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1730 2089
1731 $cf::MAP{$path} || do { 2090 $cf::MAP{$path} || do {
1732 my $guard = cf::lock_acquire "map_find:$path";
1733 my $map = new_from_path cf::map $path 2091 my $map = new_from_path cf::map $path
1734 or return; 2092 or return;
1735 2093
1736 $map->{last_save} = $cf::RUNTIME; 2094 $map->{last_save} = $cf::RUNTIME;
1737 2095
1739 or return; 2097 or return;
1740 2098
1741 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2099 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1742 # doing this can freeze the server in a sync job, obviously 2100 # doing this can freeze the server in a sync job, obviously
1743 #$cf::WAIT_FOR_TICK->wait; 2101 #$cf::WAIT_FOR_TICK->wait;
2102 undef $guard2;
2103 undef $guard1;
1744 $map->reset; 2104 $map->reset;
1745 undef $guard;
1746 return find $path; 2105 return find $path;
1747 } 2106 }
1748 2107
1749 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
1750 } 2109 }
1751} 2110}
1752 2111
1753sub pre_load { } 2112sub pre_load { }
1754sub post_load { } 2113#sub post_load { } # XS
1755 2114
1756sub load { 2115sub load {
1757 my ($self) = @_; 2116 my ($self) = @_;
1758 2117
1759 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
1760 2119
1761 my $path = $self->{path}; 2120 my $path = $self->{path};
1762 2121
1763 { 2122 {
1764 my $guard = cf::lock_acquire "map_load:$path"; 2123 my $guard = cf::lock_acquire "map_data:$path";
1765 2124
2125 return unless $self->valid;
1766 return if $self->in_memory != cf::MAP_SWAPPED; 2126 return unless $self->in_memory == cf::MAP_SWAPPED;
1767 2127
1768 $self->in_memory (cf::MAP_LOADING); 2128 $self->in_memory (cf::MAP_LOADING);
1769 2129
1770 $self->alloc; 2130 $self->alloc;
1771 2131
1772 $self->pre_load; 2132 $self->pre_load;
1773 Coro::cede; 2133 cf::cede_to_tick;
1774 2134
2135 my $f = new_from_file cf::object::thawer $self->{load_path};
2136 $f->skip_block;
1775 $self->_load_objects ($self->{load_path}, 1) 2137 $self->_load_objects ($f)
1776 or return; 2138 or return;
1777 2139
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2140 $self->post_load_original
1779 if delete $self->{load_original}; 2141 if delete $self->{load_original};
1780 2142
1781 if (my $uniq = $self->uniq_path) { 2143 if (my $uniq = $self->uniq_path) {
1782 utf8::encode $uniq; 2144 utf8::encode $uniq;
1783 if (aio_open $uniq, O_RDONLY, 0) { 2145 unless (aio_stat $uniq) {
2146 if (my $f = new_from_file cf::object::thawer $uniq) {
1784 $self->clear_unique_items; 2147 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0); 2148 $self->_load_objects ($f);
2149 $f->resolve_delayed_derefs;
2150 }
1786 } 2151 }
1787 } 2152 }
1788 2153
1789 Coro::cede; 2154 $f->resolve_delayed_derefs;
2155
2156 cf::cede_to_tick;
1790 # now do the right thing for maps 2157 # now do the right thing for maps
1791 $self->link_multipart_objects; 2158 $self->link_multipart_objects;
1792 $self->difficulty ($self->estimate_difficulty) 2159 $self->difficulty ($self->estimate_difficulty)
1793 unless $self->difficulty; 2160 unless $self->difficulty;
1794 Coro::cede; 2161 cf::cede_to_tick;
1795 2162
1796 unless ($self->{deny_activate}) { 2163 unless ($self->{deny_activate}) {
1797 $self->decay_objects; 2164 $self->decay_objects;
1798 $self->fix_auto_apply; 2165 $self->fix_auto_apply;
1799 $self->update_buttons; 2166 $self->update_buttons;
1800 Coro::cede; 2167 cf::cede_to_tick;
1801 $self->set_darkness_map;
1802 Coro::cede;
1803 $self->activate; 2168 $self->activate;
1804 } 2169 }
1805 2170
2171 $self->{last_save} = $cf::RUNTIME;
2172 $self->last_access ($cf::RUNTIME);
2173
1806 $self->in_memory (cf::MAP_IN_MEMORY); 2174 $self->in_memory (cf::MAP_ACTIVE);
1807 } 2175 }
1808 2176
1809 $self->post_load; 2177 $self->post_load;
1810}
1811 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
1812sub customise_for { 2185sub customise_for {
1813 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
1814 2187
1815 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
1816 if $self->per_player; 2189 if $self->per_player;
1820 2193
1821 $self 2194 $self
1822} 2195}
1823 2196
1824# find and load all maps in the 3x3 area around a map 2197# find and load all maps in the 3x3 area around a map
1825sub load_diag { 2198sub load_neighbours {
1826 my ($map) = @_; 2199 my ($map) = @_;
1827 2200
1828 my @diag; # diagonal neighbours 2201 my @neigh; # diagonal neighbours
1829 2202
1830 for (0 .. 3) { 2203 for (0 .. 3) {
1831 my $neigh = $map->tile_path ($_) 2204 my $neigh = $map->tile_path ($_)
1832 or next; 2205 or next;
1833 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
1834 or next; 2207 or next;
1835 $neigh->load; 2208 $neigh->load;
1836 2209
2210 # now find the diagonal neighbours
2211 push @neigh,
1837 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1838 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1839 } 2214 }
1840 2215
1841 for (@diag) { 2216 for (grep defined $_->[0], @neigh) {
2217 my ($path, $origin) = @$_;
1842 my $neigh = find @$_ 2218 my $neigh = find $path, $origin
1843 or next; 2219 or next;
1844 $neigh->load; 2220 $neigh->load;
1845 } 2221 }
1846} 2222}
1847 2223
1848sub find_sync { 2224sub find_sync {
1849 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
1850 2226
1851 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
1852} 2231}
1853 2232
1854sub do_load_sync { 2233sub do_load_sync {
1855 my ($map) = @_; 2234 my ($map) = @_;
1856 2235
1857 cf::sync_job { $map->load }; 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2237 if $Coro::current == $Coro::main;
2238
2239 $map->load;
1858} 2240}
1859 2241
1860our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
1861our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
1862 2244
1863sub find_async { 2245sub find_async {
1864 my ($path, $origin) = @_; 2246 my ($path, $origin, $load) = @_;
1865 2247
1866 $path = normalise $path, $origin && $origin->{path}; 2248 $path = normalise $path, $origin && $origin->{path};
1867 2249
1868 if (my $map = $cf::MAP{$path}) { 2250 if (my $map = $cf::MAP{$path}) {
1869 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2251 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1870 } 2252 }
1871 2253
1872 undef $MAP_PREFETCH{$path}; 2254 $MAP_PREFETCH{$path} |= $load;
2255
1873 $MAP_PREFETCHER ||= cf::async { 2256 $MAP_PREFETCHER ||= cf::async {
2257 $Coro::current->{desc} = "map prefetcher";
2258
1874 while (%MAP_PREFETCH) { 2259 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 2260 while (my ($k, $v) = each %MAP_PREFETCH) {
1876 my $map = find $path 2261 if (my $map = find $k) {
1877 or next;
1878 $map->load; 2262 $map->load if $v;
2263 }
1879 2264
1880 delete $MAP_PREFETCH{$path}; 2265 delete $MAP_PREFETCH{$k};
1881 } 2266 }
1882 } 2267 }
1883 undef $MAP_PREFETCHER; 2268 undef $MAP_PREFETCHER;
1884 }; 2269 };
1885 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
1886 2271
1887 () 2272 ()
1888} 2273}
1889 2274
2275# common code, used by both ->save and ->swapout
1890sub save { 2276sub _save {
1891 my ($self) = @_; 2277 my ($self) = @_;
1892
1893 my $lock = cf::lock_acquire "map_data:" . $self->path;
1894 2278
1895 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
1896 2280
1897 return unless $self->dirty; 2281 return unless $self->dirty;
1898 2282
1904 return if $self->{deny_save}; 2288 return if $self->{deny_save};
1905 2289
1906 local $self->{last_access} = $self->last_access;#d# 2290 local $self->{last_access} = $self->last_access;#d#
1907 2291
1908 cf::async { 2292 cf::async {
2293 $Coro::current->{desc} = "map player save";
1909 $_->contr->save for $self->players; 2294 $_->contr->save for $self->players;
1910 }; 2295 };
2296
2297 cf::get_slot 0.02;
1911 2298
1912 if ($uniq) { 2299 if ($uniq) {
1913 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2300 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1914 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2301 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1915 } else { 2302 } else {
1916 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1917 } 2304 }
1918} 2305}
1919 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
1920sub swap_out { 2315sub swap_out {
1921 my ($self) = @_; 2316 my ($self) = @_;
1922 2317
1923 # save first because save cedes
1924 $self->save;
1925
1926 my $lock = cf::lock_acquire "map_data:" . $self->path; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
1927 2319
2320 return if $self->in_memory != cf::MAP_ACTIVE;
2321 return if $self->{deny_save};
1928 return if $self->players; 2322 return if $self->players;
1929 return if $self->in_memory != cf::MAP_IN_MEMORY;
1930 return if $self->{deny_save};
1931 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
1932 $self->clear; 2333 $self->clear;
1933 $self->in_memory (cf::MAP_SWAPPED);
1934} 2334}
1935 2335
1936sub reset_at { 2336sub reset_at {
1937 my ($self) = @_; 2337 my ($self) = @_;
1938 2338
1956 2356
1957 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
1958 2358
1959 return if $self->players; 2359 return if $self->players;
1960 2360
1961 warn "resetting map ", $self->path; 2361 cf::trace "resetting map ", $self->path, "\n";
1962 2362
1963 $self->in_memory (cf::MAP_SWAPPED); 2363 $self->in_memory (cf::MAP_SWAPPED);
1964 2364
1965 # need to save uniques path 2365 # need to save uniques path
1966 unless ($self->{deny_save}) { 2366 unless ($self->{deny_save}) {
1970 if $uniq; 2370 if $uniq;
1971 } 2371 }
1972 2372
1973 delete $cf::MAP{$self->path}; 2373 delete $cf::MAP{$self->path};
1974 2374
2375 $self->deactivate;
2376 $_->clear_links_to ($self) for values %cf::MAP;
1975 $self->clear; 2377 $self->clear;
1976
1977 $_->clear_links_to ($self) for values %cf::MAP;
1978 2378
1979 $self->unlink_save; 2379 $self->unlink_save;
1980 $self->destroy; 2380 $self->destroy;
1981} 2381}
1982 2382
1983my $nuke_counter = "aaaa"; 2383my $nuke_counter = "aaaa";
1984 2384
1985sub nuke { 2385sub nuke {
1986 my ($self) = @_; 2386 my ($self) = @_;
1987 2387
2388 {
2389 my $lock = cf::lock_acquire "map_data:$self->{path}";
2390
1988 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
1989 2392
1990 $self->unlink_save; 2393 $self->unlink_save;
1991 2394
1992 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
1993 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
1994 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
1995 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
1996 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1997 2400
1998 $cf::MAP{$self->path} = $self; 2401 $cf::MAP{$self->path} = $self;
2402 }
1999 2403
2000 $self->reset; # polite request, might not happen 2404 $self->reset; # polite request, might not happen
2001} 2405}
2002 2406
2003=item $maps = cf::map::tmp_maps 2407=item $maps = cf::map::tmp_maps
2045 2449
2046sub unique_maps() { 2450sub unique_maps() {
2047 [ 2451 [
2048 map { 2452 map {
2049 utf8::decode $_; 2453 utf8::decode $_;
2050 /\.map$/ 2454 s/\.map$//; # TODO future compatibility hack
2455 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2456 ? ()
2051 ? normalise $_ 2457 : normalise $_
2052 : ()
2053 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2054 ] 2459 ]
2055} 2460}
2056 2461
2057package cf; 2462=item cf::map::static_maps
2463
2464Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2465file in the shared directory excluding F</styles> and F</editor>). May
2466block.
2467
2468=cut
2469
2470sub static_maps() {
2471 my @dirs = "";
2472 my @maps;
2473
2474 while (@dirs) {
2475 my $dir = shift @dirs;
2476
2477 next if $dir eq "/styles" || $dir eq "/editor";
2478
2479 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2480 or return;
2481
2482 for (@$files) {
2483 s/\.map$// or next;
2484 utf8::decode $_;
2485 push @maps, "$dir/$_";
2486 }
2487
2488 push @dirs, map "$dir/$_", @$dirs;
2489 }
2490
2491 \@maps
2492}
2058 2493
2059=back 2494=back
2060 2495
2061=head3 cf::object 2496=head3 cf::object
2062 2497
2066 2501
2067=over 4 2502=over 4
2068 2503
2069=item $ob->inv_recursive 2504=item $ob->inv_recursive
2070 2505
2071Returns the inventory of the object _and_ their inventories, recursively. 2506Returns the inventory of the object I<and> their inventories, recursively,
2507but I<not> the object itself.
2072 2508
2073=cut 2509=cut
2074 2510
2075sub inv_recursive_; 2511sub inv_recursive_;
2076sub inv_recursive_ { 2512sub inv_recursive_ {
2079 2515
2080sub inv_recursive { 2516sub inv_recursive {
2081 inv_recursive_ inv $_[0] 2517 inv_recursive_ inv $_[0]
2082} 2518}
2083 2519
2520=item $ref = $ob->ref
2521
2522Creates and returns a persistent reference to an object that can be stored as a string.
2523
2524=item $ob = cf::object::deref ($refstring)
2525
2526returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2527even if the object actually exists. May block.
2528
2529=cut
2530
2531sub deref {
2532 my ($ref) = @_;
2533
2534 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2535 my ($uuid, $name) = ($1, $2);
2536 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2537 or return;
2538 $pl->ob->uuid eq $uuid
2539 or return;
2540
2541 $pl->ob
2542 } else {
2543 warn "$ref: cannot resolve object reference\n";
2544 undef
2545 }
2546}
2547
2084package cf; 2548package cf;
2085 2549
2086=back 2550=back
2087 2551
2088=head3 cf::object::player 2552=head3 cf::object::player
2094Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2558Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2095can be C<undef>. Does the right thing when the player is currently in a 2559can be C<undef>. Does the right thing when the player is currently in a
2096dialogue with the given NPC character. 2560dialogue with the given NPC character.
2097 2561
2098=cut 2562=cut
2563
2564our $SAY_CHANNEL = {
2565 id => "say",
2566 title => "Map",
2567 reply => "say ",
2568 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2569};
2570
2571our $CHAT_CHANNEL = {
2572 id => "chat",
2573 title => "Chat",
2574 reply => "chat ",
2575 tooltip => "Player chat and shouts, global to the server.",
2576};
2099 2577
2100# rough implementation of a future "reply" method that works 2578# rough implementation of a future "reply" method that works
2101# with dialog boxes. 2579# with dialog boxes.
2102#TODO: the first argument must go, split into a $npc->reply_to ( method 2580#TODO: the first argument must go, split into a $npc->reply_to ( method
2103sub cf::object::player::reply($$$;$) { 2581sub cf::object::player::reply($$$;$) {
2110 2588
2111 } else { 2589 } else {
2112 my $pl = $self->contr; 2590 my $pl = $self->contr;
2113 2591
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2592 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog}; 2593 my $dialog = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply ( 2594 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122 2595
2123 } else { 2596 } else {
2124 $msg = $npc->name . " says: $msg" if $npc; 2597 $msg = $npc->name . " says: $msg" if $npc;
2125 $self->message ($msg, $flags); 2598 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2126 } 2599 }
2127 } 2600 }
2601}
2602
2603=item $object->send_msg ($channel, $msg, $color, [extra...])
2604
2605=cut
2606
2607sub cf::object::send_msg {
2608 my $pl = shift->contr
2609 or return;
2610 $pl->send_msg (@_);
2128} 2611}
2129 2612
2130=item $player_object->may ("access") 2613=item $player_object->may ("access")
2131 2614
2132Returns wether the given player is authorized to access resource "access" 2615Returns wether the given player is authorized to access resource "access"
2145 2628
2146=item $player_object->enter_link 2629=item $player_object->enter_link
2147 2630
2148Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2149 2632
2150The player should be reasonably safe there for short amounts of time. You 2633The player should be reasonably safe there for short amounts of time (e.g.
2151I<MUST> call C<leave_link> as soon as possible, though. 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2635though, as the player cannot control the character while it is on the link
2636map.
2152 2637
2153Will never block. 2638Will never block.
2154 2639
2155=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2156 2641
2176sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2177 my ($self) = @_; 2662 my ($self) = @_;
2178 2663
2179 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2180 2665
2666 ++$self->{_link_recursion};
2667
2181 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2182 2669
2183 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2184 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2185 2672
2186 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2187} 2674}
2188 2675
2189sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2190 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2191 2678
2208 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2209 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2210 2697
2211 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2212 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2213 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2214 2701
2215 $map->load; 2702 $map->load;
2216 $map->load_diag; 2703 $map->load_neighbours;
2217 2704
2218 return unless $self->contr->active; 2705 return unless $self->contr->active;
2219 $self->activate_recursive;
2220 2706
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2223} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2224 2714
2715}
2716
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2226 2718
2227Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2228her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2229that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2230the new (success) or old (failed) map position. 2722the new (success) or old (failed) map position. In either case, $done will
2723be called at the end of this process.
2724
2725Note that $check will be called with a potentially non-loaded map, so if
2726it needs a loaded map it has to call C<< ->load >>.
2231 2727
2232=cut 2728=cut
2233 2729
2234our $GOTOGEN; 2730our $GOTOGEN;
2235 2731
2236sub cf::object::player::goto { 2732sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2238 2740
2239 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2743
2242 $self->enter_link; 2744 $self->enter_link;
2243 2745
2244 (async { 2746 (async {
2747 $Coro::current->{desc} = "player::goto $path $x $y";
2748
2749 # *tag paths override both path and x|y
2750 if ($path =~ /^\*(.*)$/) {
2751 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2752 my $ob = $obs[rand @obs];
2753
2754 # see if we actually can go there
2755 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2756 $ob = $obs[rand @obs];
2757 } else {
2758 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2759 }
2760 # else put us there anyways for now #d#
2761
2762 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2763 } else {
2764 ($path, $x, $y) = (undef, undef, undef);
2765 }
2766 }
2767
2245 my $map = eval { 2768 my $map = eval {
2246 my $map = cf::map::find $path; 2769 my $map = defined $path ? cf::map::find $path : undef;
2247 2770
2248 if ($map) { 2771 if ($map) {
2249 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2250 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2251 } else { 2774 } else {
2252 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2253 } 2776 }
2254 2777
2255 $map 2778 $map
2256 }; 2779 };
2257 2780
2262 2785
2263 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2266 } 2789 }
2790
2791 $done->($self) if $done;
2267 })->prio (1); 2792 })->prio (1);
2268} 2793}
2269 2794
2270=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2271 2796
2291} 2816}
2292 2817
2293sub prepare_random_map { 2818sub prepare_random_map {
2294 my ($exit) = @_; 2819 my ($exit) = @_;
2295 2820
2296 my $guard = cf::lock_acquire "exit_prepare:$exit";
2297
2298 # all this does is basically replace the /! path by 2821 # all this does is basically replace the /! path by
2299 # a new random map path (?random/...) with a seed 2822 # a new random map path (?random/...) with a seed
2300 # that depends on the exit object 2823 # that depends on the exit object
2301 2824
2302 my $rmp = parse_random_map_params $exit->msg; 2825 my $rmp = parse_random_map_params $exit->msg;
2304 if ($exit->map) { 2827 if ($exit->map) {
2305 $rmp->{region} = $exit->region->name; 2828 $rmp->{region} = $exit->region->name;
2306 $rmp->{origin_map} = $exit->map->path; 2829 $rmp->{origin_map} = $exit->map->path;
2307 $rmp->{origin_x} = $exit->x; 2830 $rmp->{origin_x} = $exit->x;
2308 $rmp->{origin_y} = $exit->y; 2831 $rmp->{origin_y} = $exit->y;
2832
2833 $exit->map->touch;
2309 } 2834 }
2310 2835
2311 $rmp->{random_seed} ||= $exit->random_seed; 2836 $rmp->{random_seed} ||= $exit->random_seed;
2312 2837
2313 my $data = cf::to_json $rmp; 2838 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2314 my $md5 = Digest::MD5::md5_hex $data; 2839 my $md5 = Digest::MD5::md5_hex $data;
2315 my $meta = "$RANDOMDIR/$md5.meta"; 2840 my $meta = "$RANDOMDIR/$md5.meta";
2316 2841
2317 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2842 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2318 aio_write $fh, 0, (length $data), $data, 0; 2843 aio_write $fh, 0, (length $data), $data, 0;
2319 undef $fh; 2844 undef $fh;
2320 aio_rename "$meta~", $meta; 2845 aio_rename "$meta~", $meta;
2321 2846
2847 my $slaying = "?random/$md5";
2848
2849 if ($exit->valid) {
2322 $exit->slaying ("?random/$md5"); 2850 $exit->slaying ("?random/$md5");
2323 $exit->msg (undef); 2851 $exit->msg (undef);
2852 }
2324 } 2853 }
2325} 2854}
2326 2855
2327sub cf::object::player::enter_exit { 2856sub cf::object::player::enter_exit {
2328 my ($self, $exit) = @_; 2857 my ($self, $exit) = @_;
2329 2858
2330 return unless $self->type == cf::PLAYER; 2859 return unless $self->type == cf::PLAYER;
2331 2860
2332 if ($exit->slaying eq "/!") {
2333 #TODO: this should de-fi-ni-te-ly not be a sync-job
2334 # the problem is that $exit might not survive long enough
2335 # so it needs to be done right now, right here
2336 cf::sync_job { prepare_random_map $exit };
2337 }
2338
2339 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2340 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp;
2342
2343 $self->enter_link; 2861 $self->enter_link;
2344 2862
2345 (async { 2863 (async {
2346 $self->deactivate_recursive; # just to be sure 2864 $Coro::current->{desc} = "enter_exit";
2865
2347 unless (eval { 2866 unless (eval {
2867 $self->deactivate_recursive; # just to be sure
2868
2869 # random map handling
2870 {
2871 my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873 prepare_random_map $exit
2874 if $exit->slaying eq "/!";
2875 }
2876
2877 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2878 my $x = $exit->stats->hp;
2879 my $y = $exit->stats->sp;
2880
2348 $self->goto ($slaying, $hp, $sp); 2881 $self->goto ($map, $x, $y);
2349 2882
2883 # if exit is damned, update players death & WoR home-position
2884 $self->contr->savebed ($map, $x, $y)
2885 if $exit->flag (cf::FLAG_DAMNED);
2886
2350 1; 2887 1
2351 }) { 2888 }) {
2352 $self->message ("Something went wrong deep within the crossfire server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2353 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2354 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2355 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2356 2893
2357 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2358 $self->leave_link; 2895 $self->leave_link;
2359 } 2896 }
2360 })->prio (1); 2897 })->prio (1);
2361} 2898}
2362 2899
2376 2913
2377 utf8::encode $text; 2914 utf8::encode $text;
2378 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2379} 2916}
2380 2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2941}
2942
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2944
2383Send a drawinfo or msg packet to the client, formatting the msg for the 2945Send a drawinfo or msg packet to the client, formatting the msg for the
2384client if neccessary. C<$type> should be a string identifying the type of 2946client if neccessary. C<$type> should be a string identifying the type of
2385the message, with C<log> being the default. If C<$color> is negative, suppress 2947the message, with C<log> being the default. If C<$color> is negative, suppress
2386the message unless the client supports the msg packet. 2948the message unless the client supports the msg packet.
2387 2949
2388=cut 2950=cut
2389 2951
2952# non-persistent channels (usually the info channel)
2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2960 "c/identify" => {
2961 id => "infobox",
2962 title => "Identify",
2963 reply => undef,
2964 tooltip => "Items recently identified",
2965 },
2966 "c/examine" => {
2967 id => "infobox",
2968 title => "Examine",
2969 reply => undef,
2970 tooltip => "Signs and other items you examined",
2971 },
2972 "c/shopinfo" => {
2973 id => "infobox",
2974 title => "Shop Info",
2975 reply => undef,
2976 tooltip => "What your bargaining skill tells you about the shop",
2977 },
2978 "c/book" => {
2979 id => "infobox",
2980 title => "Book",
2981 reply => undef,
2982 tooltip => "The contents of a note or book",
2983 },
2984 "c/lookat" => {
2985 id => "infobox",
2986 title => "Look",
2987 reply => undef,
2988 tooltip => "What you saw there",
2989 },
2990 "c/who" => {
2991 id => "infobox",
2992 title => "Players",
2993 reply => undef,
2994 tooltip => "Shows players who are currently online",
2995 },
2996 "c/body" => {
2997 id => "infobox",
2998 title => "Body Parts",
2999 reply => undef,
3000 tooltip => "Shows which body parts you posess and are available",
3001 },
3002 "c/statistics" => {
3003 id => "infobox",
3004 title => "Statistics",
3005 reply => undef,
3006 tooltip => "Shows your primary statistics",
3007 },
3008 "c/skills" => {
3009 id => "infobox",
3010 title => "Skills",
3011 reply => undef,
3012 tooltip => "Shows your experience per skill and item power",
3013 },
3014 "c/shopitems" => {
3015 id => "infobox",
3016 title => "Shop Items",
3017 reply => undef,
3018 tooltip => "Shows the items currently for sale in this shop",
3019 },
3020 "c/resistances" => {
3021 id => "infobox",
3022 title => "Resistances",
3023 reply => undef,
3024 tooltip => "Shows your resistances",
3025 },
3026 "c/pets" => {
3027 id => "infobox",
3028 title => "Pets",
3029 reply => undef,
3030 tooltip => "Shows information abotu your pets/a specific pet",
3031 },
3032 "c/perceiveself" => {
3033 id => "infobox",
3034 title => "Perceive Self",
3035 reply => undef,
3036 tooltip => "You gained detailed knowledge about yourself",
3037 },
3038 "c/uptime" => {
3039 id => "infobox",
3040 title => "Uptime",
3041 reply => undef,
3042 tooltip => "How long the server has been running since last restart",
3043 },
3044 "c/mapinfo" => {
3045 id => "infobox",
3046 title => "Map Info",
3047 reply => undef,
3048 tooltip => "Information related to the maps",
3049 },
3050 "c/party" => {
3051 id => "party",
3052 title => "Party",
3053 reply => "gsay ",
3054 tooltip => "Messages and chat related to your party",
3055 },
3056 "c/death" => {
3057 id => "death",
3058 title => "Death",
3059 reply => undef,
3060 tooltip => "Reason for and more info about your most recent death",
3061 },
3062 "c/say" => $SAY_CHANNEL,
3063 "c/chat" => $CHAT_CHANNEL,
3064);
3065
2390sub cf::client::send_msg { 3066sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 3067 my ($self, $channel, $msg, $color, @extra) = @_;
2392 3068
2393 $msg = $self->pl->expand_cfpod ($msg); 3069 $msg = $self->pl->expand_cfpod ($msg)
3070 unless $color & cf::NDI_VERBATIM;
2394 3071
2395 if ($self->can_msg) { 3072 $color &= cf::NDI_CLIENT_MASK; # just in case...
2396 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2397 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407 3073
2408 if ($color >= 0) { 3074 # check predefined channels, for the benefit of C
2409 if (0 && $msg =~ /\[/) { 3075 if ($CHANNEL{$channel}) {
2410 $self->send_packet ("drawextinfo $color 4 0 $msg") 3076 $channel = $CHANNEL{$channel};
2411 } else { 3077
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 3078 $self->ext_msg (channel_info => $channel);
2413 $self->send_packet ("drawinfo $color $msg") 3079 $channel = $channel->{id};
3080
3081 } elsif (ref $channel) {
3082 # send meta info to client, if not yet sent
3083 unless (exists $self->{channel}{$channel->{id}}) {
3084 $self->{channel}{$channel->{id}} = $channel;
3085 $self->ext_msg (channel_info => $channel);
2414 } 3086 }
2415 }
2416 }
2417}
2418 3087
3088 $channel = $channel->{id};
3089 }
3090
3091 return unless @extra || length $msg;
3092
3093 # default colour, mask it out
3094 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
3095 if $color & cf::NDI_DEF;
3096
3097 my $pkt = "msg "
3098 . $self->{json_coder}->encode (
3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
3100 );
3101
3102 $self->send_big_packet ($pkt);
3103}
3104
2419=item $client->ext_event ($type, %msg) 3105=item $client->ext_msg ($type, @msg)
2420 3106
2421Sends an ext event to the client. 3107Sends an ext event to the client.
2422 3108
2423=cut 3109=cut
2424 3110
2425sub cf::client::ext_event($$%) { 3111sub cf::client::ext_msg($$@) {
2426 my ($self, $type, %msg) = @_; 3112 my ($self, $type, @msg) = @_;
2427 3113
3114 if ($self->extcmd == 2) {
3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3116 } elsif ($self->extcmd == 1) { # TODO: remove
2428 $msg{msgtype} = "event_$type"; 3117 push @msg, msgtype => "event_$type";
2429 $self->send_packet ("ext " . cf::to_json \%msg); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3119 }
3120}
3121
3122=item $client->ext_reply ($msgid, @msg)
3123
3124Sends an ext reply to the client.
3125
3126=cut
3127
3128sub cf::client::ext_reply($$@) {
3129 my ($self, $id, @msg) = @_;
3130
3131 if ($self->extcmd == 2) {
3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3133 } elsif ($self->extcmd == 1) {
3134 #TODO: version 1, remove
3135 unshift @msg, msgtype => "reply", msgid => $id;
3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3137 }
2430} 3138}
2431 3139
2432=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2433 3141
2434Queues a query to the client, calling the given callback with 3142Queues a query to the client, calling the given callback with
2457 3165
2458 1 3166 1
2459} 3167}
2460 3168
2461cf::client->attach ( 3169cf::client->attach (
3170 on_connect => sub {
3171 my ($ns) = @_;
3172
3173 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3174 },
2462 on_reply => sub { 3175 on_reply => sub {
2463 my ($ns, $msg) = @_; 3176 my ($ns, $msg) = @_;
2464 3177
2465 # this weird shuffling is so that direct followup queries 3178 # this weird shuffling is so that direct followup queries
2466 # get handled first 3179 # get handled first
2481 } 3194 }
2482 }, 3195 },
2483 on_exticmd => sub { 3196 on_exticmd => sub {
2484 my ($ns, $buf) = @_; 3197 my ($ns, $buf) = @_;
2485 3198
2486 my $msg = eval { from_json $buf }; 3199 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2487 3200
2488 if (ref $msg) { 3201 if (ref $msg) {
3202 my ($type, $reply, @payload) =
3203 "ARRAY" eq ref $msg
3204 ? @$msg
3205 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3206
3207 my @reply;
3208
2489 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3209 if (my $cb = $EXTICMD{$type}) {
2490 if (my %reply = $cb->($ns, $msg)) { 3210 @reply = $cb->($ns, @payload);
2491 $reply{msgid} = $msg->{msgid};
2492 $ns->send ("ext " . cf::to_json \%reply);
2493 }
2494 } 3211 }
3212
3213 $ns->ext_reply ($reply, @reply)
3214 if $reply;
3215
2495 } else { 3216 } else {
2496 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2497 } 3218 }
2498 3219
2499 cf::override; 3220 cf::override;
2500 }, 3221 },
2501); 3222);
2521 3242
2522 $coro 3243 $coro
2523} 3244}
2524 3245
2525cf::client->attach ( 3246cf::client->attach (
2526 on_destroy => sub { 3247 on_client_destroy => sub {
2527 my ($ns) = @_; 3248 my ($ns) = @_;
2528 3249
2529 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2530 }, 3251 },
2531); 3252);
2546our $safe = new Safe "safe"; 3267our $safe = new Safe "safe";
2547our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
2548 3269
2549$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
2550 3271
2551$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3272$safe->permit_only (Opcode::opset qw(
3273 :base_core :base_mem :base_orig :base_math :base_loop
3274 grepstart grepwhile mapstart mapwhile
3275 sort time
3276));
2552 3277
2553# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
2554 3279
2555=pod 3280=pod
2556 3281
2557The following functions and methods are available within a safe environment: 3282The following functions and methods are available within a safe environment:
2558 3283
2559 cf::object contr pay_amount pay_player map 3284 cf::object
3285 contr pay_amount pay_player map x y force_find force_add destroy
3286 insert remove name archname title slaying race decrease split
3287 value
3288
2560 cf::object::player player 3289 cf::object::player
2561 cf::player peaceful 3290 player
2562 cf::map trigger 3291
3292 cf::player
3293 peaceful
3294
3295 cf::map
3296 trigger
2563 3297
2564=cut 3298=cut
2565 3299
2566for ( 3300for (
2567 ["cf::object" => qw(contr pay_amount pay_player map)], 3301 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3302 insert remove inv nrof name archname title slaying race
3303 decrease split destroy change_exp value msg lore send_msg)],
2568 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
2569 ["cf::player" => qw(peaceful)], 3305 ["cf::player" => qw(peaceful send_msg)],
2570 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
2571) { 3307) {
2572 no strict 'refs';
2573 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
2574 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2575 for @funs; 3310 for @funs;
2576} 3311}
2577 3312
2592 3327
2593 my $qcode = $code; 3328 my $qcode = $code;
2594 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2595 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
2596 3331
3332 %vars = (_dummy => 0) unless %vars;
3333
3334 my @res;
2597 local $_; 3335 local $_;
2598 local @safe::cf::_safe_eval_args = values %vars;
2599 3336
2600 my $eval = 3337 my $eval =
2601 "do {\n" 3338 "do {\n"
2602 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2603 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
2604 . $code 3341 . $code
2605 . "\n}" 3342 . "\n}"
2606 ; 3343 ;
2607 3344
3345 if ($CFG{safe_eval}) {
2608 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
2609 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2610 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
2611 3354
2612 if ($@) { 3355 if ($@) {
2613 warn "$@"; 3356 warn "$@",
2614 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
2615 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
2616 } 3359 }
2617 3360
2618 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
2619} 3362}
2620 3363
2634=cut 3377=cut
2635 3378
2636sub register_script_function { 3379sub register_script_function {
2637 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
2638 3381
2639 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
2640 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
2641} 3384}
2642 3385
2643=back 3386=back
2644 3387
2645=cut 3388=cut
2648# the server's init and main functions 3391# the server's init and main functions
2649 3392
2650sub load_facedata($) { 3393sub load_facedata($) {
2651 my ($path) = @_; 3394 my ($path) = @_;
2652 3395
3396 # HACK to clear player env face cache, we need some signal framework
3397 # for this (global event?)
3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3399
3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3401
2653 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
2654 3403
2655 my $facedata;
2656 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
2657 or die "$path: $!"; 3405 or die "$path: $!";
2658 3406
2659 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
2660 3408
2661 $facedata->{version} == 2 3409 $facedata->{version} == 2
2662 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
2663 3411
3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3414 $facedata->{resource}{"res/exp_table"} = {
3415 type => FT_RSRC,
3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3418 };
3419 cf::cede_to_tick;
3420
2664 { 3421 {
2665 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
2666 3423
2667 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
2668 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3426
2669 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3428 cf::face::set_magicmap $idx, $info->{magicmap};
2670 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2671 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2672 Coro::cede; 3431
3432 cf::cede_to_tick;
2673 } 3433 }
2674 3434
2675 while (my ($face, $info) = each %$faces) { 3435 while (my ($face, $info) = each %$faces) {
2676 next unless $info->{smooth}; 3436 next unless $info->{smooth};
3437
2677 my $idx = cf::face::find $face 3438 my $idx = cf::face::find $face
2678 or next; 3439 or next;
3440
2679 if (my $smooth = cf::face::find $info->{smooth}) { 3441 if (my $smooth = cf::face::find $info->{smooth}) {
3442 cf::face::set_smooth $idx, $smooth;
2680 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3443 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2681 } else { 3444 } else {
2682 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3445 error "smooth face '$info->{smooth}' not found for face '$face'";
2683 } 3446 }
2684 Coro::cede; 3447
3448 cf::cede_to_tick;
2685 } 3449 }
2686 } 3450 }
2687 3451
2688 { 3452 {
2689 my $anims = $facedata->{animinfo}; 3453 my $anims = $facedata->{animinfo};
2690 3454
2691 while (my ($anim, $info) = each %$anims) { 3455 while (my ($anim, $info) = each %$anims) {
2692 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3456 cf::anim::set $anim, $info->{frames}, $info->{facings};
2693 Coro::cede; 3457 cf::cede_to_tick;
2694 } 3458 }
2695 3459
2696 cf::anim::invalidate_all; # d'oh 3460 cf::anim::invalidate_all; # d'oh
2697 } 3461 }
2698 3462
3463 {
3464 my $res = $facedata->{resource};
3465
3466 while (my ($name, $info) = each %$res) {
3467 if (defined $info->{type}) {
3468 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3469
3470 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3471 cf::face::set_type $idx, $info->{type};
3472 } else {
3473 $RESOURCE{$name} = $info; # unused
3474 }
3475
3476 cf::cede_to_tick;
3477 }
3478 }
3479
3480 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3481
2699 1 3482 1
2700} 3483}
2701 3484
3485register_exticmd fx_want => sub {
3486 my ($ns, $want) = @_;
3487
3488 while (my ($k, $v) = each %$want) {
3489 $ns->fx_want ($k, $v);
3490 }
3491};
3492
3493sub load_resource_file($) {
3494 my $guard = lock_acquire "load_resource_file";
3495
3496 my $status = load_resource_file_ $_[0];
3497 get_slot 0.1, 100;
3498 cf::arch::commit_load;
3499
3500 $status
3501}
3502
2702sub reload_regions { 3503sub reload_regions {
3504 # HACK to clear player env face cache, we need some signal framework
3505 # for this (global event?)
3506 %ext::player_env::MUSIC_FACE_CACHE = ();
3507
2703 load_resource_file "$MAPDIR/regions" 3508 load_resource_file "$MAPDIR/regions"
2704 or die "unable to load regions file\n"; 3509 or die "unable to load regions file\n";
3510
3511 for (cf::region::list) {
3512 $_->{match} = qr/$_->{match}/
3513 if exists $_->{match};
3514 }
2705} 3515}
2706 3516
2707sub reload_facedata { 3517sub reload_facedata {
2708 load_facedata "$DATADIR/facedata" 3518 load_facedata "$DATADIR/facedata"
2709 or die "unable to load facedata\n"; 3519 or die "unable to load facedata\n";
2710} 3520}
2711 3521
2712sub reload_archetypes { 3522sub reload_archetypes {
2713 load_resource_file "$DATADIR/archetypes" 3523 load_resource_file "$DATADIR/archetypes"
2714 or die "unable to load archetypes\n"; 3524 or die "unable to load archetypes\n";
2715 #d# NEED to laod twice to resolve forward references
2716 # this really needs to be done in an extra post-pass
2717 # (which needs to be synchronous, so solve it differently)
2718 load_resource_file "$DATADIR/archetypes"
2719 or die "unable to load archetypes\n";
2720} 3525}
2721 3526
2722sub reload_treasures { 3527sub reload_treasures {
2723 load_resource_file "$DATADIR/treasures" 3528 load_resource_file "$DATADIR/treasures"
2724 or die "unable to load treasurelists\n"; 3529 or die "unable to load treasurelists\n";
2725} 3530}
2726 3531
3532sub reload_sound {
3533 trace "loading sound config from $DATADIR/sound\n";
3534
3535 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3536 or die "$DATADIR/sound $!";
3537
3538 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3539
3540 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3541 my $sound = $soundconf->{compat}[$_]
3542 or next;
3543
3544 my $face = cf::face::find "sound/$sound->[1]";
3545 cf::sound::set $sound->[0] => $face;
3546 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3547 }
3548
3549 while (my ($k, $v) = each %{$soundconf->{event}}) {
3550 my $face = cf::face::find "sound/$v";
3551 cf::sound::set $k => $face;
3552 }
3553}
3554
2727sub reload_resources { 3555sub reload_resources {
2728 warn "reloading resource files...\n"; 3556 trace "reloading resource files...\n";
2729 3557
3558 reload_exp_table;
3559 reload_materials;
3560 reload_facedata;
3561 reload_sound;
3562 reload_archetypes;
2730 reload_regions; 3563 reload_regions;
2731 reload_facedata;
2732 #reload_archetypes;#d#
2733 reload_archetypes;
2734 reload_treasures; 3564 reload_treasures;
2735 3565
2736 warn "finished reloading resource files\n"; 3566 trace "finished reloading resource files\n";
2737} 3567}
2738 3568
2739sub init { 3569sub reload_config {
2740 reload_resources; 3570 trace "reloading config file...\n";
2741}
2742 3571
2743sub cfg_load { 3572 0 < aio_load "$CONFDIR/config", my $config
2744 open my $fh, "<:utf8", "$CONFDIR/config" 3573 or die "$CONFDIR/config: $!";
2745 or return;
2746 3574
2747 local $/; 3575 utf8::decode $config;
2748 *CFG = YAML::Syck::Load <$fh>; 3576 *CFG = yaml_load $config;
2749 3577
2750 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3578 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2751 3579
2752 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3580 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2753 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3581 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2754 3582
2755 if (exists $CFG{mlockall}) { 3583 if (exists $CFG{mlockall}) {
2759 }; 3587 };
2760 warn $@ if $@; 3588 warn $@ if $@;
2761 } 3589 }
2762} 3590}
2763 3591
3592sub pidfile() {
3593 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3594 or die "$PIDFILE: $!";
3595 flock $fh, &Fcntl::LOCK_EX
3596 or die "$PIDFILE: flock: $!";
3597 $fh
3598}
3599
3600# make sure only one server instance is running at any one time
3601sub atomic {
3602 my $fh = pidfile;
3603
3604 my $pid = <$fh>;
3605 kill 9, $pid if $pid > 0;
3606
3607 seek $fh, 0, 0;
3608 print $fh $$;
3609}
3610
3611sub main_loop {
3612 trace "EV::loop starting\n";
3613 if (1) {
3614 EV::loop;
3615 }
3616 trace "EV::loop returned\n";
3617 goto &main_loop unless $REALLY_UNLOOP;
3618}
3619
2764sub main { 3620sub main {
3621 cf::init_globals; # initialise logging
3622
3623 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3624 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3625 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3626 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3627
3628 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3629
2765 # we must not ever block the main coroutine 3630 # we must not ever block the main coroutine
2766 local $Coro::idle = sub { 3631 local $Coro::idle = sub {
2767 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3632 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2768 (async { 3633 (async {
2769 Event::one_event; 3634 $Coro::current->{desc} = "IDLE BUG HANDLER";
3635 EV::loop EV::LOOP_ONESHOT;
2770 })->prio (Coro::PRIO_MAX); 3636 })->prio (Coro::PRIO_MAX);
2771 }; 3637 };
2772 3638
2773 cfg_load; 3639 evthread_start IO::AIO::poll_fileno;
3640
3641 cf::sync_job {
3642 cf::incloader::init ();
3643
3644 cf::init_anim;
3645 cf::init_attackmess;
3646 cf::init_dynamic;
3647
3648 cf::load_settings;
3649
3650 reload_resources;
3651 reload_config;
2774 db_init; 3652 db_init;
3653
3654 cf::init_uuid;
3655 cf::init_signals;
3656 cf::init_skills;
3657
3658 cf::init_beforeplay;
3659
3660 atomic;
3661
2775 load_extensions; 3662 load_extensions;
2776 3663
2777 $TICK_WATCHER->start; 3664 utime time, time, $RUNTIMEFILE;
2778 Event::loop; 3665
3666 # no (long-running) fork's whatsoever before this point(!)
3667 use POSIX ();
3668 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3669
3670 cf::_post_init 0;
3671 };
3672
3673 cf::object::thawer::errors_are_fatal 0;
3674 info "parse errors in files are no longer fatal from this point on.\n";
3675
3676 my $free_main; $free_main = EV::idle sub {
3677 undef $free_main;
3678 undef &main; # free gobs of memory :)
3679 };
3680
3681 goto &main_loop;
2779} 3682}
2780 3683
2781############################################################################# 3684#############################################################################
2782# initialisation and cleanup 3685# initialisation and cleanup
2783 3686
2784# install some emergency cleanup handlers 3687# install some emergency cleanup handlers
2785BEGIN { 3688BEGIN {
3689 our %SIGWATCHER = ();
2786 for my $signal (qw(INT HUP TERM)) { 3690 for my $signal (qw(INT HUP TERM)) {
2787 Event->signal ( 3691 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2788 reentrant => 0,
2789 data => WF_AUTOCANCEL,
2790 signal => $signal,
2791 prio => 0,
2792 cb => sub {
2793 cf::cleanup "SIG$signal"; 3692 cf::cleanup "SIG$signal";
2794 },
2795 ); 3693 };
2796 } 3694 }
2797} 3695}
2798 3696
2799sub write_runtime { 3697sub write_runtime_sync {
2800 my $runtime = "$LOCALDIR/runtime"; 3698 my $t0 = AE::time;
2801 3699
2802 # first touch the runtime file to show we are still running: 3700 # first touch the runtime file to show we are still running:
2803 # the fsync below can take a very very long time. 3701 # the fsync below can take a very very long time.
2804 3702
2805 IO::AIO::aio_utime $runtime, undef, undef; 3703 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2806 3704
2807 my $guard = cf::lock_acquire "write_runtime"; 3705 my $guard = cf::lock_acquire "write_runtime";
2808 3706
2809 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3707 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2810 or return; 3708 or return;
2811 3709
2812 my $value = $cf::RUNTIME + 90 + 10; 3710 my $value = $cf::RUNTIME + 90 + 10;
2813 # 10 is the runtime save interval, for a monotonic clock 3711 # 10 is the runtime save interval, for a monotonic clock
2814 # 60 allows for the watchdog to kill the server. 3712 # 60 allows for the watchdog to kill the server.
2824 aio_utime $fh, undef, undef; 3722 aio_utime $fh, undef, undef;
2825 3723
2826 close $fh 3724 close $fh
2827 or return; 3725 or return;
2828 3726
2829 aio_rename "$runtime~", $runtime 3727 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2830 and return; 3728 and return;
2831 3729
2832 warn "runtime file written.\n"; 3730 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2833 3731
2834 1 3732 1
3733}
3734
3735our $uuid_lock;
3736our $uuid_skip;
3737
3738sub write_uuid_sync($) {
3739 $uuid_skip ||= $_[0];
3740
3741 return if $uuid_lock;
3742 local $uuid_lock = 1;
3743
3744 my $uuid = "$LOCALDIR/uuid";
3745
3746 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3747 or return;
3748
3749 my $value = uuid_seq uuid_cur;
3750
3751 unless ($value) {
3752 info "cowardly refusing to write zero uuid value!\n";
3753 return;
3754 }
3755
3756 my $value = uuid_str $value + $uuid_skip;
3757 $uuid_skip = 0;
3758
3759 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3760 and return;
3761
3762 # always fsync - this file is important
3763 aio_fsync $fh
3764 and return;
3765
3766 close $fh
3767 or return;
3768
3769 aio_rename "$uuid~", $uuid
3770 and return;
3771
3772 trace "uuid file written ($value).\n";
3773
3774 1
3775
3776}
3777
3778sub write_uuid($$) {
3779 my ($skip, $sync) = @_;
3780
3781 $sync ? write_uuid_sync $skip
3782 : async { write_uuid_sync $skip };
2835} 3783}
2836 3784
2837sub emergency_save() { 3785sub emergency_save() {
2838 my $freeze_guard = cf::freeze_mainloop; 3786 my $freeze_guard = cf::freeze_mainloop;
2839 3787
2840 warn "enter emergency perl save\n"; 3788 info "emergency_perl_save: enter\n";
3789
3790 # this is a trade-off: we want to be very quick here, so
3791 # save all maps without fsync, and later call a global sync
3792 # (which in turn might be very very slow)
3793 local $USE_FSYNC = 0;
2841 3794
2842 cf::sync_job { 3795 cf::sync_job {
3796 cf::write_runtime_sync; # external watchdog should not bark
3797
2843 # use a peculiar iteration method to avoid tripping on perl 3798 # use a peculiar iteration method to avoid tripping on perl
2844 # refcount bugs in for. also avoids problems with players 3799 # refcount bugs in for. also avoids problems with players
2845 # and maps saved/destroyed asynchronously. 3800 # and maps saved/destroyed asynchronously.
2846 warn "begin emergency player save\n"; 3801 info "emergency_perl_save: begin player save\n";
2847 for my $login (keys %cf::PLAYER) { 3802 for my $login (keys %cf::PLAYER) {
2848 my $pl = $cf::PLAYER{$login} or next; 3803 my $pl = $cf::PLAYER{$login} or next;
2849 $pl->valid or next; 3804 $pl->valid or next;
3805 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2850 $pl->save; 3806 $pl->save;
2851 } 3807 }
2852 warn "end emergency player save\n"; 3808 info "emergency_perl_save: end player save\n";
2853 3809
2854 warn "begin emergency map save\n"; 3810 cf::write_runtime_sync; # external watchdog should not bark
3811
3812 info "emergency_perl_save: begin map save\n";
2855 for my $path (keys %cf::MAP) { 3813 for my $path (keys %cf::MAP) {
2856 my $map = $cf::MAP{$path} or next; 3814 my $map = $cf::MAP{$path} or next;
2857 $map->valid or next; 3815 $map->valid or next;
2858 $map->save; 3816 $map->save;
2859 } 3817 }
2860 warn "end emergency map save\n"; 3818 info "emergency_perl_save: end map save\n";
2861 3819
2862 warn "begin emergency database checkpoint\n"; 3820 cf::write_runtime_sync; # external watchdog should not bark
3821
3822 info "emergency_perl_save: begin database checkpoint\n";
2863 BDB::db_env_txn_checkpoint $DB_ENV; 3823 BDB::db_env_txn_checkpoint $DB_ENV;
2864 warn "end emergency database checkpoint\n"; 3824 info "emergency_perl_save: end database checkpoint\n";
3825
3826 info "emergency_perl_save: begin write uuid\n";
3827 write_uuid_sync 1;
3828 info "emergency_perl_save: end write uuid\n";
3829
3830 cf::write_runtime_sync; # external watchdog should not bark
3831
3832 trace "emergency_perl_save: syncing database to disk";
3833 BDB::db_env_txn_checkpoint $DB_ENV;
3834
3835 info "emergency_perl_save: starting sync\n";
3836 IO::AIO::aio_sync sub {
3837 info "emergency_perl_save: finished sync\n";
3838 };
3839
3840 cf::write_runtime_sync; # external watchdog should not bark
3841
3842 trace "emergency_perl_save: flushing outstanding aio requests";
3843 while (IO::AIO::nreqs || BDB::nreqs) {
3844 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3845 }
3846
3847 cf::write_runtime_sync; # external watchdog should not bark
2865 }; 3848 };
2866 3849
2867 warn "leave emergency perl save\n"; 3850 info "emergency_perl_save: leave\n";
2868} 3851}
2869 3852
2870sub post_cleanup { 3853sub post_cleanup {
2871 my ($make_core) = @_; 3854 my ($make_core) = @_;
2872 3855
3856 IO::AIO::flush;
3857
2873 warn Carp::longmess "post_cleanup backtrace" 3858 error Carp::longmess "post_cleanup backtrace"
2874 if $make_core; 3859 if $make_core;
3860
3861 my $fh = pidfile;
3862 unlink $PIDFILE if <$fh> == $$;
3863}
3864
3865# a safer delete_package, copied from Symbol
3866sub clear_package($) {
3867 my $pkg = shift;
3868
3869 # expand to full symbol table name if needed
3870 unless ($pkg =~ /^main::.*::$/) {
3871 $pkg = "main$pkg" if $pkg =~ /^::/;
3872 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3873 $pkg .= '::' unless $pkg =~ /::$/;
3874 }
3875
3876 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3877 my $stem_symtab = *{$stem}{HASH};
3878
3879 defined $stem_symtab and exists $stem_symtab->{$leaf}
3880 or return;
3881
3882 # clear all symbols
3883 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3884 for my $name (keys %$leaf_symtab) {
3885 _gv_clear *{"$pkg$name"};
3886# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3887 }
2875} 3888}
2876 3889
2877sub do_reload_perl() { 3890sub do_reload_perl() {
2878 # can/must only be called in main 3891 # can/must only be called in main
2879 if ($Coro::current != $Coro::main) { 3892 unless (in_main) {
2880 warn "can only reload from main coroutine"; 3893 error "can only reload from main coroutine";
2881 return; 3894 return;
2882 } 3895 }
2883 3896
2884 warn "reloading..."; 3897 return if $RELOAD++;
2885 3898
2886 warn "entering sync_job"; 3899 my $t1 = AE::time;
2887 3900
3901 while ($RELOAD) {
3902 cf::get_slot 0.1, -1, "reload_perl";
3903 info "perl_reload: reloading...";
3904
3905 trace "perl_reload: entering sync_job";
3906
2888 cf::sync_job { 3907 cf::sync_job {
2889 cf::write_runtime; # external watchdog should not bark
2890 cf::emergency_save; 3908 #cf::emergency_save;
2891 cf::write_runtime; # external watchdog should not bark
2892 3909
2893 warn "syncing database to disk";
2894 BDB::db_env_txn_checkpoint $DB_ENV;
2895
2896 # if anything goes wrong in here, we should simply crash as we already saved
2897
2898 warn "cancelling all WF_AUTOCANCEL watchers";
2899 for (Event::all_watchers) {
2900 $_->cancel if $_->data & WF_AUTOCANCEL;
2901 }
2902
2903 warn "flushing outstanding aio requests";
2904 for (;;) {
2905 BDB::flush;
2906 IO::AIO::flush;
2907 Coro::cede;
2908 last unless IO::AIO::nreqs || BDB::nreqs;
2909 warn "iterate...";
2910 }
2911
2912 ++$RELOAD;
2913
2914 warn "cancelling all extension coros"; 3910 trace "perl_reload: cancelling all extension coros";
2915 $_->cancel for values %EXT_CORO; 3911 $_->cancel for values %EXT_CORO;
2916 %EXT_CORO = (); 3912 %EXT_CORO = ();
2917 3913
2918 warn "removing commands"; 3914 trace "perl_reload: removing commands";
2919 %COMMAND = (); 3915 %COMMAND = ();
2920 3916
2921 warn "removing ext/exti commands"; 3917 trace "perl_reload: removing ext/exti commands";
2922 %EXTCMD = (); 3918 %EXTCMD = ();
2923 %EXTICMD = (); 3919 %EXTICMD = ();
2924 3920
2925 warn "unloading/nuking all extensions"; 3921 trace "perl_reload: unloading/nuking all extensions";
2926 for my $pkg (@EXTS) { 3922 for my $pkg (@EXTS) {
2927 warn "... unloading $pkg"; 3923 trace "... unloading $pkg";
2928 3924
2929 if (my $cb = $pkg->can ("unload")) { 3925 if (my $cb = $pkg->can ("unload")) {
2930 eval { 3926 eval {
2931 $cb->($pkg); 3927 $cb->($pkg);
2932 1 3928 1
2933 } or warn "$pkg unloaded, but with errors: $@"; 3929 } or error "$pkg unloaded, but with errors: $@";
3930 }
3931
3932 trace "... clearing $pkg";
3933 clear_package $pkg;
2934 } 3934 }
2935 3935
2936 warn "... nuking $pkg";
2937 Symbol::delete_package $pkg;
2938 }
2939
2940 warn "unloading all perl modules loaded from $LIBDIR"; 3936 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
2941 while (my ($k, $v) = each %INC) { 3937 while (my ($k, $v) = each %INC) {
2942 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3938 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2943 3939
2944 warn "... unloading $k"; 3940 trace "... unloading $k";
2945 delete $INC{$k}; 3941 delete $INC{$k};
2946 3942
2947 $k =~ s/\.pm$//; 3943 $k =~ s/\.pm$//;
2948 $k =~ s/\//::/g; 3944 $k =~ s/\//::/g;
2949 3945
2950 if (my $cb = $k->can ("unload_module")) { 3946 if (my $cb = $k->can ("unload_module")) {
2951 $cb->(); 3947 $cb->();
3948 }
3949
3950 clear_package $k;
2952 } 3951 }
2953 3952
2954 Symbol::delete_package $k;
2955 }
2956
2957 warn "getting rid of safe::, as good as possible"; 3953 trace "perl_reload: getting rid of safe::, as good as possible";
2958 Symbol::delete_package "safe::$_" 3954 clear_package "safe::$_"
2959 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3955 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2960 3956
2961 warn "unloading cf.pm \"a bit\""; 3957 trace "perl_reload: unloading cf.pm \"a bit\"";
2962 delete $INC{"cf.pm"}; 3958 delete $INC{"cf.pm"};
2963 delete $INC{"cf/pod.pm"}; 3959 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2964 3960
2965 # don't, removes xs symbols, too, 3961 # don't, removes xs symbols, too,
2966 # and global variables created in xs 3962 # and global variables created in xs
2967 #Symbol::delete_package __PACKAGE__; 3963 #clear_package __PACKAGE__;
2968 3964
2969 warn "unload completed, starting to reload now"; 3965 info "perl_reload: unload completed, starting to reload now";
2970 3966
2971 warn "reloading cf.pm"; 3967 trace "perl_reload: reloading cf.pm";
2972 require cf; 3968 require cf;
2973 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3969 cf::_connect_to_perl_1;
2974 3970
2975 warn "loading config and database again"; 3971 trace "perl_reload: loading config and database again";
2976 cf::cfg_load; 3972 cf::reload_config;
2977 3973
2978 warn "loading extensions"; 3974 trace "perl_reload: loading extensions";
2979 cf::load_extensions; 3975 cf::load_extensions;
2980 3976
3977 if ($REATTACH_ON_RELOAD) {
2981 warn "reattaching attachments to objects/players"; 3978 trace "perl_reload: reattaching attachments to objects/players";
2982 _global_reattach; # objects, sockets 3979 _global_reattach; # objects, sockets
2983 warn "reattaching attachments to maps"; 3980 trace "perl_reload: reattaching attachments to maps";
2984 reattach $_ for values %MAP; 3981 reattach $_ for values %MAP;
2985 warn "reattaching attachments to players"; 3982 trace "perl_reload: reattaching attachments to players";
2986 reattach $_ for values %PLAYER; 3983 reattach $_ for values %PLAYER;
3984 }
2987 3985
2988 warn "leaving sync_job"; 3986 cf::_post_init 1;
2989 3987
3988 trace "perl_reload: leaving sync_job";
3989
2990 1 3990 1
2991 } or do { 3991 } or do {
2992 warn $@; 3992 error $@;
2993 warn "error while reloading, exiting."; 3993 cf::cleanup "perl_reload: error, exiting.";
2994 exit 1; 3994 };
3995
3996 --$RELOAD;
2995 }; 3997 }
2996 3998
2997 warn "reloaded"; 3999 $t1 = AE::time - $t1;
4000 info "perl_reload: completed in ${t1}s\n";
2998}; 4001};
2999 4002
3000our $RELOAD_WATCHER; # used only during reload 4003our $RELOAD_WATCHER; # used only during reload
3001 4004
3002sub reload_perl() { 4005sub reload_perl() {
3003 # doing reload synchronously and two reloads happen back-to-back, 4006 # doing reload synchronously and two reloads happen back-to-back,
3004 # coro crashes during coro_state_free->destroy here. 4007 # coro crashes during coro_state_free->destroy here.
3005 4008
3006 $RELOAD_WATCHER ||= Event->timer ( 4009 $RELOAD_WATCHER ||= cf::async {
3007 reentrant => 0, 4010 Coro::AIO::aio_wait cache_extensions;
3008 after => 0, 4011
3009 data => WF_AUTOCANCEL, 4012 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3010 cb => sub {
3011 do_reload_perl; 4013 do_reload_perl;
3012 undef $RELOAD_WATCHER; 4014 undef $RELOAD_WATCHER;
3013 }, 4015 };
3014 ); 4016 };
3015} 4017}
3016 4018
3017register_command "reload" => sub { 4019register_command "reload" => sub {
3018 my ($who, $arg) = @_; 4020 my ($who, $arg) = @_;
3019 4021
3020 if ($who->flag (FLAG_WIZ)) { 4022 if ($who->flag (FLAG_WIZ)) {
3021 $who->message ("reloading server."); 4023 $who->message ("reloading server.");
4024 async {
4025 $Coro::current->{desc} = "perl_reload";
3022 async { reload_perl }; 4026 reload_perl;
4027 };
3023 } 4028 }
3024}; 4029};
3025 4030
3026unshift @INC, $LIBDIR; 4031#############################################################################
3027 4032
3028my $bug_warning = 0; 4033my $bug_warning = 0;
3029 4034
3030our @WAIT_FOR_TICK; 4035our @WAIT_FOR_TICK;
3031our @WAIT_FOR_TICK_BEGIN; 4036our @WAIT_FOR_TICK_BEGIN;
3032 4037
3033sub wait_for_tick { 4038sub wait_for_tick() {
3034 return unless $TICK_WATCHER->is_active;
3035 return if $Coro::current == $Coro::main; 4039 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3036 4040
3037 my $signal = new Coro::Signal; 4041 my $signal = new Coro::Signal;
3038 push @WAIT_FOR_TICK, $signal; 4042 push @WAIT_FOR_TICK, $signal;
3039 $signal->wait; 4043 $signal->wait;
3040} 4044}
3041 4045
3042sub wait_for_tick_begin { 4046sub wait_for_tick_begin() {
3043 return unless $TICK_WATCHER->is_active;
3044 return if $Coro::current == $Coro::main; 4047 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3045 4048
3046 my $signal = new Coro::Signal; 4049 my $signal = new Coro::Signal;
3047 push @WAIT_FOR_TICK_BEGIN, $signal; 4050 push @WAIT_FOR_TICK_BEGIN, $signal;
3048 $signal->wait; 4051 $signal->wait;
3049} 4052}
3050 4053
3051 my $min = 1e6;#d# 4054sub tick {
3052 my $avg = 10;
3053$TICK_WATCHER = Event->timer (
3054 reentrant => 0,
3055 parked => 1,
3056 prio => 0,
3057 at => $NEXT_TICK || $TICK,
3058 data => WF_AUTOCANCEL,
3059 cb => sub {
3060 if ($Coro::current != $Coro::main) { 4055 if ($Coro::current != $Coro::main) {
3061 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4056 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3062 unless ++$bug_warning > 10; 4057 unless ++$bug_warning > 10;
3063 return; 4058 return;
3064 } 4059 }
3065 4060
3066 $NOW = $tick_start = Event::time;
3067
3068 cf::server_tick; # one server iteration 4061 cf::server_tick; # one server iteration
3069 4062
3070 0 && sync_job {#d# 4063 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3071 for(1..10) {
3072 my $t = Event::time;
3073 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3074 or die;
3075 4064
3076 $map->width (50); 4065 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3077 $map->height (50); 4066 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3078 $map->alloc; 4067 Coro::async_pool {
3079 $map->_load_objects ("/tmp/x.map", 1); 4068 $Coro::current->{desc} = "runtime saver";
3080 my $t = Event::time - $t; 4069 write_runtime_sync
3081 4070 or error "ERROR: unable to write runtime file: $!";
3082 #next unless $t < 0.0013;#d#
3083 if ($t < $min) {
3084 $min = $t;
3085 }
3086 $avg = $avg * 0.99 + $t * 0.01;
3087 }
3088 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3089 exit 0;
3090 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3091 }; 4071 };
4072 }
3092 4073
3093 $RUNTIME += $TICK;
3094 $NEXT_TICK += $TICK;
3095
3096 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3097 $NEXT_RUNTIME_WRITE = $NOW + 10;
3098 Coro::async_pool {
3099 write_runtime
3100 or warn "ERROR: unable to write runtime file: $!";
3101 };
3102 }
3103
3104# my $AFTER = Event::time;
3105# warn $AFTER - $NOW;#d#
3106
3107 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4074 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3108 $sig->send; 4075 $sig->send;
3109 } 4076 }
3110 while (my $sig = shift @WAIT_FOR_TICK) { 4077 while (my $sig = shift @WAIT_FOR_TICK) {
3111 $sig->send; 4078 $sig->send;
3112 } 4079 }
3113 4080
3114 $NOW = Event::time; 4081 $LOAD = ($NOW - $TICK_START) / $TICK;
3115
3116 # if we are delayed by four ticks or more, skip them all
3117 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3118
3119 $TICK_WATCHER->at ($NEXT_TICK);
3120 $TICK_WATCHER->start;
3121
3122 $LOAD = ($NOW - $tick_start) / $TICK;
3123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4082 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3124 4083
3125 _post_tick; 4084 if (0) {
3126 4085 if ($NEXT_TICK) {
3127 4086 my $jitter = $TICK_START - $NEXT_TICK;
4087 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4088 debug "jitter $JITTER\n";#d#
4089 }
3128 }, 4090 }
3129); 4091}
3130 4092
3131{ 4093{
3132 BDB::max_poll_time $TICK * 0.1; 4094 # configure BDB
3133 $BDB_POLL_WATCHER = Event->io ( 4095
3134 reentrant => 0,
3135 fd => BDB::poll_fileno,
3136 poll => 'r',
3137 prio => 0,
3138 data => WF_AUTOCANCEL,
3139 cb => \&BDB::poll_cb,
3140 );
3141 BDB::min_parallel 8; 4096 BDB::min_parallel 16;
3142 4097 BDB::max_poll_reqs $TICK * 0.1;
3143 BDB::set_sync_prepare { 4098 $AnyEvent::BDB::WATCHER->priority (1);
3144 my $status;
3145 my $current = $Coro::current;
3146 (
3147 sub {
3148 $status = $!;
3149 $current->ready; undef $current;
3150 },
3151 sub {
3152 Coro::schedule while defined $current;
3153 $! = $status;
3154 },
3155 )
3156 };
3157 4099
3158 unless ($DB_ENV) { 4100 unless ($DB_ENV) {
3159 $DB_ENV = BDB::db_env_create; 4101 $DB_ENV = BDB::db_env_create;
4102 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4103 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4104 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4105 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4106 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3160 4107
3161 cf::sync_job { 4108 cf::sync_job {
3162 eval { 4109 eval {
3163 BDB::db_env_open 4110 BDB::db_env_open
3164 $DB_ENV, 4111 $DB_ENV,
3166 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4113 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3167 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4114 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3168 0666; 4115 0666;
3169 4116
3170 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4117 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3171
3172 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3173 $DB_ENV->set_lk_detect;
3174 }; 4118 };
3175 4119
3176 cf::cleanup "db_env_open(db): $@" if $@; 4120 cf::cleanup "db_env_open(db): $@" if $@;
3177 }; 4121 };
3178 } 4122 }
4123
4124 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4125 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4126 };
4127 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4128 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4129 };
4130 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4131 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4132 };
3179} 4133}
3180 4134
3181{ 4135{
4136 # configure IO::AIO
4137
3182 IO::AIO::min_parallel 8; 4138 IO::AIO::min_parallel 8;
3183
3184 undef $Coro::AIO::WATCHER;
3185 IO::AIO::max_poll_time $TICK * 0.1; 4139 IO::AIO::max_poll_time $TICK * 0.1;
3186 $AIO_POLL_WATCHER = Event->io ( 4140 undef $AnyEvent::AIO::WATCHER;
3187 reentrant => 0,
3188 data => WF_AUTOCANCEL,
3189 fd => IO::AIO::poll_fileno,
3190 poll => 'r',
3191 prio => 6,
3192 cb => \&IO::AIO::poll_cb,
3193 );
3194} 4141}
3195 4142
3196my $_log_backtrace; 4143our $_log_backtrace;
4144our $_log_backtrace_last;
3197 4145
3198sub _log_backtrace { 4146sub _log_backtrace {
3199 my ($msg, @addr) = @_; 4147 my ($msg, @addr) = @_;
3200 4148
3201 $msg =~ s/\n//; 4149 $msg =~ s/\n$//;
3202 4150
4151 if ($_log_backtrace_last eq $msg) {
4152 LOG llevInfo, "[ABT] $msg\n";
4153 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3203 # limit the # of concurrent backtraces 4154 # limit the # of concurrent backtraces
3204 if ($_log_backtrace < 2) { 4155 } elsif ($_log_backtrace < 2) {
4156 $_log_backtrace_last = $msg;
3205 ++$_log_backtrace; 4157 ++$_log_backtrace;
4158 my $perl_bt = Carp::longmess $msg;
3206 async { 4159 async {
4160 $Coro::current->{desc} = "abt $msg";
4161
3207 my @bt = fork_call { 4162 my @bt = fork_call {
3208 @addr = map { sprintf "%x", $_ } @addr; 4163 @addr = map { sprintf "%x", $_ } @addr;
3209 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4164 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3210 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4165 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3211 or die "addr2line: $!"; 4166 or die "addr2line: $!";
3219 } 4174 }
3220 4175
3221 @funcs 4176 @funcs
3222 }; 4177 };
3223 4178
3224 LOG llevInfo, "[ABT] $msg\n"; 4179 LOG llevInfo, "[ABT] $perl_bt\n";
4180 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3225 LOG llevInfo, "[ABT] $_\n" for @bt; 4181 LOG llevInfo, "[ABT] $_\n" for @bt;
3226 --$_log_backtrace; 4182 --$_log_backtrace;
3227 }; 4183 };
3228 } else { 4184 } else {
3229 LOG llevInfo, "[ABT] $msg\n"; 4185 LOG llevInfo, "[ABT] $msg\n";
3230 LOG llevInfo, "[ABT] [suppressed]\n"; 4186 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3231 } 4187 }
3232} 4188}
3233 4189
3234# load additional modules 4190# load additional modules
3235use cf::pod; 4191require "cf/$_.pm" for @EXTRA_MODULES;
4192cf::_connect_to_perl_2;
3236 4193
3237END { cf::emergency_save } 4194END { cf::emergency_save }
3238 4195
32391 41961
3240 4197

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines