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.321 by root, Thu Jul 26 21:44:43 2007 UTC vs.
Revision 1.555 by root, Wed Jun 30 01:32:56 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines