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.265 by root, Fri May 11 08:00:00 2007 UTC vs.
Revision 1.524 by root, Sun Apr 18 07:08:07 2010 UTC

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

Diff Legend

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