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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines