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

Diff Legend

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