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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines