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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines