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.301 by root, Tue Jul 10 07:01:51 2007 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines