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.543 by root, Wed May 5 23:23:29 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines