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.276 by root, Sun Jun 10 04:05:47 2007 UTC vs.
Revision 1.512 by root, Sun Apr 11 04:52:07 2010 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines