ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.271 by root, Fri Jun 1 06:04:08 2007 UTC vs.
Revision 1.515 by root, Thu Apr 15 04:56:47 2010 UTC

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

Diff Legend

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