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.271 by root, Fri Jun 1 06:04:08 2007 UTC vs.
Revision 1.505 by root, Sun Jan 31 03:46:20 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';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 276@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
277@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 278@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 279
194# we bless all objects into (empty) derived classes to force a method lookup 280# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 281# within the Safe compartment.
196for my $pkg (qw( 282for my $pkg (qw(
197 cf::global cf::attachable 283 cf::global cf::attachable
198 cf::object cf::object::player 284 cf::object cf::object::player
199 cf::client cf::player 285 cf::client cf::player
200 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
201 cf::map cf::party cf::region 288 cf::party cf::region
202)) { 289)) {
203 no strict 'refs';
204 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
205} 291}
206 292
207$Event::DIED = sub { 293$EV::DIED = sub {
208 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
209}; 295};
296
297#############################################################################
210 298
211=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
212 300
213=over 4 301=over 4
214 302
… …
233 $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;
234 $d 322 $d
235 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
236} 324}
237 325
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
241 327
242Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
243 329
244=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
245 331
246Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
247 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
248=item cf::lock_wait $string 355=item cf::lock_wait $string
249 356
250Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
251 358
252=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
253 360
254Wait 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
255a 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,
256for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
257returned. 364returned.
258 365
366Locks are *not* recursive, locking from the same coro twice results in a
367deadlocked coro.
368
259Lock 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
260uses map_find and cf::map::load uses map_load). 370uses map_find and cf::map::load uses map_load).
261 371
262=item $locked = cf::lock_active $string 372=item $locked = cf::lock_active $string
263 373
264Return 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.
265 375
266=cut 376=cut
267 377
268our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
269 379
270sub lock_wait($) { 380sub lock_wait($) {
271 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
272
273 # wait for lock, if any
274 while ($LOCK{$key}) {
275 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule;
277 }
278} 382}
279 383
280sub lock_acquire($) { 384sub lock_acquire($) {
281 my ($key) = @_; 385 $LOCKS->guard ($_[0])
282
283 # wait, to be sure we are not locked
284 lock_wait $key;
285
286 $LOCK{$key} = [];
287
288 Coro::guard {
289 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} };
291 }
292} 386}
293 387
294sub lock_active($) { 388sub lock_active($) {
295 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
296
297 ! ! $LOCK{$key}
298} 390}
299 391
300sub freeze_mainloop { 392sub freeze_mainloop {
301 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
302 394
303 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
304 $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 }
305 }; 462 }
306 $TICK_WATCHER->stop; 463};
307 $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;
308} 478}
309 479
310=item cf::async { BLOCK } 480=item cf::async { BLOCK }
311 481
312Currently the same as Coro::async_pool, meaning you cannot use 482Currently the same as Coro::async_pool, meaning you cannot use
… …
317 487
318BEGIN { *async = \&Coro::async_pool } 488BEGIN { *async = \&Coro::async_pool }
319 489
320=item cf::sync_job { BLOCK } 490=item cf::sync_job { BLOCK }
321 491
322The design of crossfire+ requires that the main coro ($Coro::main) is 492The design of Deliantra requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 493is always able to handle events or runnable, as Deliantra is only
324reentrant. 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.
325 496
326If 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
327the given BLOCK in another coroutine while waiting for the result. The 498the given BLOCK in another coroutine while waiting for the result. The
328server 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
329fast or be very important. 500fast or be very important.
… …
332 503
333sub sync_job(&) { 504sub sync_job(&) {
334 my ($job) = @_; 505 my ($job) = @_;
335 506
336 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
337 my $time = Event::time; 508 my $time = EV::time;
338 509
339 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
340 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
341 512
342 # TODO: use suspend/resume instead 513 LOG llevError, Carp::longmess "sync job";#d#
343 # (but this is cancel-safe) 514
344 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
345 516
346 my $busy = 1; 517 my $busy = 1;
347 my @res; 518 my @res;
348 519
349 (async { 520 (async {
521 $Coro::current->desc ("sync job coro");
350 @res = eval { $job->() }; 522 @res = eval { $job->() };
351 warn $@ if $@; 523 warn $@ if $@;
352 undef $busy; 524 undef $busy;
353 })->prio (Coro::PRIO_MAX); 525 })->prio (Coro::PRIO_MAX);
354 526
355 while ($busy) { 527 while ($busy) {
356 Coro::cede or Event::one_event; 528 if (Coro::nready) {
529 Coro::cede_notself;
530 } else {
531 EV::loop EV::LOOP_ONESHOT;
357 } 532 }
533 }
358 534
359 $time = Event::time - $time; 535 my $time = EV::time - $time;
360 536
361 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363
364 $tick_start += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
365 538
366 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
367 } else { 540 } else {
368 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
369 542
… …
389 $EXT_CORO{$coro+0} = $coro; 562 $EXT_CORO{$coro+0} = $coro;
390 563
391 $coro 564 $coro
392} 565}
393 566
394sub write_runtime { 567=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 568
397 # first touch the runtime file to show we are still running: 569Executes the given code block with the given arguments in a seperate
398 # 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.
399 573
400 IO::AIO::aio_utime $runtime, undef, undef; 574=cut
401 575
402 my $guard = cf::lock_acquire "write_runtime"; 576sub fork_call(&@) {
577 my ($cb, @args) = @_;
403 578
404 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 579 # we seemingly have to make a local copy of the whole thing,
405 or return; 580 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious)
406 582
407 my $value = $cf::RUNTIME + 90 + 10; 583 my @res = Coro::Util::fork_eval {
408 # 10 is the runtime save interval, for a monotonic clock 584 reset_signals;
409 # 60 allows for the watchdog to kill the server. 585 &$cb
586 }, @args;
410 587
411 (aio_write $fh, 0, (length $value), $value, 0) <= 0 588 wantarray ? @res : $res[-1]
412 and return; 589}
413 590
414 # always fsync - this file is important 591=item $coin = coin_from_name $name
415 aio_fsync $fh
416 and return;
417 592
418 # touch it again to show we are up-to-date 593=cut
419 aio_utime $fh, undef, undef;
420 594
421 close $fh 595our %coin_alias = (
422 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);
423 611
424 aio_rename "$runtime~", $runtime 612sub coin_from_name($) {
425 and return; 613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
616}
426 617
427 warn "runtime file written.\n";#d# 618=item $value = cf::db_get $family => $key
428 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
429 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"
430} 743}
431 744
432=item cf::datalog type => key => value, ... 745=item cf::datalog type => key => value, ...
433 746
434Log 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.
… …
446 759
447############################################################################# 760#############################################################################
448 761
449=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
450 763
451Many 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
452attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
453to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
454 767
455In 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>
456C<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
457crossfire+). 770Deliantra).
458 771
459=over 4 772=over 4
460 773
461=item $attachable->attach ($attachment, key => $value...) 774=item $attachable->attach ($attachment, key => $value...)
462 775
… …
506=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
507 820
508Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
509given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
510 823
511Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
512that 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.
513 826
514These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
515 828
516=over 4 829=over 4
… …
664 _attach $registry, $klass, @attach; 977 _attach $registry, $klass, @attach;
665 } 978 }
666 979
667 $obj->{$name} = \%arg; 980 $obj->{$name} = \%arg;
668 } else { 981 } else {
669 warn "object uses attachment '$name' that is not available, postponing.\n"; 982 warn "object uses attachment '$name' which is not available, postponing.\n";
670 } 983 }
671 984
672 $obj->{_attachment}{$name} = undef; 985 $obj->{_attachment}{$name} = undef;
673} 986}
674 987
… …
714 "; 1027 ";
715 die if $@; 1028 die if $@;
716} 1029}
717 1030
718our $override; 1031our $override;
719our @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?
720 1033
721sub override { 1034sub override {
722 $override = 1; 1035 $override = 1;
723 @invoke_results = (); 1036 @INVOKE_RESULTS = (@_);
724} 1037}
725 1038
726sub do_invoke { 1039sub do_invoke {
727 my $event = shift; 1040 my $event = shift;
728 my $callbacks = shift; 1041 my $callbacks = shift;
729 1042
730 @invoke_results = (); 1043 @INVOKE_RESULTS = ();
731 1044
732 local $override; 1045 local $override;
733 1046
734 for (@$callbacks) { 1047 for (@$callbacks) {
735 eval { &{$_->[1]} }; 1048 eval { &{$_->[1]} };
… …
744 } 1057 }
745 1058
746 0 1059 0
747} 1060}
748 1061
749=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
750 1063
751=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
752 1065
753Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
754 1067
755This 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
756removed 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
757results (if you must, access C<@cf::invoke_results> directly). 1070results (if you must, access C<@cf::INVOKE_RESULTS> directly).
758 1071
759=back 1072=back
760 1073
761=cut 1074=cut
762 1075
763############################################################################# 1076#############################################################################
764# 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}
765 1120
766sub reattach { 1121sub reattach {
767 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
768 my ($obj) = @_; 1123 my ($obj) = @_;
769 1124
1125 # no longer needed after getting rid of delete_package?
770 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
771 1127
772 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
773 1129
774 @$registry = (); 1130 @$registry = ();
775 1131
… …
790cf::attachable->attach ( 1146cf::attachable->attach (
791 prio => -1000000, 1147 prio => -1000000,
792 on_instantiate => sub { 1148 on_instantiate => sub {
793 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
794 1150
795 $data = from_json $data; 1151 $data = decode_json $data;
796 1152
797 for (@$data) { 1153 for (@$data) {
798 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
799 1155
800 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
… …
816sub object_freezer_save { 1172sub object_freezer_save {
817 my ($filename, $rdata, $objs) = @_; 1173 my ($filename, $rdata, $objs) = @_;
818 1174
819 sync_job { 1175 sync_job {
820 if (length $$rdata) { 1176 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename);
821 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
822 $filename, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
823 1180
824 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
825 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
826 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
827 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 }
828 close $fh; 1188 aio_close $fh;
829 1189
830 if (@$objs) { 1190 if (@$objs) {
831 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) {
832 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
833 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
834 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
835 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 }
836 close $fh; 1199 aio_close $fh;
837 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
838 } 1201 }
839 } else { 1202 } else {
840 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
841 } 1204 }
842 1205
843 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
844 } else { 1210 } else {
845 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
846 } 1212 }
847 } else { 1213 } else {
848 aio_unlink $filename; 1214 aio_unlink $filename;
849 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
850 } 1216 }
851 } 1217 };
852} 1218}
853 1219
854sub object_freezer_as_string { 1220sub object_freezer_as_string {
855 my ($rdata, $objs) = @_; 1221 my ($rdata, $objs) = @_;
856 1222
… …
868 or return; 1234 or return;
869 1235
870 unless (aio_stat "$filename.pst") { 1236 unless (aio_stat "$filename.pst") {
871 (aio_load "$filename.pst", $av) >= 0 1237 (aio_load "$filename.pst", $av) >= 0
872 or return; 1238 or return;
1239
873 $av = eval { (Storable::thaw $av)->{objs} }; 1240 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs};
874 } 1242 }
875 1243
1244 utf8::decode (my $decname = $filename);
876 warn sprintf "loading %s (%d)\n", 1245 warn sprintf "loading %s (%d,%d)\n",
877 $filename, length $data, scalar @{$av || []};#d# 1246 $decname, length $data, scalar @{$av || []};
1247
878 return ($data, $av); 1248 ($data, $av)
879} 1249}
1250
1251=head2 COMMAND CALLBACKS
1252
1253=over 4
1254
1255=cut
880 1256
881############################################################################# 1257#############################################################################
882# command handling &c 1258# command handling &c
883 1259
884=item cf::register_command $name => \&callback($ob,$args); 1260=item cf::register_command $name => \&callback($ob,$args);
… …
897 push @{ $COMMAND{$name} }, [$caller, $cb]; 1273 push @{ $COMMAND{$name} }, [$caller, $cb];
898} 1274}
899 1275
900=item cf::register_extcmd $name => \&callback($pl,$packet); 1276=item cf::register_extcmd $name => \&callback($pl,$packet);
901 1277
902Register 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.
903 1283
904If 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
905called. 1285called.
906 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
907=cut 1298=cut
908 1299
909sub register_extcmd { 1300sub register_extcmd {
910 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
911 1302
912 $EXTCMD{$name} = $cb; 1303 $EXTCMD{$name} = $cb;
913} 1304}
1305
1306sub register_exticmd {
1307 my ($name, $cb) = @_;
1308
1309 $EXTICMD{$name} = $cb;
1310}
1311
1312use File::Glob ();
914 1313
915cf::player->attach ( 1314cf::player->attach (
916 on_command => sub { 1315 on_command => sub {
917 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
918 1317
… …
926 cf::override; 1325 cf::override;
927 }, 1326 },
928 on_extcmd => sub { 1327 on_extcmd => sub {
929 my ($pl, $buf) = @_; 1328 my ($pl, $buf) = @_;
930 1329
931 my $msg = eval { from_json $buf }; 1330 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
932 1331
933 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
934 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1340 if (my $cb = $EXTCMD{$type}) {
935 if (my %reply = $cb->($pl, $msg)) { 1341 @reply = $cb->($pl, @payload);
936 $pl->ext_reply ($msg->{msgid}, %reply);
937 }
938 } 1342 }
1343
1344 $pl->ext_reply ($reply, @reply)
1345 if $reply;
1346
939 } else { 1347 } else {
940 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
941 } 1349 }
942 1350
943 cf::override; 1351 cf::override;
944 }, 1352 },
945); 1353);
946 1354
1355# "readahead" all extensions
947sub load_extension { 1356sub cache_extensions {
948 my ($path) = @_; 1357 my $grp = IO::AIO::aio_group;
949 1358
950 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
951 my $base = $1; 1360 for (grep /\.ext$/, @{$_[0]}) {
952 my $pkg = $1; 1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
953 $pkg =~ s/[^[:word:]]/_/g;
954 $pkg = "ext::$pkg";
955
956 warn "... loading '$path' into '$pkg'\n";
957
958 open my $fh, "<:utf8", $path
959 or die "$path: $!";
960
961 my $source =
962 "package $pkg; use strict; use utf8;\n"
963 . "#line 1 \"$path\"\n{\n"
964 . (do { local $/; <$fh> })
965 . "\n};\n1";
966
967 unless (eval $source) {
968 my $msg = $@ ? "$path: $@\n"
969 : "extension disabled.\n";
970 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
971 warn $@;
972 warn "mandatory extension failed to load, exiting.\n";
973 exit 1;
974 } 1362 }
975 die $@;
976 } 1363 };
977 1364
978 push @EXTS, $pkg; 1365 $grp
979} 1366}
980 1367
981sub load_extensions { 1368sub load_extensions {
1369 cf::sync_job {
1370 my %todo;
1371
982 for my $ext (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
983 next unless -r $ext; 1373 next unless -r $path;
984 eval { 1374
985 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 }
986 1 1435 }
987 } 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 }
988 } 1446 };
989} 1447}
990 1448
991############################################################################# 1449#############################################################################
992 1450
1451=back
1452
993=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
994 1454
995Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
996 1456
997=cut 1457=cut
998 1458
999package cf::player; 1459package cf::player;
1000 1460
1001use Coro::AIO; 1461use Coro::AIO;
1002 1462
1003=head3 cf::player 1463=head3 cf::player
1004 1464
1005=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}
1006 1480
1007=item cf::player::find $login 1481=item cf::player::find $login
1008 1482
1009Returns the given player object, loading it if necessary (might block). 1483Returns the given player object, loading it if necessary (might block).
1010 1484
… …
1029 1503
1030sub exists($) { 1504sub exists($) {
1031 my ($login) = @_; 1505 my ($login) = @_;
1032 1506
1033 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1034 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1035} 1509}
1036 1510
1037sub find($) { 1511sub find($) {
1038 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1039 my $login = $_[0]; 1513 my $login = $_[0];
… …
1046 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1520 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1047 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1521 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1048 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1522 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1049 aio_unlink +(playerdir $login) . "/$login.pl"; 1523 aio_unlink +(playerdir $login) . "/$login.pl";
1050 1524
1051 my $pl = load_pl path $login 1525 my $f = new_from_file cf::object::thawer path $login
1052 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;
1053 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1054 } 1534 }
1055 } 1535 }
1056} 1536}
1057 1537
… …
1066 return if $pl->{deny_save}; 1546 return if $pl->{deny_save};
1067 1547
1068 aio_mkdir playerdir $pl, 0770; 1548 aio_mkdir playerdir $pl, 0770;
1069 $pl->{last_save} = $cf::RUNTIME; 1549 $pl->{last_save} = $cf::RUNTIME;
1070 1550
1551 cf::get_slot 0.01;
1552
1071 $pl->save_pl ($path); 1553 $pl->save_pl ($path);
1072 Coro::cede; 1554 cf::cede_to_tick;
1073} 1555}
1074 1556
1075sub new($) { 1557sub new($) {
1076 my ($login) = @_; 1558 my ($login) = @_;
1077 1559
… …
1083 $cf::PLAYER{$login} = $self; 1565 $cf::PLAYER{$login} = $self;
1084 1566
1085 $self 1567 $self
1086} 1568}
1087 1569
1570=item $player->send_msg ($channel, $msg, $color, [extra...])
1571
1572=cut
1573
1574sub send_msg {
1575 my $ns = shift->ns
1576 or return;
1577 $ns->send_msg (@_);
1578}
1579
1088=item $pl->quit_character 1580=item $pl->quit_character
1089 1581
1090Nukes the player without looking back. If logged in, the connection will 1582Nukes the player without looking back. If logged in, the connection will
1091be destroyed. May block for a long time. 1583be destroyed. May block for a long time.
1092 1584
… …
1096 my ($pl) = @_; 1588 my ($pl) = @_;
1097 1589
1098 my $name = $pl->ob->name; 1590 my $name = $pl->ob->name;
1099 1591
1100 $pl->{deny_save} = 1; 1592 $pl->{deny_save} = 1;
1101 $pl->password ("*"); # this should lock out the player until we nuked the dir 1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1102 1594
1103 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1104 $pl->deactivate; 1596 $pl->deactivate;
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1105 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1599 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1106 $pl->ns->destroy if $pl->ns; 1600 $pl->ns->destroy if $pl->ns;
1107 1601
1108 my $path = playerdir $pl; 1602 my $path = playerdir $pl;
1109 my $temp = "$path~$cf::RUNTIME~deleting~"; 1603 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1145 or return []; 1639 or return [];
1146 1640
1147 my @logins; 1641 my @logins;
1148 1642
1149 for my $login (@$dirs) { 1643 for my $login (@$dirs) {
1644 my $path = path $login;
1645
1646 # a .pst is a dead give-away for a valid player
1647 # if no pst file found, open and chekc for blocked users
1648 if (aio_stat "$path.pst") {
1150 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1649 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1151 aio_read $fh, 0, 512, my $buf, 0 or next; 1650 aio_read $fh, 0, 512, my $buf, 0 or next;
1152 $buf !~ /^password -------------$/m or next; # official not-valid tag 1651 $buf !~ /^password -------------$/m or next; # official not-valid tag
1652 }
1153 1653
1154 utf8::decode $login; 1654 utf8::decode $login;
1155 push @logins, $login; 1655 push @logins, $login;
1156 } 1656 }
1157 1657
… …
1184 } 1684 }
1185 1685
1186 \@paths 1686 \@paths
1187} 1687}
1188 1688
1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1690
1691Expand deliantra pod fragments into protocol xml.
1692
1189=item $player->ext_reply ($msgid, %msg) 1693=item $player->ext_reply ($msgid, @msg)
1190 1694
1191Sends an ext reply to the player. 1695Sends an ext reply to the player.
1192 1696
1193=cut 1697=cut
1194 1698
1195sub ext_reply($$%) { 1699sub ext_reply($$@) {
1196 my ($self, $id, %msg) = @_; 1700 my ($self, $id, @msg) = @_;
1197 1701
1198 $msg{msgid} = $id; 1702 $self->ns->ext_reply ($id, @msg)
1199
1200 $self->send ("ext " . cf::to_json \%msg);
1201} 1703}
1202 1704
1203=item $player->ext_event ($type, %msg) 1705=item $player->ext_msg ($type, @msg)
1204 1706
1205Sends an ext event to the client. 1707Sends an ext event to the client.
1206 1708
1207=cut 1709=cut
1208 1710
1209sub ext_event($$%) { 1711sub ext_msg($$@) {
1210 my ($self, $type, %msg) = @_; 1712 my ($self, $type, @msg) = @_;
1211 1713
1212 $self->ns->ext_event ($type, %msg); 1714 $self->ns->ext_msg ($type, @msg);
1213} 1715}
1214 1716
1215=head3 cf::region 1717=head3 cf::region
1216 1718
1217=over 4 1719=over 4
… …
1220 1722
1221package cf::region; 1723package cf::region;
1222 1724
1223=item cf::region::find_by_path $path 1725=item cf::region::find_by_path $path
1224 1726
1225Tries to decuce the probable region for a map knowing only its path. 1727Tries to decuce the likely region for a map knowing only its path.
1226 1728
1227=cut 1729=cut
1228 1730
1229sub find_by_path($) { 1731sub find_by_path($) {
1230 my ($path) = @_; 1732 my ($path) = @_;
1231 1733
1232 my ($match, $specificity); 1734 my ($match, $specificity);
1233 1735
1234 for my $region (list) { 1736 for my $region (list) {
1235 if ($region->match && $path =~ $region->match) { 1737 if ($region->{match} && $path =~ $region->{match}) {
1236 ($match, $specificity) = ($region, $region->specificity) 1738 ($match, $specificity) = ($region, $region->specificity)
1237 if $region->specificity > $specificity; 1739 if $region->specificity > $specificity;
1238 } 1740 }
1239 } 1741 }
1240 1742
… …
1261our $MAX_RESET = 3600; 1763our $MAX_RESET = 3600;
1262our $DEFAULT_RESET = 3000; 1764our $DEFAULT_RESET = 3000;
1263 1765
1264sub generate_random_map { 1766sub generate_random_map {
1265 my ($self, $rmp) = @_; 1767 my ($self, $rmp) = @_;
1768
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770
1266 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1267 $self->_create_random_map ( 1772 $self->_create_random_map (
1268 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1269 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1270 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1304 my ($self, $merge) = @_; 1809 my ($self, $merge) = @_;
1305 1810
1306 # we have to keep some variables in memory intact 1811 # we have to keep some variables in memory intact
1307 local $self->{path}; 1812 local $self->{path};
1308 local $self->{load_path}; 1813 local $self->{load_path};
1309 local $self->{deny_save};
1310 local $self->{deny_reset};
1311 1814
1312 $self->SUPER::thawer_merge ($merge); 1815 $self->SUPER::thawer_merge ($merge);
1313} 1816}
1314 1817
1315sub normalise { 1818sub normalise {
… …
1362 $self->init; # pass $1 etc. 1865 $self->init; # pass $1 etc.
1363 return $self; 1866 return $self;
1364 } 1867 }
1365 } 1868 }
1366 1869
1367 Carp::carp "unable to resolve path '$path' (base '$base')."; 1870 Carp::cluck "unable to resolve path '$path' (base '$base').";
1368 () 1871 ()
1369} 1872}
1370 1873
1371sub init { 1874sub init {
1372 my ($self) = @_; 1875 my ($self) = @_;
… …
1394 1897
1395# the temporary/swap location 1898# the temporary/swap location
1396sub save_path { 1899sub save_path {
1397 my ($self) = @_; 1900 my ($self) = @_;
1398 1901
1399 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1902 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1400 "$TMPDIR/$path.map" 1903 "$TMPDIR/$path.map"
1401} 1904}
1402 1905
1403# the unique path, undef == no special unique path 1906# the unique path, undef == no special unique path
1404sub uniq_path { 1907sub uniq_path {
1405 my ($self) = @_; 1908 my ($self) = @_;
1406 1909
1407 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1408 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1409} 1912}
1410 1913
1411# and all this just because we cannot iterate over 1914sub decay_objects {
1412# all maps in C++...
1413sub change_all_map_light {
1414 my ($change) = @_; 1915 my ($self) = @_;
1415 1916
1416 $_->change_map_light ($change) 1917 return if $self->{deny_reset};
1417 for grep $_->outdoor, values %cf::MAP; 1918
1919 $self->do_decay_objects;
1418} 1920}
1419 1921
1420sub unlink_save { 1922sub unlink_save {
1421 my ($self) = @_; 1923 my ($self) = @_;
1422 1924
… …
1427 1929
1428sub load_header_from($) { 1930sub load_header_from($) {
1429 my ($self, $path) = @_; 1931 my ($self, $path) = @_;
1430 1932
1431 utf8::encode $path; 1933 utf8::encode $path;
1432 #aio_open $path, O_RDONLY, 0 1934 my $f = new_from_file cf::object::thawer $path
1433 # or return;
1434
1435 $self->_load_header ($path)
1436 or return; 1935 or return;
1936
1937 $self->_load_header ($f)
1938 or return;
1939
1940 local $MAP_LOADING{$self->{path}} = $self;
1941 $f->resolve_delayed_derefs;
1437 1942
1438 $self->{load_path} = $path; 1943 $self->{load_path} = $path;
1439 1944
1440 1 1945 1
1441} 1946}
… …
1480 $self->load_header_orig 1985 $self->load_header_orig
1481 or return; 1986 or return;
1482 $self->prepare_orig; 1987 $self->prepare_orig;
1483 } 1988 }
1484 1989
1990 $self->{deny_reset} = 1
1991 if $self->no_reset;
1992
1485 $self->default_region (cf::region::find_by_path $self->{path}) 1993 $self->default_region (cf::region::find_by_path $self->{path})
1486 unless $self->default_region; 1994 unless $self->default_region;
1487 1995
1488 1 1996 1
1489} 1997}
… …
1492sub find { 2000sub find {
1493 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
1494 2002
1495 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
1496 2004
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1497 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
1498 2007
1499 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
1500 my $guard = cf::lock_acquire "map_find:$path";
1501 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
1502 or return; 2010 or return;
1503 2011
1504 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
1505 2013
1506 $map->load_header 2014 $map->load_header
1507 or return; 2015 or return;
1508 2016
1509 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 2017 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1510 # doing this can freeze the server in a sync job, obviously 2018 # doing this can freeze the server in a sync job, obviously
1511 #$cf::WAIT_FOR_TICK->wait; 2019 #$cf::WAIT_FOR_TICK->wait;
2020 undef $guard2;
2021 undef $guard1;
1512 $map->reset; 2022 $map->reset;
1513 undef $guard;
1514 return find $path; 2023 return find $path;
1515 } 2024 }
1516 2025
1517 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
1518 } 2027 }
1519} 2028}
1520 2029
1521sub pre_load { } 2030sub pre_load { }
1522sub post_load { } 2031#sub post_load { } # XS
1523 2032
1524sub load { 2033sub load {
1525 my ($self) = @_; 2034 my ($self) = @_;
1526 2035
1527 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
1528 2037
1529 my $path = $self->{path}; 2038 my $path = $self->{path};
1530 2039
1531 { 2040 {
1532 my $guard = cf::lock_acquire "map_load:$path"; 2041 my $guard = cf::lock_acquire "map_data:$path";
1533 2042
2043 return unless $self->valid;
1534 return if $self->in_memory != cf::MAP_SWAPPED; 2044 return unless $self->in_memory == cf::MAP_SWAPPED;
1535 2045
1536 $self->in_memory (cf::MAP_LOADING); 2046 $self->in_memory (cf::MAP_LOADING);
1537 2047
1538 $self->alloc; 2048 $self->alloc;
1539 2049
1540 $self->pre_load; 2050 $self->pre_load;
1541 Coro::cede; 2051 cf::cede_to_tick;
1542 2052
2053 my $f = new_from_file cf::object::thawer $self->{load_path};
2054 $f->skip_block;
1543 $self->_load_objects ($self->{load_path}, 1) 2055 $self->_load_objects ($f)
1544 or return; 2056 or return;
1545 2057
1546 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2058 $self->post_load_original
1547 if delete $self->{load_original}; 2059 if delete $self->{load_original};
1548 2060
1549 if (my $uniq = $self->uniq_path) { 2061 if (my $uniq = $self->uniq_path) {
1550 utf8::encode $uniq; 2062 utf8::encode $uniq;
1551 if (aio_open $uniq, O_RDONLY, 0) { 2063 unless (aio_stat $uniq) {
2064 if (my $f = new_from_file cf::object::thawer $uniq) {
1552 $self->clear_unique_items; 2065 $self->clear_unique_items;
1553 $self->_load_objects ($uniq, 0); 2066 $self->_load_objects ($f);
2067 $f->resolve_delayed_derefs;
2068 }
1554 } 2069 }
1555 } 2070 }
1556 2071
1557 Coro::cede; 2072 $f->resolve_delayed_derefs;
2073
2074 cf::cede_to_tick;
1558 # now do the right thing for maps 2075 # now do the right thing for maps
1559 $self->link_multipart_objects; 2076 $self->link_multipart_objects;
1560 $self->difficulty ($self->estimate_difficulty) 2077 $self->difficulty ($self->estimate_difficulty)
1561 unless $self->difficulty; 2078 unless $self->difficulty;
1562 Coro::cede; 2079 cf::cede_to_tick;
1563 2080
1564 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
1565 $self->decay_objects; 2082 $self->decay_objects;
1566 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
1567 $self->update_buttons; 2084 $self->update_buttons;
1568 Coro::cede; 2085 cf::cede_to_tick;
1569 $self->set_darkness_map;
1570 Coro::cede;
1571 $self->activate; 2086 $self->activate;
1572 } 2087 }
1573 2088
2089 $self->{last_save} = $cf::RUNTIME;
2090 $self->last_access ($cf::RUNTIME);
2091
1574 $self->in_memory (cf::MAP_IN_MEMORY); 2092 $self->in_memory (cf::MAP_ACTIVE);
1575 } 2093 }
1576 2094
1577 $self->post_load; 2095 $self->post_load;
1578} 2096}
1579 2097
… …
1581 my ($self, $ob) = @_; 2099 my ($self, $ob) = @_;
1582 2100
1583 return find "~" . $ob->name . "/" . $self->{path} 2101 return find "~" . $ob->name . "/" . $self->{path}
1584 if $self->per_player; 2102 if $self->per_player;
1585 2103
2104# return find "?party/" . $ob->name . "/" . $self->{path}
2105# if $self->per_party;
2106
1586 $self 2107 $self
1587} 2108}
1588 2109
1589# find and load all maps in the 3x3 area around a map 2110# find and load all maps in the 3x3 area around a map
1590sub load_diag { 2111sub load_neighbours {
1591 my ($map) = @_; 2112 my ($map) = @_;
1592 2113
1593 my @diag; # diagonal neighbours 2114 my @neigh; # diagonal neighbours
1594 2115
1595 for (0 .. 3) { 2116 for (0 .. 3) {
1596 my $neigh = $map->tile_path ($_) 2117 my $neigh = $map->tile_path ($_)
1597 or next; 2118 or next;
1598 $neigh = find $neigh, $map 2119 $neigh = find $neigh, $map
1599 or next; 2120 or next;
1600 $neigh->load; 2121 $neigh->load;
1601 2122
2123 push @neigh,
1602 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2124 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1603 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2125 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1604 } 2126 }
1605 2127
1606 for (@diag) { 2128 for (grep defined $_->[0], @neigh) {
2129 my ($path, $origin) = @$_;
1607 my $neigh = find @$_ 2130 my $neigh = find $path, $origin
1608 or next; 2131 or next;
1609 $neigh->load; 2132 $neigh->load;
1610 } 2133 }
1611} 2134}
1612 2135
… …
1617} 2140}
1618 2141
1619sub do_load_sync { 2142sub do_load_sync {
1620 my ($map) = @_; 2143 my ($map) = @_;
1621 2144
2145 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2146 if $Coro::current == $Coro::main;
2147
1622 cf::sync_job { $map->load }; 2148 cf::sync_job { $map->load };
1623} 2149}
1624 2150
1625our %MAP_PREFETCH; 2151our %MAP_PREFETCH;
1626our $MAP_PREFETCHER = undef; 2152our $MAP_PREFETCHER = undef;
1627 2153
1628sub find_async { 2154sub find_async {
1629 my ($path, $origin) = @_; 2155 my ($path, $origin, $load) = @_;
1630 2156
1631 $path = normalise $path, $origin && $origin->{path}; 2157 $path = normalise $path, $origin && $origin->{path};
1632 2158
1633 if (my $map = $cf::MAP{$path}) { 2159 if (my $map = $cf::MAP{$path}) {
1634 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2160 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1635 } 2161 }
1636 2162
1637 undef $MAP_PREFETCH{$path}; 2163 $MAP_PREFETCH{$path} |= $load;
2164
1638 $MAP_PREFETCHER ||= cf::async { 2165 $MAP_PREFETCHER ||= cf::async {
2166 $Coro::current->{desc} = "map prefetcher";
2167
1639 while (%MAP_PREFETCH) { 2168 while (%MAP_PREFETCH) {
1640 for my $path (keys %MAP_PREFETCH) { 2169 while (my ($k, $v) = each %MAP_PREFETCH) {
1641 my $map = find $path 2170 if (my $map = find $k) {
1642 or next;
1643 $map->load; 2171 $map->load if $v;
2172 }
1644 2173
1645 delete $MAP_PREFETCH{$path}; 2174 delete $MAP_PREFETCH{$k};
1646 } 2175 }
1647 } 2176 }
1648 undef $MAP_PREFETCHER; 2177 undef $MAP_PREFETCHER;
1649 }; 2178 };
1650 $MAP_PREFETCHER->prio (6); 2179 $MAP_PREFETCHER->prio (6);
… …
1653} 2182}
1654 2183
1655sub save { 2184sub save {
1656 my ($self) = @_; 2185 my ($self) = @_;
1657 2186
1658 my $lock = cf::lock_acquire "map_data:" . $self->path; 2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
1659 2188
1660 $self->{last_save} = $cf::RUNTIME; 2189 $self->{last_save} = $cf::RUNTIME;
1661 2190
1662 return unless $self->dirty; 2191 return unless $self->dirty;
1663 2192
… …
1669 return if $self->{deny_save}; 2198 return if $self->{deny_save};
1670 2199
1671 local $self->{last_access} = $self->last_access;#d# 2200 local $self->{last_access} = $self->last_access;#d#
1672 2201
1673 cf::async { 2202 cf::async {
2203 $Coro::current->{desc} = "map player save";
1674 $_->contr->save for $self->players; 2204 $_->contr->save for $self->players;
1675 }; 2205 };
2206
2207 cf::get_slot 0.02;
1676 2208
1677 if ($uniq) { 2209 if ($uniq) {
1678 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2210 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1679 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2211 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1680 } else { 2212 } else {
… …
1686 my ($self) = @_; 2218 my ($self) = @_;
1687 2219
1688 # save first because save cedes 2220 # save first because save cedes
1689 $self->save; 2221 $self->save;
1690 2222
1691 my $lock = cf::lock_acquire "map_data:" . $self->path; 2223 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2224
1693 return if $self->players; 2225 return if $self->players;
1694 return if $self->in_memory != cf::MAP_IN_MEMORY; 2226 return if $self->in_memory != cf::MAP_ACTIVE;
1695 return if $self->{deny_save}; 2227 return if $self->{deny_save};
1696 2228
2229 $self->in_memory (cf::MAP_SWAPPED);
2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
1697 $self->clear; 2233 $self->clear;
1698 $self->in_memory (cf::MAP_SWAPPED);
1699} 2234}
1700 2235
1701sub reset_at { 2236sub reset_at {
1702 my ($self) = @_; 2237 my ($self) = @_;
1703 2238
1704 # TODO: safety, remove and allow resettable per-player maps 2239 # TODO: safety, remove and allow resettable per-player maps
1705 return 1e99 if $self->isa ("ext::map_per_player");#d#
1706 return 1e99 if $self->{deny_reset}; 2240 return 1e99 if $self->{deny_reset};
1707 2241
1708 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2242 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1709 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2243 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1710 2244
… …
1721 my ($self) = @_; 2255 my ($self) = @_;
1722 2256
1723 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
1724 2258
1725 return if $self->players; 2259 return if $self->players;
1726 return if $self->isa ("ext::map_per_player");#d#
1727 2260
1728 warn "resetting map ", $self->path;#d# 2261 warn "resetting map ", $self->path, "\n";
1729 2262
1730 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
1731 2264
1732 # need to save uniques path 2265 # need to save uniques path
1733 unless ($self->{deny_save}) { 2266 unless ($self->{deny_save}) {
… …
1737 if $uniq; 2270 if $uniq;
1738 } 2271 }
1739 2272
1740 delete $cf::MAP{$self->path}; 2273 delete $cf::MAP{$self->path};
1741 2274
2275 $self->deactivate;
2276 $_->clear_links_to ($self) for values %cf::MAP;
1742 $self->clear; 2277 $self->clear;
1743
1744 $_->clear_links_to ($self) for values %cf::MAP;
1745 2278
1746 $self->unlink_save; 2279 $self->unlink_save;
1747 $self->destroy; 2280 $self->destroy;
1748} 2281}
1749 2282
1750my $nuke_counter = "aaaa"; 2283my $nuke_counter = "aaaa";
1751 2284
1752sub nuke { 2285sub nuke {
1753 my ($self) = @_; 2286 my ($self) = @_;
1754 2287
2288 {
2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290
1755 delete $cf::MAP{$self->path}; 2291 delete $cf::MAP{$self->path};
1756 2292
1757 $self->unlink_save; 2293 $self->unlink_save;
1758 2294
1759 bless $self, "cf::map"; 2295 bless $self, "cf::map";
1760 delete $self->{deny_reset}; 2296 delete $self->{deny_reset};
1761 $self->{deny_save} = 1; 2297 $self->{deny_save} = 1;
1762 $self->reset_timeout (1); 2298 $self->reset_timeout (1);
1763 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2299 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1764 2300
1765 $cf::MAP{$self->path} = $self; 2301 $cf::MAP{$self->path} = $self;
2302 }
1766 2303
1767 $self->reset; # polite request, might not happen 2304 $self->reset; # polite request, might not happen
2305}
2306
2307=item $maps = cf::map::tmp_maps
2308
2309Returns an arrayref with all map paths of currently instantiated and saved
2310maps. May block.
2311
2312=cut
2313
2314sub tmp_maps() {
2315 [
2316 map {
2317 utf8::decode $_;
2318 /\.map$/
2319 ? normalise $_
2320 : ()
2321 } @{ aio_readdir $TMPDIR or [] }
2322 ]
2323}
2324
2325=item $maps = cf::map::random_maps
2326
2327Returns an arrayref with all map paths of currently instantiated and saved
2328random maps. May block.
2329
2330=cut
2331
2332sub random_maps() {
2333 [
2334 map {
2335 utf8::decode $_;
2336 /\.map$/
2337 ? normalise "?random/$_"
2338 : ()
2339 } @{ aio_readdir $RANDOMDIR or [] }
2340 ]
1768} 2341}
1769 2342
1770=item cf::map::unique_maps 2343=item cf::map::unique_maps
1771 2344
1772Returns an arrayref of paths of all shared maps that have 2345Returns an arrayref of paths of all shared maps that have
1773instantiated unique items. May block. 2346instantiated unique items. May block.
1774 2347
1775=cut 2348=cut
1776 2349
1777sub unique_maps() { 2350sub unique_maps() {
1778 my $files = aio_readdir $UNIQUEDIR 2351 [
1779 or return; 2352 map {
1780
1781 my @paths;
1782
1783 for (@$files) {
1784 utf8::decode $_; 2353 utf8::decode $_;
1785 next if /\.pst$/; 2354 s/\.map$//; # TODO future compatibility hack
1786 next unless /^$PATH_SEP/o; 2355 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
1787 2356 ? ()
1788 push @paths, cf::map::normalise $_; 2357 : normalise $_
2358 } @{ aio_readdir $UNIQUEDIR or [] }
1789 } 2359 ]
1790
1791 \@paths
1792} 2360}
1793 2361
1794package cf; 2362=item cf::map::static_maps
2363
2364Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2365file in the shared directory excluding F</styles> and F</editor>). May
2366block.
2367
2368=cut
2369
2370sub static_maps() {
2371 my @dirs = "";
2372 my @maps;
2373
2374 while (@dirs) {
2375 my $dir = shift @dirs;
2376
2377 next if $dir eq "/styles" || $dir eq "/editor";
2378
2379 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2380 or return;
2381
2382 for (@$files) {
2383 s/\.map$// or next;
2384 utf8::decode $_;
2385 push @maps, "$dir/$_";
2386 }
2387
2388 push @dirs, map "$dir/$_", @$dirs;
2389 }
2390
2391 \@maps
2392}
1795 2393
1796=back 2394=back
1797 2395
1798=head3 cf::object 2396=head3 cf::object
1799 2397
… …
1803 2401
1804=over 4 2402=over 4
1805 2403
1806=item $ob->inv_recursive 2404=item $ob->inv_recursive
1807 2405
1808Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
1809 2408
1810=cut 2409=cut
1811 2410
1812sub inv_recursive_; 2411sub inv_recursive_;
1813sub inv_recursive_ { 2412sub inv_recursive_ {
… …
1816 2415
1817sub inv_recursive { 2416sub inv_recursive {
1818 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
1819} 2418}
1820 2419
2420=item $ref = $ob->ref
2421
2422Creates and returns a persistent reference to an object that can be stored as a string.
2423
2424=item $ob = cf::object::deref ($refstring)
2425
2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2427even if the object actually exists. May block.
2428
2429=cut
2430
2431sub deref {
2432 my ($ref) = @_;
2433
2434 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2435 my ($uuid, $name) = ($1, $2);
2436 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2437 or return;
2438 $pl->ob->uuid eq $uuid
2439 or return;
2440
2441 $pl->ob
2442 } else {
2443 warn "$ref: cannot resolve object reference\n";
2444 undef
2445 }
2446}
2447
1821package cf; 2448package cf;
1822 2449
1823=back 2450=back
1824 2451
1825=head3 cf::object::player 2452=head3 cf::object::player
… …
1831Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2458Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
1832can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
1833dialogue with the given NPC character. 2460dialogue with the given NPC character.
1834 2461
1835=cut 2462=cut
2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
1836 2477
1837# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
1838# with dialog boxes. 2479# with dialog boxes.
1839#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
1840sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
… …
1842 2483
1843 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2484 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1844 2485
1845 if ($self->{record_replies}) { 2486 if ($self->{record_replies}) {
1846 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2487 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2488
1847 } else { 2489 } else {
2490 my $pl = $self->contr;
2491
2492 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2493 my $dialog = $pl->{npc_dialog};
2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2495
2496 } else {
1848 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
1849 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2499 }
1850 } 2500 }
2501}
2502
2503=item $object->send_msg ($channel, $msg, $color, [extra...])
2504
2505=cut
2506
2507sub cf::object::send_msg {
2508 my $pl = shift->contr
2509 or return;
2510 $pl->send_msg (@_);
1851} 2511}
1852 2512
1853=item $player_object->may ("access") 2513=item $player_object->may ("access")
1854 2514
1855Returns wether the given player is authorized to access resource "access" 2515Returns wether the given player is authorized to access resource "access"
… …
1868 2528
1869=item $player_object->enter_link 2529=item $player_object->enter_link
1870 2530
1871Freezes the player and moves him/her to a special map (C<{link}>). 2531Freezes the player and moves him/her to a special map (C<{link}>).
1872 2532
1873The player should be reasonably safe there for short amounts of time. You 2533The player should be reasonably safe there for short amounts of time (e.g.
1874I<MUST> call C<leave_link> as soon as possible, though. 2534for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2535though, as the palyer cannot control the character while it is on the link
2536map.
1875 2537
1876Will never block. 2538Will never block.
1877 2539
1878=item $player_object->leave_link ($map, $x, $y) 2540=item $player_object->leave_link ($map, $x, $y)
1879 2541
… …
1931 ($x, $y) = (-1, -1) 2593 ($x, $y) = (-1, -1)
1932 unless (defined $x) && (defined $y); 2594 unless (defined $x) && (defined $y);
1933 2595
1934 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
1935 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
1936 if $x <=0 && $y <= 0; 2598 if $x <= 0 && $y <= 0;
1937 2599
1938 $map->load; 2600 $map->load;
1939 $map->load_diag; 2601 $map->load_neighbours;
1940 2602
1941 return unless $self->contr->active; 2603 return unless $self->contr->active;
1942 $self->activate_recursive;
1943 2604
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945 $self->enter_map ($map, $x, $y); 2606 $self->enter_map ($map, $x, $y);
1946}
1947 2607
2608 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive;
2610}
2611
1948=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1949 2613
1950Moves the player to the given map-path and coordinates by first freezing 2614Moves the player to the given map-path and coordinates by first freezing
1951her, loading and preparing them map, calling the provided $check callback 2615her, loading and preparing them map, calling the provided $check callback
1952that has to return the map if sucecssful, and then unfreezes the player on 2616that has to return the map if sucecssful, and then unfreezes the player on
1953the new (success) or old (failed) map position. 2617the new (success) or old (failed) map position. In either case, $done will
2618be called at the end of this process.
2619
2620Note that $check will be called with a potentially non-loaded map, so if
2621it needs a loaded map it has to call C<< ->load >>.
1954 2622
1955=cut 2623=cut
1956 2624
1957our $GOTOGEN; 2625our $GOTOGEN;
1958 2626
1959sub cf::object::player::goto { 2627sub cf::object::player::goto {
1960 my ($self, $path, $x, $y, $check) = @_; 2628 my ($self, $path, $x, $y, $check, $done) = @_;
1961 2629
1962 # do generation counting so two concurrent goto's will be executed in-order 2630 # do generation counting so two concurrent goto's will be executed in-order
1963 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1964 2632
1965 $self->enter_link; 2633 $self->enter_link;
1966 2634
1967 (async { 2635 (async {
2636 $Coro::current->{desc} = "player::goto $path $x $y";
2637
2638 # *tag paths override both path and x|y
2639 if ($path =~ /^\*(.*)$/) {
2640 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2641 my $ob = $obs[rand @obs];
2642
2643 # see if we actually can go there
2644 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2645 $ob = $obs[rand @obs];
2646 } else {
2647 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2648 }
2649 # else put us there anyways for now #d#
2650
2651 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2652 } else {
2653 ($path, $x, $y) = (undef, undef, undef);
2654 }
2655 }
2656
1968 my $map = eval { 2657 my $map = eval {
1969 my $map = cf::map::find $path; 2658 my $map = defined $path ? cf::map::find $path : undef;
1970 2659
1971 if ($map) { 2660 if ($map) {
1972 $map = $map->customise_for ($self); 2661 $map = $map->customise_for ($self);
1973 $map = $check->($map) if $check && $map; 2662 $map = $check->($map) if $check && $map;
1974 } else { 2663 } else {
1975 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1976 } 2665 }
1977 2666
1978 $map 2667 $map
1979 }; 2668 };
1980 2669
… …
1985 2674
1986 if ($gen == $self->{_goto_generation}) { 2675 if ($gen == $self->{_goto_generation}) {
1987 delete $self->{_goto_generation}; 2676 delete $self->{_goto_generation};
1988 $self->leave_link ($map, $x, $y); 2677 $self->leave_link ($map, $x, $y);
1989 } 2678 }
2679
2680 $done->() if $done;
1990 })->prio (1); 2681 })->prio (1);
1991} 2682}
1992 2683
1993=item $player_object->enter_exit ($exit_object) 2684=item $player_object->enter_exit ($exit_object)
1994 2685
… …
2014} 2705}
2015 2706
2016sub prepare_random_map { 2707sub prepare_random_map {
2017 my ($exit) = @_; 2708 my ($exit) = @_;
2018 2709
2019 my $guard = cf::lock_acquire "exit_prepare:$exit";
2020
2021 # all this does is basically replace the /! path by 2710 # all this does is basically replace the /! path by
2022 # a new random map path (?random/...) with a seed 2711 # a new random map path (?random/...) with a seed
2023 # that depends on the exit object 2712 # that depends on the exit object
2024 2713
2025 my $rmp = parse_random_map_params $exit->msg; 2714 my $rmp = parse_random_map_params $exit->msg;
… …
2027 if ($exit->map) { 2716 if ($exit->map) {
2028 $rmp->{region} = $exit->region->name; 2717 $rmp->{region} = $exit->region->name;
2029 $rmp->{origin_map} = $exit->map->path; 2718 $rmp->{origin_map} = $exit->map->path;
2030 $rmp->{origin_x} = $exit->x; 2719 $rmp->{origin_x} = $exit->x;
2031 $rmp->{origin_y} = $exit->y; 2720 $rmp->{origin_y} = $exit->y;
2721
2722 $exit->map->touch;
2032 } 2723 }
2033 2724
2034 $rmp->{random_seed} ||= $exit->random_seed; 2725 $rmp->{random_seed} ||= $exit->random_seed;
2035 2726
2036 my $data = cf::to_json $rmp; 2727 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2037 my $md5 = Digest::MD5::md5_hex $data; 2728 my $md5 = Digest::MD5::md5_hex $data;
2038 my $meta = "$RANDOMDIR/$md5.meta"; 2729 my $meta = "$RANDOMDIR/$md5.meta";
2039 2730
2040 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2731 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2041 aio_write $fh, 0, (length $data), $data, 0; 2732 aio_write $fh, 0, (length $data), $data, 0;
2042 undef $fh; 2733 undef $fh;
2043 aio_rename "$meta~", $meta; 2734 aio_rename "$meta~", $meta;
2044 2735
2736 my $slaying = "?random/$md5";
2737
2738 if ($exit->valid) {
2045 $exit->slaying ("?random/$md5"); 2739 $exit->slaying ("?random/$md5");
2046 $exit->msg (undef); 2740 $exit->msg (undef);
2741 }
2047 } 2742 }
2048} 2743}
2049 2744
2050sub cf::object::player::enter_exit { 2745sub cf::object::player::enter_exit {
2051 my ($self, $exit) = @_; 2746 my ($self, $exit) = @_;
2052 2747
2053 return unless $self->type == cf::PLAYER; 2748 return unless $self->type == cf::PLAYER;
2054 2749
2055 if ($exit->slaying eq "/!") {
2056 #TODO: this should de-fi-ni-te-ly not be a sync-job
2057 # the problem is that $exit might not survive long enough
2058 # so it needs to be done right now, right here
2059 cf::sync_job { prepare_random_map $exit };
2060 }
2061
2062 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2063 my $hp = $exit->stats->hp;
2064 my $sp = $exit->stats->sp;
2065
2066 $self->enter_link; 2750 $self->enter_link;
2067 2751
2068 (async { 2752 (async {
2069 $self->deactivate_recursive; # just to be sure 2753 $Coro::current->{desc} = "enter_exit";
2754
2070 unless (eval { 2755 unless (eval {
2756 $self->deactivate_recursive; # just to be sure
2757
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2767 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp;
2769
2071 $self->goto ($slaying, $hp, $sp); 2770 $self->goto ($map, $x, $y);
2072 2771
2772 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED);
2775
2073 1; 2776 1
2074 }) { 2777 }) {
2075 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the deliantra server. "
2076 . "I'll try to bring you back to the map you were before. " 2779 . "I'll try to bring you back to the map you were before. "
2077 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
2078 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
2079 2782
2080 warn "ERROR in enter_exit: $@"; 2783 warn "ERROR in enter_exit: $@";
… …
2099 2802
2100 utf8::encode $text; 2803 utf8::encode $text;
2101 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2102} 2805}
2103 2806
2807=item $client->send_big_packet ($pkt)
2808
2809Like C<send_packet>, but tries to compress large packets, and fragments
2810them as required.
2811
2812=cut
2813
2814our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2815
2816sub cf::client::send_big_packet {
2817 my ($self, $pkt) = @_;
2818
2819 # try lzf for large packets
2820 $pkt = "lzf " . Compress::LZF::compress $pkt
2821 if 1024 <= length $pkt and $self->{can_lzf};
2822
2823 # split very large packets
2824 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2825 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2826 $pkt = "frag";
2827 }
2828
2829 $self->send_packet ($pkt);
2830}
2831
2832=item $client->send_msg ($channel, $msg, $color, [extra...])
2833
2834Send a drawinfo or msg packet to the client, formatting the msg for the
2835client if neccessary. C<$type> should be a string identifying the type of
2836the message, with C<log> being the default. If C<$color> is negative, suppress
2837the message unless the client supports the msg packet.
2838
2839=cut
2840
2841# non-persistent channels (usually the info channel)
2842our %CHANNEL = (
2843 "c/motd" => {
2844 id => "infobox",
2845 title => "MOTD",
2846 reply => undef,
2847 tooltip => "The message of the day",
2848 },
2849 "c/identify" => {
2850 id => "infobox",
2851 title => "Identify",
2852 reply => undef,
2853 tooltip => "Items recently identified",
2854 },
2855 "c/examine" => {
2856 id => "infobox",
2857 title => "Examine",
2858 reply => undef,
2859 tooltip => "Signs and other items you examined",
2860 },
2861 "c/shopinfo" => {
2862 id => "infobox",
2863 title => "Shop Info",
2864 reply => undef,
2865 tooltip => "What your bargaining skill tells you about the shop",
2866 },
2867 "c/book" => {
2868 id => "infobox",
2869 title => "Book",
2870 reply => undef,
2871 tooltip => "The contents of a note or book",
2872 },
2873 "c/lookat" => {
2874 id => "infobox",
2875 title => "Look",
2876 reply => undef,
2877 tooltip => "What you saw there",
2878 },
2879 "c/who" => {
2880 id => "infobox",
2881 title => "Players",
2882 reply => undef,
2883 tooltip => "Shows players who are currently online",
2884 },
2885 "c/body" => {
2886 id => "infobox",
2887 title => "Body Parts",
2888 reply => undef,
2889 tooltip => "Shows which body parts you posess and are available",
2890 },
2891 "c/statistics" => {
2892 id => "infobox",
2893 title => "Statistics",
2894 reply => undef,
2895 tooltip => "Shows your primary statistics",
2896 },
2897 "c/skills" => {
2898 id => "infobox",
2899 title => "Skills",
2900 reply => undef,
2901 tooltip => "Shows your experience per skill and item power",
2902 },
2903 "c/shopitems" => {
2904 id => "infobox",
2905 title => "Shop Items",
2906 reply => undef,
2907 tooltip => "Shows the items currently for sale in this shop",
2908 },
2909 "c/resistances" => {
2910 id => "infobox",
2911 title => "Resistances",
2912 reply => undef,
2913 tooltip => "Shows your resistances",
2914 },
2915 "c/pets" => {
2916 id => "infobox",
2917 title => "Pets",
2918 reply => undef,
2919 tooltip => "Shows information abotu your pets/a specific pet",
2920 },
2921 "c/perceiveself" => {
2922 id => "infobox",
2923 title => "Perceive Self",
2924 reply => undef,
2925 tooltip => "You gained detailed knowledge about yourself",
2926 },
2927 "c/uptime" => {
2928 id => "infobox",
2929 title => "Uptime",
2930 reply => undef,
2931 tooltip => "How long the server has been running since last restart",
2932 },
2933 "c/mapinfo" => {
2934 id => "infobox",
2935 title => "Map Info",
2936 reply => undef,
2937 tooltip => "Information related to the maps",
2938 },
2939 "c/party" => {
2940 id => "party",
2941 title => "Party",
2942 reply => "gsay ",
2943 tooltip => "Messages and chat related to your party",
2944 },
2945 "c/death" => {
2946 id => "death",
2947 title => "Death",
2948 reply => undef,
2949 tooltip => "Reason for and more info about your most recent death",
2950 },
2951 "c/say" => $SAY_CHANNEL,
2952 "c/chat" => $CHAT_CHANNEL,
2953);
2954
2955sub cf::client::send_msg {
2956 my ($self, $channel, $msg, $color, @extra) = @_;
2957
2958 $msg = $self->pl->expand_cfpod ($msg)
2959 unless $color & cf::NDI_VERBATIM;
2960
2961 $color &= cf::NDI_CLIENT_MASK; # just in case...
2962
2963 # check predefined channels, for the benefit of C
2964 if ($CHANNEL{$channel}) {
2965 $channel = $CHANNEL{$channel};
2966
2967 $self->ext_msg (channel_info => $channel);
2968 $channel = $channel->{id};
2969
2970 } elsif (ref $channel) {
2971 # send meta info to client, if not yet sent
2972 unless (exists $self->{channel}{$channel->{id}}) {
2973 $self->{channel}{$channel->{id}} = $channel;
2974 $self->ext_msg (channel_info => $channel);
2975 }
2976
2977 $channel = $channel->{id};
2978 }
2979
2980 return unless @extra || length $msg;
2981
2982 # default colour, mask it out
2983 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2984 if $color & cf::NDI_DEF;
2985
2986 my $pkt = "msg "
2987 . $self->{json_coder}->encode (
2988 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2989 );
2990
2991 $self->send_big_packet ($pkt);
2992}
2993
2104=item $client->ext_event ($type, %msg) 2994=item $client->ext_msg ($type, @msg)
2105 2995
2106Sends an exti event to the client. 2996Sends an ext event to the client.
2107 2997
2108=cut 2998=cut
2109 2999
2110sub cf::client::ext_event($$%) { 3000sub cf::client::ext_msg($$@) {
2111 my ($self, $type, %msg) = @_; 3001 my ($self, $type, @msg) = @_;
2112 3002
3003 if ($self->extcmd == 2) {
3004 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3005 } elsif ($self->extcmd == 1) { # TODO: remove
2113 $msg{msgtype} = "event_$type"; 3006 push @msg, msgtype => "event_$type";
2114 $self->send_packet ("ext " . cf::to_json \%msg); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3008 }
3009}
3010
3011=item $client->ext_reply ($msgid, @msg)
3012
3013Sends an ext reply to the client.
3014
3015=cut
3016
3017sub cf::client::ext_reply($$@) {
3018 my ($self, $id, @msg) = @_;
3019
3020 if ($self->extcmd == 2) {
3021 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3022 } elsif ($self->extcmd == 1) {
3023 #TODO: version 1, remove
3024 unshift @msg, msgtype => "reply", msgid => $id;
3025 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3026 }
2115} 3027}
2116 3028
2117=item $success = $client->query ($flags, "text", \&cb) 3029=item $success = $client->query ($flags, "text", \&cb)
2118 3030
2119Queues a query to the client, calling the given callback with 3031Queues a query to the client, calling the given callback with
2120the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 3032the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2121C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 3033C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2122 3034
2123Queries can fail, so check the return code. Or don't, as queries will become 3035Queries can fail, so check the return code. Or don't, as queries will
2124reliable at some point in the future. 3036become reliable at some point in the future.
2125 3037
2126=cut 3038=cut
2127 3039
2128sub cf::client::query { 3040sub cf::client::query {
2129 my ($self, $flags, $text, $cb) = @_; 3041 my ($self, $flags, $text, $cb) = @_;
… …
2137 utf8::encode $text; 3049 utf8::encode $text;
2138 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 3050 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2139 3051
2140 $self->send_packet ($self->{query_queue}[0][0]) 3052 $self->send_packet ($self->{query_queue}[0][0])
2141 if @{ $self->{query_queue} } == 1; 3053 if @{ $self->{query_queue} } == 1;
3054
3055 1
2142} 3056}
2143 3057
2144cf::client->attach ( 3058cf::client->attach (
3059 on_connect => sub {
3060 my ($ns) = @_;
3061
3062 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3063 },
2145 on_reply => sub { 3064 on_reply => sub {
2146 my ($ns, $msg) = @_; 3065 my ($ns, $msg) = @_;
2147 3066
2148 # this weird shuffling is so that direct followup queries 3067 # this weird shuffling is so that direct followup queries
2149 # get handled first 3068 # get handled first
… …
2161 } else { 3080 } else {
2162 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3081 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2163 } 3082 }
2164 } 3083 }
2165 }, 3084 },
3085 on_exticmd => sub {
3086 my ($ns, $buf) = @_;
3087
3088 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3089
3090 if (ref $msg) {
3091 my ($type, $reply, @payload) =
3092 "ARRAY" eq ref $msg
3093 ? @$msg
3094 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3095
3096 my @reply;
3097
3098 if (my $cb = $EXTICMD{$type}) {
3099 @reply = $cb->($ns, @payload);
3100 }
3101
3102 $ns->ext_reply ($reply, @reply)
3103 if $reply;
3104
3105 } else {
3106 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3107 }
3108
3109 cf::override;
3110 },
2166); 3111);
2167 3112
2168=item $client->async (\&cb) 3113=item $client->async (\&cb)
2169 3114
2170Create a new coroutine, running the specified callback. The coroutine will 3115Create a new coroutine, running the specified callback. The coroutine will
… …
2211our $safe = new Safe "safe"; 3156our $safe = new Safe "safe";
2212our $safe_hole = new Safe::Hole; 3157our $safe_hole = new Safe::Hole;
2213 3158
2214$SIG{FPE} = 'IGNORE'; 3159$SIG{FPE} = 'IGNORE';
2215 3160
2216$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3161$safe->permit_only (Opcode::opset qw(
3162 :base_core :base_mem :base_orig :base_math :base_loop
3163 grepstart grepwhile mapstart mapwhile
3164 sort time
3165));
2217 3166
2218# here we export the classes and methods available to script code 3167# here we export the classes and methods available to script code
2219 3168
2220=pod 3169=pod
2221 3170
2222The following functions and methods are available within a safe environment: 3171The following functions and methods are available within a safe environment:
2223 3172
2224 cf::object contr pay_amount pay_player map 3173 cf::object
3174 contr pay_amount pay_player map x y force_find force_add destroy
3175 insert remove name archname title slaying race decrease split
3176 value
3177
2225 cf::object::player player 3178 cf::object::player
2226 cf::player peaceful 3179 player
2227 cf::map trigger 3180
3181 cf::player
3182 peaceful
3183
3184 cf::map
3185 trigger
2228 3186
2229=cut 3187=cut
2230 3188
2231for ( 3189for (
2232 ["cf::object" => qw(contr pay_amount pay_player map)], 3190 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3191 insert remove inv nrof name archname title slaying race
3192 decrease split destroy change_exp value msg lore send_msg)],
2233 ["cf::object::player" => qw(player)], 3193 ["cf::object::player" => qw(player)],
2234 ["cf::player" => qw(peaceful)], 3194 ["cf::player" => qw(peaceful send_msg)],
2235 ["cf::map" => qw(trigger)], 3195 ["cf::map" => qw(trigger)],
2236) { 3196) {
2237 no strict 'refs'; 3197 no strict 'refs';
2238 my ($pkg, @funs) = @$_; 3198 my ($pkg, @funs) = @$_;
2239 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2257 3217
2258 my $qcode = $code; 3218 my $qcode = $code;
2259 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3219 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2260 $qcode =~ s/\n/\\n/g; 3220 $qcode =~ s/\n/\\n/g;
2261 3221
3222 %vars = (_dummy => 0) unless %vars;
3223
3224 my @res;
2262 local $_; 3225 local $_;
2263 local @safe::cf::_safe_eval_args = values %vars;
2264 3226
2265 my $eval = 3227 my $eval =
2266 "do {\n" 3228 "do {\n"
2267 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3229 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2268 . "#line 0 \"{$qcode}\"\n" 3230 . "#line 0 \"{$qcode}\"\n"
2269 . $code 3231 . $code
2270 . "\n}" 3232 . "\n}"
2271 ; 3233 ;
2272 3234
3235 if ($CFG{safe_eval}) {
2273 sub_generation_inc; 3236 sub_generation_inc;
3237 local @safe::cf::_safe_eval_args = values %vars;
2274 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3238 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2275 sub_generation_inc; 3239 sub_generation_inc;
3240 } else {
3241 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval;
3243 }
2276 3244
2277 if ($@) { 3245 if ($@) {
2278 warn "$@"; 3246 warn "$@";
2279 warn "while executing safe code '$code'\n"; 3247 warn "while executing safe code '$code'\n";
2280 warn "with arguments " . (join " ", %vars) . "\n"; 3248 warn "with arguments " . (join " ", %vars) . "\n";
… …
2299=cut 3267=cut
2300 3268
2301sub register_script_function { 3269sub register_script_function {
2302 my ($fun, $cb) = @_; 3270 my ($fun, $cb) = @_;
2303 3271
2304 no strict 'refs'; 3272 $fun = "safe::$fun" if $CFG{safe_eval};
2305 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3273 *$fun = $safe_hole->wrap ($cb);
2306} 3274}
2307 3275
2308=back 3276=back
2309 3277
2310=cut 3278=cut
2311
2312#############################################################################
2313
2314=head2 EXTENSION DATABASE SUPPORT
2315
2316Crossfire maintains a very simple database for extension use. It can
2317currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2318convert to/from binary).
2319
2320The parameter C<$family> should best start with the name of the extension
2321using it, it should be unique.
2322
2323=over 4
2324
2325=item $value = cf::db_get $family => $key
2326
2327Returns a single value from the database.
2328
2329=item cf::db_put $family => $key => $value
2330
2331Stores the given C<$value> in the family.
2332
2333=cut
2334
2335our $DB;
2336
2337sub db_init {
2338 unless ($DB) {
2339 $DB = BDB::db_create $DB_ENV;
2340
2341 cf::sync_job {
2342 eval {
2343 $DB->set_flags (BDB::CHKSUM);
2344
2345 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2346 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2347 cf::cleanup "db_open(db): $!" if $!;
2348 };
2349 cf::cleanup "db_open(db): $@" if $@;
2350 };
2351 }
2352}
2353
2354sub db_get($$) {
2355 my $key = "$_[0]/$_[1]";
2356
2357 cf::sync_job {
2358 BDB::db_get $DB, undef, $key, my $data;
2359
2360 $! ? ()
2361 : $data
2362 }
2363}
2364
2365sub db_put($$$) {
2366 BDB::dbreq_pri 4;
2367 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2368}
2369
2370=item cf::cache $id => [$paths...], $processversion => $process
2371
2372Generic caching function that returns the value of the resource $id,
2373caching and regenerating as required.
2374
2375This function can block.
2376
2377=cut
2378
2379sub cache {
2380 my ($id, $src, $processversion, $process) = @_;
2381
2382 my $meta =
2383 join "\x00",
2384 $processversion,
2385 map {
2386 aio_stat $_
2387 and Carp::croak "$_: $!";
2388
2389 ($_, (stat _)[7,9])
2390 } @$src;
2391
2392 my $dbmeta = db_get cache => "$id/meta";
2393 if ($dbmeta ne $meta) {
2394 # changed, we may need to process
2395
2396 my @data;
2397 my $md5;
2398
2399 for (0 .. $#$src) {
2400 0 <= aio_load $src->[$_], $data[$_]
2401 or Carp::croak "$src->[$_]: $!";
2402 }
2403
2404 # if processing is expensive, check
2405 # checksum first
2406 if (1) {
2407 $md5 =
2408 join "\x00",
2409 $processversion,
2410 map {
2411 Coro::cede;
2412 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2413 } 0.. $#$src;
2414
2415
2416 my $dbmd5 = db_get cache => "$id/md5";
2417 if ($dbmd5 eq $md5) {
2418 db_put cache => "$id/meta", $meta;
2419
2420 return db_get cache => "$id/data";
2421 }
2422 }
2423
2424 my $t1 = Time::HiRes::time;
2425 my $data = $process->(\@data);
2426 my $t2 = Time::HiRes::time;
2427
2428 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2429
2430 db_put cache => "$id/data", $data;
2431 db_put cache => "$id/md5" , $md5;
2432 db_put cache => "$id/meta", $meta;
2433
2434 return $data;
2435 }
2436
2437 db_get cache => "$id/data"
2438}
2439
2440=item fork_call { }, $args
2441
2442Executes the given code block with the given arguments in a seperate
2443process, returning the results. Everything must be serialisable with
2444Coro::Storable. May, of course, block. Note that the executed sub may
2445never block itself or use any form of Event handling.
2446
2447=cut
2448
2449sub fork_call(&@) {
2450 my ($cb, @args) = @_;
2451
2452# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2453# or die "socketpair: $!";
2454 pipe my $fh1, my $fh2
2455 or die "pipe: $!";
2456
2457 if (my $pid = fork) {
2458 close $fh2;
2459
2460 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2461 $res = Coro::Storable::thaw $res;
2462
2463 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2464
2465 die $$res unless "ARRAY" eq ref $res;
2466
2467 return wantarray ? @$res : $res->[-1];
2468 } else {
2469 reset_signals;
2470 local $SIG{__WARN__};
2471 local $SIG{__DIE__};
2472 eval {
2473 close $fh1;
2474
2475 my @res = eval { $cb->(@args) };
2476 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2477 };
2478
2479 warn $@ if $@;
2480 _exit 0;
2481 }
2482}
2483 3279
2484############################################################################# 3280#############################################################################
2485# the server's init and main functions 3281# the server's init and main functions
2486 3282
2487sub load_facedata($) { 3283sub load_facedata($) {
2488 my ($path) = @_; 3284 my ($path) = @_;
3285
3286 # HACK to clear player env face cache, we need some signal framework
3287 # for this (global event?)
3288 %ext::player_env::MUSIC_FACE_CACHE = ();
3289
3290 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2489 3291
2490 warn "loading facedata from $path\n"; 3292 warn "loading facedata from $path\n";
2491 3293
2492 my $facedata; 3294 my $facedata;
2493 0 < aio_load $path, $facedata 3295 0 < aio_load $path, $facedata
… …
2496 $facedata = Coro::Storable::thaw $facedata; 3298 $facedata = Coro::Storable::thaw $facedata;
2497 3299
2498 $facedata->{version} == 2 3300 $facedata->{version} == 2
2499 or cf::cleanup "$path: version mismatch, cannot proceed."; 3301 or cf::cleanup "$path: version mismatch, cannot proceed.";
2500 3302
3303 # patch in the exptable
3304 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3305 $facedata->{resource}{"res/exp_table"} = {
3306 type => FT_RSRC,
3307 data => $exp_table,
3308 hash => (Digest::MD5::md5 $exp_table),
3309 };
3310 cf::cede_to_tick;
3311
2501 { 3312 {
2502 my $faces = $facedata->{faceinfo}; 3313 my $faces = $facedata->{faceinfo};
2503 3314
2504 while (my ($face, $info) = each %$faces) { 3315 while (my ($face, $info) = each %$faces) {
2505 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3316 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3317
2506 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3318 cf::face::set_visibility $idx, $info->{visibility};
3319 cf::face::set_magicmap $idx, $info->{magicmap};
2507 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2508 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2509 Coro::cede; 3322
3323 cf::cede_to_tick;
2510 } 3324 }
2511 3325
2512 while (my ($face, $info) = each %$faces) { 3326 while (my ($face, $info) = each %$faces) {
2513 next unless $info->{smooth}; 3327 next unless $info->{smooth};
3328
2514 my $idx = cf::face::find $face 3329 my $idx = cf::face::find $face
2515 or next; 3330 or next;
3331
2516 if (my $smooth = cf::face::find $info->{smooth}) { 3332 if (my $smooth = cf::face::find $info->{smooth}) {
3333 cf::face::set_smooth $idx, $smooth;
2517 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3334 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2518 } else { 3335 } else {
2519 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3336 warn "smooth face '$info->{smooth}' not found for face '$face'";
2520 } 3337 }
2521 Coro::cede; 3338
3339 cf::cede_to_tick;
2522 } 3340 }
2523 } 3341 }
2524 3342
2525 { 3343 {
2526 my $anims = $facedata->{animinfo}; 3344 my $anims = $facedata->{animinfo};
2527 3345
2528 while (my ($anim, $info) = each %$anims) { 3346 while (my ($anim, $info) = each %$anims) {
2529 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3347 cf::anim::set $anim, $info->{frames}, $info->{facings};
2530 Coro::cede; 3348 cf::cede_to_tick;
2531 } 3349 }
2532 3350
2533 cf::anim::invalidate_all; # d'oh 3351 cf::anim::invalidate_all; # d'oh
2534 } 3352 }
2535 3353
3354 {
3355 my $res = $facedata->{resource};
3356
3357 while (my ($name, $info) = each %$res) {
3358 if (defined $info->{type}) {
3359 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3360
3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3362 cf::face::set_type $idx, $info->{type};
3363 } else {
3364 $RESOURCE{$name} = $info;
3365 }
3366
3367 cf::cede_to_tick;
3368 }
3369 }
3370
3371 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3372
2536 1 3373 1
2537} 3374}
2538 3375
3376cf::global->attach (on_resource_update => sub {
3377 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3378 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3379
3380 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3381 my $sound = $soundconf->{compat}[$_]
3382 or next;
3383
3384 my $face = cf::face::find "sound/$sound->[1]";
3385 cf::sound::set $sound->[0] => $face;
3386 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3387 }
3388
3389 while (my ($k, $v) = each %{$soundconf->{event}}) {
3390 my $face = cf::face::find "sound/$v";
3391 cf::sound::set $k => $face;
3392 }
3393 }
3394});
3395
3396register_exticmd fx_want => sub {
3397 my ($ns, $want) = @_;
3398
3399 while (my ($k, $v) = each %$want) {
3400 $ns->fx_want ($k, $v);
3401 }
3402};
3403
3404sub load_resource_file($) {
3405 my $guard = lock_acquire "load_resource_file";
3406
3407 my $status = load_resource_file_ $_[0];
3408 get_slot 0.1, 100;
3409 cf::arch::commit_load;
3410
3411 $status
3412}
3413
2539sub reload_regions { 3414sub reload_regions {
3415 # HACK to clear player env face cache, we need some signal framework
3416 # for this (global event?)
3417 %ext::player_env::MUSIC_FACE_CACHE = ();
3418
2540 load_resource_file "$MAPDIR/regions" 3419 load_resource_file "$MAPDIR/regions"
2541 or die "unable to load regions file\n"; 3420 or die "unable to load regions file\n";
3421
3422 for (cf::region::list) {
3423 $_->{match} = qr/$_->{match}/
3424 if exists $_->{match};
3425 }
2542} 3426}
2543 3427
2544sub reload_facedata { 3428sub reload_facedata {
2545 load_facedata "$DATADIR/facedata" 3429 load_facedata "$DATADIR/facedata"
2546 or die "unable to load facedata\n"; 3430 or die "unable to load facedata\n";
… …
2557} 3441}
2558 3442
2559sub reload_resources { 3443sub reload_resources {
2560 warn "reloading resource files...\n"; 3444 warn "reloading resource files...\n";
2561 3445
2562 reload_regions;
2563 reload_facedata; 3446 reload_facedata;
2564 reload_archetypes; 3447 reload_archetypes;
3448 reload_regions;
2565 reload_treasures; 3449 reload_treasures;
2566 3450
2567 warn "finished reloading resource files\n"; 3451 warn "finished reloading resource files\n";
2568} 3452}
2569 3453
2570sub init { 3454sub reload_config {
2571 reload_resources; 3455 warn "reloading config file...\n";
2572}
2573 3456
2574sub cfg_load {
2575 open my $fh, "<:utf8", "$CONFDIR/config" 3457 open my $fh, "<:utf8", "$CONFDIR/config"
2576 or return; 3458 or return;
2577 3459
2578 local $/; 3460 local $/;
2579 *CFG = YAML::Syck::Load <$fh>; 3461 *CFG = YAML::XS::Load scalar <$fh>;
2580 3462
2581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2582 3464
2583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2588 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2589 and die "WARNING: m(un)lockall failed: $!\n"; 3471 and die "WARNING: m(un)lockall failed: $!\n";
2590 }; 3472 };
2591 warn $@ if $@; 3473 warn $@ if $@;
2592 } 3474 }
3475
3476 warn "finished reloading resource files\n";
3477}
3478
3479sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!";
3482 flock $fh, &Fcntl::LOCK_EX
3483 or die "$PIDFILE: flock: $!";
3484 $fh
3485}
3486
3487# make sure only one server instance is running at any one time
3488sub atomic {
3489 my $fh = pidfile;
3490
3491 my $pid = <$fh>;
3492 kill 9, $pid if $pid > 0;
3493
3494 seek $fh, 0, 0;
3495 print $fh $$;
3496}
3497
3498sub main_loop {
3499 warn "EV::loop starting\n";
3500 if (1) {
3501 EV::loop;
3502 }
3503 warn "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP;
2593} 3505}
2594 3506
2595sub main { 3507sub main {
3508 cf::init_globals; # initialise logging
3509
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514
3515 cf::init_experience;
3516 cf::init_anim;
3517 cf::init_attackmess;
3518 cf::init_dynamic;
3519
3520 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521
2596 # we must not ever block the main coroutine 3522 # we must not ever block the main coroutine
2597 local $Coro::idle = sub { 3523 local $Coro::idle = sub {
2598 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3524 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2599 (async { 3525 (async {
2600 Event::one_event; 3526 $Coro::current->{desc} = "IDLE BUG HANDLER";
3527 EV::loop EV::LOOP_ONESHOT;
2601 })->prio (Coro::PRIO_MAX); 3528 })->prio (Coro::PRIO_MAX);
2602 }; 3529 };
2603 3530
2604 cfg_load; 3531 evthread_start IO::AIO::poll_fileno;
3532
3533 cf::sync_job {
3534 cf::load_settings;
3535 cf::load_materials;
3536
3537 reload_resources;
3538 reload_config;
2605 db_init; 3539 db_init;
3540
3541 cf::init_uuid;
3542 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills;
3545
3546 cf::init_beforeplay;
3547
3548 atomic;
3549
2606 load_extensions; 3550 load_extensions;
2607 3551
2608 $TICK_WATCHER->start; 3552 utime time, time, $RUNTIMEFILE;
2609 Event::loop; 3553
3554 # no (long-running) fork's whatsoever before this point(!)
3555 use POSIX ();
3556 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557
3558 (pop @POST_INIT)->(0) while @POST_INIT;
3559 };
3560
3561 main_loop;
2610} 3562}
2611 3563
2612############################################################################# 3564#############################################################################
2613# initialisation and cleanup 3565# initialisation and cleanup
2614 3566
2615# install some emergency cleanup handlers 3567# install some emergency cleanup handlers
2616BEGIN { 3568BEGIN {
3569 our %SIGWATCHER = ();
2617 for my $signal (qw(INT HUP TERM)) { 3570 for my $signal (qw(INT HUP TERM)) {
2618 Event->signal ( 3571 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2619 reentrant => 0,
2620 data => WF_AUTOCANCEL,
2621 signal => $signal,
2622 prio => 0,
2623 cb => sub {
2624 cf::cleanup "SIG$signal"; 3572 cf::cleanup "SIG$signal";
2625 },
2626 ); 3573 };
3574 }
3575}
3576
3577sub write_runtime_sync {
3578 # first touch the runtime file to show we are still running:
3579 # the fsync below can take a very very long time.
3580
3581 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3582
3583 my $guard = cf::lock_acquire "write_runtime";
3584
3585 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3586 or return;
3587
3588 my $value = $cf::RUNTIME + 90 + 10;
3589 # 10 is the runtime save interval, for a monotonic clock
3590 # 60 allows for the watchdog to kill the server.
3591
3592 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3593 and return;
3594
3595 # always fsync - this file is important
3596 aio_fsync $fh
3597 and return;
3598
3599 # touch it again to show we are up-to-date
3600 aio_utime $fh, undef, undef;
3601
3602 close $fh
3603 or return;
3604
3605 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3606 and return;
3607
3608 warn "runtime file written.\n";
3609
2627 } 3610 1
3611}
3612
3613our $uuid_lock;
3614our $uuid_skip;
3615
3616sub write_uuid_sync($) {
3617 $uuid_skip ||= $_[0];
3618
3619 return if $uuid_lock;
3620 local $uuid_lock = 1;
3621
3622 my $uuid = "$LOCALDIR/uuid";
3623
3624 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3625 or return;
3626
3627 my $value = uuid_seq uuid_cur;
3628
3629 unless ($value) {
3630 warn "cowardly refusing to write zero uuid value!\n";
3631 return;
3632 }
3633
3634 my $value = uuid_str $value + $uuid_skip;
3635 $uuid_skip = 0;
3636
3637 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3638 and return;
3639
3640 # always fsync - this file is important
3641 aio_fsync $fh
3642 and return;
3643
3644 close $fh
3645 or return;
3646
3647 aio_rename "$uuid~", $uuid
3648 and return;
3649
3650 warn "uuid file written ($value).\n";
3651
3652 1
3653
3654}
3655
3656sub write_uuid($$) {
3657 my ($skip, $sync) = @_;
3658
3659 $sync ? write_uuid_sync $skip
3660 : async { write_uuid_sync $skip };
2628} 3661}
2629 3662
2630sub emergency_save() { 3663sub emergency_save() {
2631 my $freeze_guard = cf::freeze_mainloop; 3664 my $freeze_guard = cf::freeze_mainloop;
2632 3665
2633 warn "enter emergency perl save\n"; 3666 warn "emergency_perl_save: enter\n";
2634 3667
2635 cf::sync_job { 3668 cf::sync_job {
3669 # this is a trade-off: we want to be very quick here, so
3670 # save all maps without fsync, and later call a global sync
3671 # (which in turn might be very very slow)
3672 local $USE_FSYNC = 0;
3673
2636 # use a peculiar iteration method to avoid tripping on perl 3674 # use a peculiar iteration method to avoid tripping on perl
2637 # refcount bugs in for. also avoids problems with players 3675 # refcount bugs in for. also avoids problems with players
2638 # and maps saved/destroyed asynchronously. 3676 # and maps saved/destroyed asynchronously.
2639 warn "begin emergency player save\n"; 3677 warn "emergency_perl_save: begin player save\n";
2640 for my $login (keys %cf::PLAYER) { 3678 for my $login (keys %cf::PLAYER) {
2641 my $pl = $cf::PLAYER{$login} or next; 3679 my $pl = $cf::PLAYER{$login} or next;
2642 $pl->valid or next; 3680 $pl->valid or next;
3681 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2643 $pl->save; 3682 $pl->save;
2644 } 3683 }
2645 warn "end emergency player save\n"; 3684 warn "emergency_perl_save: end player save\n";
2646 3685
2647 warn "begin emergency map save\n"; 3686 warn "emergency_perl_save: begin map save\n";
2648 for my $path (keys %cf::MAP) { 3687 for my $path (keys %cf::MAP) {
2649 my $map = $cf::MAP{$path} or next; 3688 my $map = $cf::MAP{$path} or next;
2650 $map->valid or next; 3689 $map->valid or next;
2651 $map->save; 3690 $map->save;
2652 } 3691 }
2653 warn "end emergency map save\n"; 3692 warn "emergency_perl_save: end map save\n";
2654 3693
2655 warn "begin emergency database checkpoint\n"; 3694 warn "emergency_perl_save: begin database checkpoint\n";
2656 BDB::db_env_txn_checkpoint $DB_ENV; 3695 BDB::db_env_txn_checkpoint $DB_ENV;
2657 warn "end emergency database checkpoint\n"; 3696 warn "emergency_perl_save: end database checkpoint\n";
3697
3698 warn "emergency_perl_save: begin write uuid\n";
3699 write_uuid_sync 1;
3700 warn "emergency_perl_save: end write uuid\n";
2658 }; 3701 };
2659 3702
3703 warn "emergency_perl_save: starting sync()\n";
3704 IO::AIO::aio_sync sub {
3705 warn "emergency_perl_save: finished sync()\n";
3706 };
3707
2660 warn "leave emergency perl save\n"; 3708 warn "emergency_perl_save: leave\n";
2661} 3709}
2662 3710
2663sub post_cleanup { 3711sub post_cleanup {
2664 my ($make_core) = @_; 3712 my ($make_core) = @_;
2665 3713
2666 warn Carp::longmess "post_cleanup backtrace" 3714 warn Carp::longmess "post_cleanup backtrace"
2667 if $make_core; 3715 if $make_core;
3716
3717 my $fh = pidfile;
3718 unlink $PIDFILE if <$fh> == $$;
3719}
3720
3721# a safer delete_package, copied from Symbol
3722sub clear_package($) {
3723 my $pkg = shift;
3724
3725 # expand to full symbol table name if needed
3726 unless ($pkg =~ /^main::.*::$/) {
3727 $pkg = "main$pkg" if $pkg =~ /^::/;
3728 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3729 $pkg .= '::' unless $pkg =~ /::$/;
3730 }
3731
3732 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3733 my $stem_symtab = *{$stem}{HASH};
3734
3735 defined $stem_symtab and exists $stem_symtab->{$leaf}
3736 or return;
3737
3738 # clear all symbols
3739 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3740 for my $name (keys %$leaf_symtab) {
3741 _gv_clear *{"$pkg$name"};
3742# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3743 }
3744 warn "cleared package $pkg\n";#d#
2668} 3745}
2669 3746
2670sub do_reload_perl() { 3747sub do_reload_perl() {
2671 # can/must only be called in main 3748 # can/must only be called in main
2672 if ($Coro::current != $Coro::main) { 3749 if ($Coro::current != $Coro::main) {
2673 warn "can only reload from main coroutine"; 3750 warn "can only reload from main coroutine";
2674 return; 3751 return;
2675 } 3752 }
2676 3753
3754 return if $RELOAD++;
3755
3756 my $t1 = EV::time;
3757
3758 while ($RELOAD) {
2677 warn "reloading..."; 3759 warn "reloading...";
2678 3760
2679 warn "entering sync_job"; 3761 warn "entering sync_job";
2680 3762
2681 cf::sync_job { 3763 cf::sync_job {
2682 cf::write_runtime; # external watchdog should not bark 3764 cf::write_runtime_sync; # external watchdog should not bark
2683 cf::emergency_save; 3765 cf::emergency_save;
2684 cf::write_runtime; # external watchdog should not bark 3766 cf::write_runtime_sync; # external watchdog should not bark
2685 3767
2686 warn "syncing database to disk"; 3768 warn "syncing database to disk";
2687 BDB::db_env_txn_checkpoint $DB_ENV; 3769 BDB::db_env_txn_checkpoint $DB_ENV;
2688 3770
2689 # if anything goes wrong in here, we should simply crash as we already saved 3771 # if anything goes wrong in here, we should simply crash as we already saved
2690 3772
2691 warn "cancelling all WF_AUTOCANCEL watchers";
2692 for (Event::all_watchers) {
2693 $_->cancel if $_->data & WF_AUTOCANCEL;
2694 }
2695
2696 warn "flushing outstanding aio requests"; 3773 warn "flushing outstanding aio requests";
2697 for (;;) {
2698 BDB::flush;
2699 IO::AIO::flush;
2700 Coro::cede;
2701 last unless IO::AIO::nreqs || BDB::nreqs; 3774 while (IO::AIO::nreqs || BDB::nreqs) {
2702 warn "iterate..."; 3775 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2703 }
2704
2705 ++$RELOAD;
2706
2707 warn "cancelling all extension coros";
2708 $_->cancel for values %EXT_CORO;
2709 %EXT_CORO = ();
2710
2711 warn "removing commands";
2712 %COMMAND = ();
2713
2714 warn "removing ext commands";
2715 %EXTCMD = ();
2716
2717 warn "unloading/nuking all extensions";
2718 for my $pkg (@EXTS) {
2719 warn "... unloading $pkg";
2720
2721 if (my $cb = $pkg->can ("unload")) {
2722 eval {
2723 $cb->($pkg);
2724 1
2725 } or warn "$pkg unloaded, but with errors: $@";
2726 } 3776 }
2727 3777
2728 warn "... nuking $pkg"; 3778 warn "cancelling all extension coros";
2729 Symbol::delete_package $pkg; 3779 $_->cancel for values %EXT_CORO;
2730 } 3780 %EXT_CORO = ();
2731 3781
2732 warn "unloading all perl modules loaded from $LIBDIR"; 3782 warn "removing commands";
2733 while (my ($k, $v) = each %INC) { 3783 %COMMAND = ();
2734 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2735 3784
3785 warn "removing ext/exti commands";
3786 %EXTCMD = ();
3787 %EXTICMD = ();
3788
3789 warn "unloading/nuking all extensions";
3790 for my $pkg (@EXTS) {
2736 warn "... unloading $k"; 3791 warn "... unloading $pkg";
2737 delete $INC{$k};
2738 3792
2739 $k =~ s/\.pm$//;
2740 $k =~ s/\//::/g;
2741
2742 if (my $cb = $k->can ("unload_module")) { 3793 if (my $cb = $pkg->can ("unload")) {
3794 eval {
2743 $cb->(); 3795 $cb->($pkg);
3796 1
3797 } or warn "$pkg unloaded, but with errors: $@";
3798 }
3799
3800 warn "... clearing $pkg";
3801 clear_package $pkg;
2744 } 3802 }
2745 3803
2746 Symbol::delete_package $k; 3804 warn "unloading all perl modules loaded from $LIBDIR";
3805 while (my ($k, $v) = each %INC) {
3806 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3807
3808 warn "... unloading $k";
3809 delete $INC{$k};
3810
3811 $k =~ s/\.pm$//;
3812 $k =~ s/\//::/g;
3813
3814 if (my $cb = $k->can ("unload_module")) {
3815 $cb->();
3816 }
3817
3818 clear_package $k;
2747 } 3819 }
2748 3820
2749 warn "getting rid of safe::, as good as possible"; 3821 warn "getting rid of safe::, as good as possible";
2750 Symbol::delete_package "safe::$_" 3822 clear_package "safe::$_"
2751 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3823 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2752 3824
2753 warn "unloading cf.pm \"a bit\""; 3825 warn "unloading cf.pm \"a bit\"";
2754 delete $INC{"cf.pm"}; 3826 delete $INC{"cf.pm"};
2755 delete $INC{"cf/pod.pm"}; 3827 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2756 3828
2757 # don't, removes xs symbols, too, 3829 # don't, removes xs symbols, too,
2758 # and global variables created in xs 3830 # and global variables created in xs
2759 #Symbol::delete_package __PACKAGE__; 3831 #clear_package __PACKAGE__;
2760 3832
2761 warn "unload completed, starting to reload now"; 3833 warn "unload completed, starting to reload now";
2762 3834
2763 warn "reloading cf.pm"; 3835 warn "reloading cf.pm";
2764 require cf; 3836 require cf;
2765 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3837 cf::_connect_to_perl_1;
2766 3838
2767 warn "loading config and database again"; 3839 warn "loading config and database again";
2768 cf::cfg_load; 3840 cf::reload_config;
2769 3841
2770 warn "loading extensions"; 3842 warn "loading extensions";
2771 cf::load_extensions; 3843 cf::load_extensions;
2772 3844
3845 if ($REATTACH_ON_RELOAD) {
2773 warn "reattaching attachments to objects/players"; 3846 warn "reattaching attachments to objects/players";
2774 _global_reattach; # objects, sockets 3847 _global_reattach; # objects, sockets
2775 warn "reattaching attachments to maps"; 3848 warn "reattaching attachments to maps";
2776 reattach $_ for values %MAP; 3849 reattach $_ for values %MAP;
2777 warn "reattaching attachments to players"; 3850 warn "reattaching attachments to players";
2778 reattach $_ for values %PLAYER; 3851 reattach $_ for values %PLAYER;
3852 }
2779 3853
3854 warn "running post_init jobs";
3855 (pop @POST_INIT)->(1) while @POST_INIT;
3856
2780 warn "leaving sync_job"; 3857 warn "leaving sync_job";
2781 3858
2782 1 3859 1
2783 } or do { 3860 } or do {
2784 warn $@; 3861 warn $@;
2785 warn "error while reloading, exiting."; 3862 cf::cleanup "error while reloading, exiting.";
2786 exit 1;
2787 }; 3863 };
2788 3864
2789 warn "reloaded"; 3865 warn "reloaded";
3866 --$RELOAD;
3867 }
3868
3869 $t1 = EV::time - $t1;
3870 warn "reload completed in ${t1}s\n";
2790}; 3871};
2791 3872
2792our $RELOAD_WATCHER; # used only during reload 3873our $RELOAD_WATCHER; # used only during reload
2793 3874
2794sub reload_perl() { 3875sub reload_perl() {
2795 # doing reload synchronously and two reloads happen back-to-back, 3876 # doing reload synchronously and two reloads happen back-to-back,
2796 # coro crashes during coro_state_free->destroy here. 3877 # coro crashes during coro_state_free->destroy here.
2797 3878
2798 $RELOAD_WATCHER ||= Event->timer ( 3879 $RELOAD_WATCHER ||= cf::async {
2799 reentrant => 0, 3880 Coro::AIO::aio_wait cache_extensions;
2800 after => 0, 3881
2801 data => WF_AUTOCANCEL, 3882 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
2802 cb => sub {
2803 do_reload_perl; 3883 do_reload_perl;
2804 undef $RELOAD_WATCHER; 3884 undef $RELOAD_WATCHER;
2805 }, 3885 };
2806 ); 3886 };
2807} 3887}
2808 3888
2809register_command "reload" => sub { 3889register_command "reload" => sub {
2810 my ($who, $arg) = @_; 3890 my ($who, $arg) = @_;
2811 3891
2812 if ($who->flag (FLAG_WIZ)) { 3892 if ($who->flag (FLAG_WIZ)) {
2813 $who->message ("reloading server."); 3893 $who->message ("reloading server.");
3894 async {
3895 $Coro::current->{desc} = "perl_reload";
2814 async { reload_perl }; 3896 reload_perl;
3897 };
2815 } 3898 }
2816}; 3899};
2817 3900
2818unshift @INC, $LIBDIR; 3901unshift @INC, $LIBDIR;
2819 3902
… …
2821 3904
2822our @WAIT_FOR_TICK; 3905our @WAIT_FOR_TICK;
2823our @WAIT_FOR_TICK_BEGIN; 3906our @WAIT_FOR_TICK_BEGIN;
2824 3907
2825sub wait_for_tick { 3908sub wait_for_tick {
2826 return unless $TICK_WATCHER->is_active;
2827 return if $Coro::current == $Coro::main; 3909 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2828 3910
2829 my $signal = new Coro::Signal; 3911 my $signal = new Coro::Signal;
2830 push @WAIT_FOR_TICK, $signal; 3912 push @WAIT_FOR_TICK, $signal;
2831 $signal->wait; 3913 $signal->wait;
2832} 3914}
2833 3915
2834sub wait_for_tick_begin { 3916sub wait_for_tick_begin {
2835 return unless $TICK_WATCHER->is_active;
2836 return if $Coro::current == $Coro::main; 3917 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2837 3918
2838 my $signal = new Coro::Signal; 3919 my $signal = new Coro::Signal;
2839 push @WAIT_FOR_TICK_BEGIN, $signal; 3920 push @WAIT_FOR_TICK_BEGIN, $signal;
2840 $signal->wait; 3921 $signal->wait;
2841} 3922}
2842 3923
2843 my $min = 1e6;#d# 3924sub tick {
2844 my $avg = 10;
2845$TICK_WATCHER = Event->timer (
2846 reentrant => 0,
2847 parked => 1,
2848 prio => 0,
2849 at => $NEXT_TICK || $TICK,
2850 data => WF_AUTOCANCEL,
2851 cb => sub {
2852 if ($Coro::current != $Coro::main) { 3925 if ($Coro::current != $Coro::main) {
2853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3926 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2854 unless ++$bug_warning > 10; 3927 unless ++$bug_warning > 10;
2855 return; 3928 return;
2856 } 3929 }
2857 3930
2858 $NOW = $tick_start = Event::time;
2859
2860 cf::server_tick; # one server iteration 3931 cf::server_tick; # one server iteration
2861 3932
2862 0 && sync_job {#d# 3933 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
2863 for(1..10) {
2864 my $t = Event::time;
2865 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2866 or die;
2867 3934
2868 $map->width (50); 3935 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2869 $map->height (50); 3936 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2870 $map->alloc; 3937 Coro::async_pool {
2871 $map->_load_objects ("/tmp/x.map", 1); 3938 $Coro::current->{desc} = "runtime saver";
2872 my $t = Event::time - $t; 3939 write_runtime_sync
2873 3940 or warn "ERROR: unable to write runtime file: $!";
2874 #next unless $t < 0.0013;#d#
2875 if ($t < $min) {
2876 $min = $t;
2877 }
2878 $avg = $avg * 0.99 + $t * 0.01;
2879 }
2880 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2881 exit 0;
2882 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2883 }; 3941 };
3942 }
2884 3943
2885 $RUNTIME += $TICK;
2886 $NEXT_TICK += $TICK;
2887
2888 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2889 $NEXT_RUNTIME_WRITE = $NOW + 10;
2890 Coro::async_pool {
2891 write_runtime
2892 or warn "ERROR: unable to write runtime file: $!";
2893 };
2894 }
2895
2896# my $AFTER = Event::time;
2897# warn $AFTER - $NOW;#d#
2898
2899 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3944 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2900 $sig->send; 3945 $sig->send;
2901 } 3946 }
2902 while (my $sig = shift @WAIT_FOR_TICK) { 3947 while (my $sig = shift @WAIT_FOR_TICK) {
2903 $sig->send; 3948 $sig->send;
2904 } 3949 }
2905 3950
2906 $NOW = Event::time; 3951 $LOAD = ($NOW - $TICK_START) / $TICK;
2907
2908 # if we are delayed by four ticks or more, skip them all
2909 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2910
2911 $TICK_WATCHER->at ($NEXT_TICK);
2912 $TICK_WATCHER->start;
2913
2914 $LOAD = ($NOW - $tick_start) / $TICK;
2915 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3952 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2916 3953
2917 _post_tick; 3954 if (0) {
2918 3955 if ($NEXT_TICK) {
2919 3956 my $jitter = $TICK_START - $NEXT_TICK;
3957 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3958 warn "jitter $JITTER\n";#d#
3959 }
2920 }, 3960 }
2921); 3961}
2922 3962
2923{ 3963{
2924 BDB::max_poll_time $TICK * 0.1; 3964 # configure BDB
2925 $BDB_POLL_WATCHER = Event->io ( 3965
2926 reentrant => 0,
2927 fd => BDB::poll_fileno,
2928 poll => 'r',
2929 prio => 0,
2930 data => WF_AUTOCANCEL,
2931 cb => \&BDB::poll_cb,
2932 );
2933 BDB::min_parallel 8; 3966 BDB::min_parallel 16;
2934 3967 BDB::max_poll_reqs $TICK * 0.1;
2935 BDB::set_sync_prepare { 3968 $AnyEvent::BDB::WATCHER->priority (1);
2936 my $status;
2937 my $current = $Coro::current;
2938 (
2939 sub {
2940 $status = $!;
2941 $current->ready; undef $current;
2942 },
2943 sub {
2944 Coro::schedule while defined $current;
2945 $! = $status;
2946 },
2947 )
2948 };
2949 3969
2950 unless ($DB_ENV) { 3970 unless ($DB_ENV) {
2951 $DB_ENV = BDB::db_env_create; 3971 $DB_ENV = BDB::db_env_create;
3972 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3973 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3974 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3975 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3976 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2952 3977
2953 cf::sync_job { 3978 cf::sync_job {
2954 eval { 3979 eval {
2955 BDB::db_env_open 3980 BDB::db_env_open
2956 $DB_ENV, 3981 $DB_ENV,
… …
2958 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3983 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2959 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3984 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2960 0666; 3985 0666;
2961 3986
2962 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3987 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2963
2964 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2965 $DB_ENV->set_lk_detect;
2966 }; 3988 };
2967 3989
2968 cf::cleanup "db_env_open(db): $@" if $@; 3990 cf::cleanup "db_env_open(db): $@" if $@;
2969 }; 3991 };
2970 } 3992 }
3993
3994 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3995 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3996 };
3997 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3998 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3999 };
4000 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4001 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4002 };
2971} 4003}
2972 4004
2973{ 4005{
4006 # configure IO::AIO
4007
2974 IO::AIO::min_parallel 8; 4008 IO::AIO::min_parallel 8;
2975
2976 undef $Coro::AIO::WATCHER;
2977 IO::AIO::max_poll_time $TICK * 0.1; 4009 IO::AIO::max_poll_time $TICK * 0.1;
2978 $AIO_POLL_WATCHER = Event->io ( 4010 undef $AnyEvent::AIO::WATCHER;
2979 reentrant => 0,
2980 data => WF_AUTOCANCEL,
2981 fd => IO::AIO::poll_fileno,
2982 poll => 'r',
2983 prio => 6,
2984 cb => \&IO::AIO::poll_cb,
2985 );
2986} 4011}
2987 4012
2988my $_log_backtrace; 4013my $_log_backtrace;
2989 4014
2990sub _log_backtrace { 4015sub _log_backtrace {
… …
2993 $msg =~ s/\n//; 4018 $msg =~ s/\n//;
2994 4019
2995 # limit the # of concurrent backtraces 4020 # limit the # of concurrent backtraces
2996 if ($_log_backtrace < 2) { 4021 if ($_log_backtrace < 2) {
2997 ++$_log_backtrace; 4022 ++$_log_backtrace;
4023 my $perl_bt = Carp::longmess $msg;
2998 async { 4024 async {
4025 $Coro::current->{desc} = "abt $msg";
4026
2999 my @bt = fork_call { 4027 my @bt = fork_call {
3000 @addr = map { sprintf "%x", $_ } @addr; 4028 @addr = map { sprintf "%x", $_ } @addr;
3001 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4029 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3002 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4030 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3003 or die "addr2line: $!"; 4031 or die "addr2line: $!";
… …
3011 } 4039 }
3012 4040
3013 @funcs 4041 @funcs
3014 }; 4042 };
3015 4043
3016 LOG llevInfo, "[ABT] $msg\n"; 4044 LOG llevInfo, "[ABT] $perl_bt\n";
4045 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3017 LOG llevInfo, "[ABT] $_\n" for @bt; 4046 LOG llevInfo, "[ABT] $_\n" for @bt;
3018 --$_log_backtrace; 4047 --$_log_backtrace;
3019 }; 4048 };
3020 } else { 4049 } else {
3021 LOG llevInfo, "[ABT] $msg\n"; 4050 LOG llevInfo, "[ABT] $msg\n";
3022 LOG llevInfo, "[ABT] [suppressed]\n"; 4051 LOG llevInfo, "[ABT] [suppressed]\n";
3023 } 4052 }
3024} 4053}
3025 4054
3026# load additional modules 4055# load additional modules
3027use cf::pod; 4056require "cf/$_.pm" for @EXTRA_MODULES;
4057cf::_connect_to_perl_2;
3028 4058
3029END { cf::emergency_save } 4059END { cf::emergency_save }
3030 4060
30311 40611
3032 4062

Diff Legend

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