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.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines