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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines