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.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines