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.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 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
1181 my ($pl, $buf) = @_; 1396 my ($pl, $buf) = @_;
1182 1397
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1398 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1399
1185 if (ref $msg) { 1400 if (ref $msg) {
1401 my ($type, $reply, @payload) =
1402 "ARRAY" eq ref $msg
1403 ? @$msg
1404 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1405
1406 my @reply;
1407
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1408 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1409 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1410 }
1411
1412 $pl->ext_reply ($reply, @reply)
1413 if $reply;
1414
1191 } else { 1415 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1417 }
1194 1418
1195 cf::override; 1419 cf::override;
1196 }, 1420 },
1197); 1421);
1198 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
1199sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1200 cf::sync_job { 1439 cf::sync_job {
1201 my %todo; 1440 my %todo;
1202 1441
1203 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1204 next unless -r $path; 1443 next unless -r $path;
1222 1461
1223 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1224 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1225 1464
1226 $ext{source} = 1465 $ext{source} =
1227 "package $pkg; use strict; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1228 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1229 . $source 1468 . $source
1230 . "\n};\n1"; 1469 . "\n};\n1";
1231 1470
1232 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1233 } 1472 }
1234 1473
1474 my $pass = 0;
1235 my %done; 1475 my %done;
1236 while (%todo) { 1476 while (%todo) {
1237 my $progress; 1477 my $progress;
1238 1478
1479 ++$pass;
1480
1481 ext:
1239 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1240 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1241 goto skip 1484 next ext
1242 unless exists $done{$_}; 1485 unless exists $done{$_};
1243 } 1486 }
1244 1487
1245 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1246 1489
1247 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1248 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1249 : "$v->{base}: extension inactive.\n";
1250 1494
1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1251 if (exists $v->{meta}{mandatory}) { 1496 if exists $v->{meta}{mandatory};
1252 warn $msg; 1497
1253 warn "mandatory extension failed to load, exiting.\n"; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1254 exit 1; 1499 delete $todo{$k};
1255 } 1500 } else {
1256 1501 $done{$k} = delete $todo{$k};
1257 warn $msg; 1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1258 } 1507 }
1259
1260 $done{$k} = delete $todo{$k};
1261 push @EXTS, $v->{pkg};
1262 $progress = 1;
1263 } 1508 }
1264 1509
1265 skip: 1510 unless ($progress) {
1266 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1267 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 }
1268 } 1518 }
1269 }; 1519 };
1270} 1520}
1271 1521
1272############################################################################# 1522#############################################################################
1273 1523
1274=back 1524=back
1275 1525
1276=head2 CORE EXTENSIONS 1526=head2 CORE EXTENSIONS
1277 1527
1278Functions and methods that extend core crossfire objects. 1528Functions and methods that extend core deliantra objects.
1279 1529
1280=cut 1530=cut
1281 1531
1282package cf::player; 1532package cf::player;
1283 1533
1284use Coro::AIO; 1534use Coro::AIO;
1285 1535
1286=head3 cf::player 1536=head3 cf::player
1287 1537
1288=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}
1289 1553
1290=item cf::player::find $login 1554=item cf::player::find $login
1291 1555
1292Returns the given player object, loading it if necessary (might block). 1556Returns the given player object, loading it if necessary (might block).
1293 1557
1312 1576
1313sub exists($) { 1577sub exists($) {
1314 my ($login) = @_; 1578 my ($login) = @_;
1315 1579
1316 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1317 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1318} 1582}
1319 1583
1320sub find($) { 1584sub find($) {
1321 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1322 my $login = $_[0]; 1586 my $login = $_[0];
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1593 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1594 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1595 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1596 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1597
1334 my $pl = load_pl path $login 1598 my $f = new_from_file cf::object::thawer path $login
1335 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;
1336 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1337 } 1607 }
1338 } 1608 }
1339} 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);
1340 1623
1341sub save($) { 1624sub save($) {
1342 my ($pl) = @_; 1625 my ($pl) = @_;
1343 1626
1344 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1349 return if $pl->{deny_save}; 1632 return if $pl->{deny_save};
1350 1633
1351 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1353 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
1354 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1355 Coro::cede; 1643 cf::cede_to_tick;
1356} 1644}
1357 1645
1358sub new($) { 1646sub new($) {
1359 my ($login) = @_; 1647 my ($login) = @_;
1360 1648
1366 $cf::PLAYER{$login} = $self; 1654 $cf::PLAYER{$login} = $self;
1367 1655
1368 $self 1656 $self
1369} 1657}
1370 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
1371=item $pl->quit_character 1669=item $pl->quit_character
1372 1670
1373Nukes the player without looking back. If logged in, the connection will 1671Nukes the player without looking back. If logged in, the connection will
1374be destroyed. May block for a long time. 1672be destroyed. May block for a long time.
1375 1673
1379 my ($pl) = @_; 1677 my ($pl) = @_;
1380 1678
1381 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1382 1680
1383 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1384 $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
1385 1683
1386 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1387 $pl->deactivate; 1685 $pl->deactivate;
1686
1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1388 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1389 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1390 1692
1391 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1392 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1393 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1428 or return []; 1730 or return [];
1429 1731
1430 my @logins; 1732 my @logins;
1431 1733
1432 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") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1740 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1741 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1742 $buf !~ /^password -------------$/m or next; # official not-valid tag
1743 }
1436 1744
1437 utf8::decode $login; 1745 utf8::decode $login;
1438 push @logins, $login; 1746 push @logins, $login;
1439 } 1747 }
1440 1748
1441 \@logins 1749 \@logins
1442} 1750}
1443 1751
1444=item $player->maps 1752=item $player->maps
1753
1754=item cf::player::maps $login
1445 1755
1446Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1447player. May block. 1757player. May block.
1448 1758
1449=cut 1759=cut
1467 } 1777 }
1468 1778
1469 \@paths 1779 \@paths
1470} 1780}
1471 1781
1472=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1782=item $protocol_xml = $player->expand_cfpod ($cfpod)
1473 1783
1474Expand crossfire pod fragments into protocol xml. 1784Expand deliantra pod fragments into protocol xml.
1475 1785
1476=cut
1477
1478sub expand_cfpod {
1479 ((my $self), (local $_)) = @_;
1480
1481 # escape & and <
1482 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g;
1484
1485 # this is buggy, it needs to properly take care of nested <'s
1486
1487 1 while
1488 # replace B<>, I<>, U<> etc.
1489 s/B<([^\>]*)>/<b>$1<\/b>/
1490 || s/I<([^\>]*)>/<i>$1<\/i>/
1491 || s/U<([^\>]*)>/<u>$1<\/u>/
1492 # replace G<male|female> tags
1493 || s{G<([^>|]*)\|([^>]*)>}{
1494 $self->gender ? $2 : $1
1495 }ge
1496 # replace H<hint text>
1497 || s{H<([^\>]*)>}
1498 {
1499 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1500 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1501 "")
1502 [$self->{hintmode}]
1503 }ge;
1504
1505 # create single paragraphs (very hackish)
1506 s/(?<=\S)\n(?=\w)/ /g;
1507
1508 # compress some whitespace
1509 s/\s+\n/\n/g; # ws line-ends
1510 s/\n\n+/\n/g; # double lines
1511 s/^\n+//; # beginning lines
1512 s/\n+$//; # ending lines
1513
1514 $_
1515}
1516
1517sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode}
1520}
1521
1522=item $player->ext_reply ($msgid, %msg) 1786=item $player->ext_reply ($msgid, @msg)
1523 1787
1524Sends an ext reply to the player. 1788Sends an ext reply to the player.
1525 1789
1526=cut 1790=cut
1527 1791
1528sub ext_reply($$%) { 1792sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1793 my ($self, $id, @msg) = @_;
1530 1794
1531 $msg{msgid} = $id; 1795 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1796}
1534 1797
1535=item $player->ext_event ($type, %msg) 1798=item $player->ext_msg ($type, @msg)
1536 1799
1537Sends an ext event to the client. 1800Sends an ext event to the client.
1538 1801
1539=cut 1802=cut
1540 1803
1541sub ext_event($$%) { 1804sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1805 my ($self, $type, @msg) = @_;
1543 1806
1544 $self->ns->ext_event ($type, %msg); 1807 $self->ns->ext_msg ($type, @msg);
1545} 1808}
1546 1809
1547=head3 cf::region 1810=head3 cf::region
1548 1811
1549=over 4 1812=over 4
1558 1821
1559=cut 1822=cut
1560 1823
1561sub find_by_path($) { 1824sub find_by_path($) {
1562 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1563 1828
1564 my ($match, $specificity); 1829 my ($match, $specificity);
1565 1830
1566 for my $region (list) { 1831 for my $region (list) {
1567 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1593our $MAX_RESET = 3600; 1858our $MAX_RESET = 3600;
1594our $DEFAULT_RESET = 3000; 1859our $DEFAULT_RESET = 3000;
1595 1860
1596sub generate_random_map { 1861sub generate_random_map {
1597 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1598 # mit "rum" bekleckern, nicht 1863
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865
1599 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1600 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1601 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1602 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1603 $rmp->{exit_on_final_map},
1604 $rmp->{xsize}, $rmp->{ysize},
1605 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1606 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1607 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1608 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1609 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1610 (cf::region::find $rmp->{region}), $rmp->{custom}
1611 )
1612} 1867}
1613 1868
1614=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1615 1870
1616Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
1621 1876
1622sub register { 1877sub register {
1623 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1624 my $pkg = caller; 1879 my $pkg = caller;
1625 1880
1626 no strict;
1627 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1628 1882
1629 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1630} 1884}
1631 1885
1632# also paths starting with '/' 1886# also paths starting with '/'
1633$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1634 1888
1635sub thawer_merge { 1889sub thawer_merge {
1636 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1637 1891
1638 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1643} 1897}
1644 1898
1645sub normalise { 1899sub normalise {
1646 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1647 1901
1648 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1649 1903
1650 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1651 1905
1652 # map plan: 1906 # map plan:
1653 # 1907 #
1668 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1669 $path = "$base/$path"; 1923 $path = "$base/$path";
1670 } 1924 }
1671 1925
1672 for ($path) { 1926 for ($path) {
1673 redo if s{//}{/};
1674 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1675 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1676 } 1929 }
1677 1930
1678 $path 1931 $path
1692 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1693 return $self; 1946 return $self;
1694 } 1947 }
1695 } 1948 }
1696 1949
1697 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1698 () 1951 ()
1699} 1952}
1700 1953
1701sub init { 1954sub init {
1702 my ($self) = @_; 1955 my ($self) = @_;
1724 1977
1725# the temporary/swap location 1978# the temporary/swap location
1726sub save_path { 1979sub save_path {
1727 my ($self) = @_; 1980 my ($self) = @_;
1728 1981
1729 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1982 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1730 "$TMPDIR/$path.map" 1983 "$TMPDIR/$path.map"
1731} 1984}
1732 1985
1733# the unique path, undef == no special unique path 1986# the unique path, undef == no special unique path
1734sub uniq_path { 1987sub uniq_path {
1735 my ($self) = @_; 1988 my ($self) = @_;
1736 1989
1737 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1990 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1738 "$UNIQUEDIR/$path" 1991 "$UNIQUEDIR/$path"
1739}
1740
1741# and all this just because we cannot iterate over
1742# all maps in C++...
1743sub change_all_map_light {
1744 my ($change) = @_;
1745
1746 $_->change_map_light ($change)
1747 for grep $_->outdoor, values %cf::MAP;
1748} 1992}
1749 1993
1750sub decay_objects { 1994sub decay_objects {
1751 my ($self) = @_; 1995 my ($self) = @_;
1752 1996
1765 2009
1766sub load_header_from($) { 2010sub load_header_from($) {
1767 my ($self, $path) = @_; 2011 my ($self, $path) = @_;
1768 2012
1769 utf8::encode $path; 2013 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 2014 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 or return; 2015 or return;
2016
2017 $self->_load_header ($f)
2018 or return;
2019
2020 local $MAP_LOADING{$self->{path}} = $self;
2021 $f->resolve_delayed_derefs;
1775 2022
1776 $self->{load_path} = $path; 2023 $self->{load_path} = $path;
1777 2024
1778 1 2025 1
1779} 2026}
1831 2078
1832sub find; 2079sub find;
1833sub find { 2080sub find {
1834 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
1835 2082
2083 cf::cede_to_tick;
2084
1836 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1837 2086
2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1839 2089
1840 $cf::MAP{$path} || do { 2090 $cf::MAP{$path} || do {
1841 my $guard = cf::lock_acquire "map_find:$path";
1842 my $map = new_from_path cf::map $path 2091 my $map = new_from_path cf::map $path
1843 or return; 2092 or return;
1844 2093
1845 $map->{last_save} = $cf::RUNTIME; 2094 $map->{last_save} = $cf::RUNTIME;
1846 2095
1848 or return; 2097 or return;
1849 2098
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2099 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 2100 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 2101 #$cf::WAIT_FOR_TICK->wait;
2102 undef $guard2;
2103 undef $guard1;
1853 $map->reset; 2104 $map->reset;
1854 undef $guard;
1855 return find $path; 2105 return find $path;
1856 } 2106 }
1857 2107
1858 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
1859 } 2109 }
1860} 2110}
1861 2111
1862sub pre_load { } 2112sub pre_load { }
1863sub post_load { } 2113#sub post_load { } # XS
1864 2114
1865sub load { 2115sub load {
1866 my ($self) = @_; 2116 my ($self) = @_;
1867 2117
1868 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
1869 2119
1870 my $path = $self->{path}; 2120 my $path = $self->{path};
1871 2121
1872 { 2122 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 2123 my $guard = cf::lock_acquire "map_data:$path";
1874 2124
2125 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 2126 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 2127
1877 $self->in_memory (cf::MAP_LOADING); 2128 $self->in_memory (cf::MAP_LOADING);
1878 2129
1879 $self->alloc; 2130 $self->alloc;
1880 2131
1881 $self->pre_load; 2132 $self->pre_load;
1882 Coro::cede; 2133 cf::cede_to_tick;
1883 2134
2135 my $f = new_from_file cf::object::thawer $self->{load_path};
2136 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 2137 $self->_load_objects ($f)
1885 or return; 2138 or return;
1886 2139
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2140 $self->post_load_original
1888 if delete $self->{load_original}; 2141 if delete $self->{load_original};
1889 2142
1890 if (my $uniq = $self->uniq_path) { 2143 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 2144 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 2145 unless (aio_stat $uniq) {
2146 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 2147 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 2148 $self->_load_objects ($f);
2149 $f->resolve_delayed_derefs;
2150 }
1895 } 2151 }
1896 } 2152 }
1897 2153
1898 Coro::cede; 2154 $f->resolve_delayed_derefs;
2155
2156 cf::cede_to_tick;
1899 # now do the right thing for maps 2157 # now do the right thing for maps
1900 $self->link_multipart_objects; 2158 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 2159 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 2160 unless $self->difficulty;
1903 Coro::cede; 2161 cf::cede_to_tick;
1904 2162
1905 unless ($self->{deny_activate}) { 2163 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 2164 $self->decay_objects;
1907 $self->fix_auto_apply; 2165 $self->fix_auto_apply;
1908 $self->update_buttons; 2166 $self->update_buttons;
1909 Coro::cede; 2167 cf::cede_to_tick;
1910 $self->set_darkness_map;
1911 Coro::cede;
1912 $self->activate; 2168 $self->activate;
1913 } 2169 }
1914 2170
2171 $self->{last_save} = $cf::RUNTIME;
2172 $self->last_access ($cf::RUNTIME);
2173
1915 $self->in_memory (cf::MAP_IN_MEMORY); 2174 $self->in_memory (cf::MAP_ACTIVE);
1916 } 2175 }
1917 2176
1918 $self->post_load; 2177 $self->post_load;
1919}
1920 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
1921sub customise_for { 2185sub customise_for {
1922 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
1923 2187
1924 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
1925 if $self->per_player; 2189 if $self->per_player;
1929 2193
1930 $self 2194 $self
1931} 2195}
1932 2196
1933# find and load all maps in the 3x3 area around a map 2197# find and load all maps in the 3x3 area around a map
1934sub load_diag { 2198sub load_neighbours {
1935 my ($map) = @_; 2199 my ($map) = @_;
1936 2200
1937 my @diag; # diagonal neighbours 2201 my @neigh; # diagonal neighbours
1938 2202
1939 for (0 .. 3) { 2203 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 2204 my $neigh = $map->tile_path ($_)
1941 or next; 2205 or next;
1942 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
1943 or next; 2207 or next;
1944 $neigh->load; 2208 $neigh->load;
1945 2209
2210 # now find the diagonal neighbours
2211 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2214 }
1949 2215
1950 for (@diag) { 2216 for (grep defined $_->[0], @neigh) {
2217 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2218 my $neigh = find $path, $origin
1952 or next; 2219 or next;
1953 $neigh->load; 2220 $neigh->load;
1954 } 2221 }
1955} 2222}
1956 2223
1957sub find_sync { 2224sub find_sync {
1958 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
1959 2226
1960 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
1961} 2231}
1962 2232
1963sub do_load_sync { 2233sub do_load_sync {
1964 my ($map) = @_; 2234 my ($map) = @_;
1965 2235
1966 cf::sync_job { $map->load }; 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2237 if $Coro::current == $Coro::main;
2238
2239 $map->load;
1967} 2240}
1968 2241
1969our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
1971 2244
1972sub find_async { 2245sub find_async {
1973 my ($path, $origin) = @_; 2246 my ($path, $origin, $load) = @_;
1974 2247
1975 $path = normalise $path, $origin && $origin->{path}; 2248 $path = normalise $path, $origin && $origin->{path};
1976 2249
1977 if (my $map = $cf::MAP{$path}) { 2250 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2251 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1979 } 2252 }
1980 2253
1981 undef $MAP_PREFETCH{$path}; 2254 $MAP_PREFETCH{$path} |= $load;
2255
1982 $MAP_PREFETCHER ||= cf::async { 2256 $MAP_PREFETCHER ||= cf::async {
2257 $Coro::current->{desc} = "map prefetcher";
2258
1983 while (%MAP_PREFETCH) { 2259 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2260 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2261 if (my $map = find $k) {
1986 $map->load; 2262 $map->load if $v;
1987 } 2263 }
1988 2264
1989 delete $MAP_PREFETCH{$path}; 2265 delete $MAP_PREFETCH{$k};
1990 } 2266 }
1991 } 2267 }
1992 undef $MAP_PREFETCHER; 2268 undef $MAP_PREFETCHER;
1993 }; 2269 };
1994 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
1995 2271
1996 () 2272 ()
1997} 2273}
1998 2274
2275# common code, used by both ->save and ->swapout
1999sub save { 2276sub _save {
2000 my ($self) = @_; 2277 my ($self) = @_;
2001
2002 my $lock = cf::lock_acquire "map_data:" . $self->path;
2003 2278
2004 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2005 2280
2006 return unless $self->dirty; 2281 return unless $self->dirty;
2007 2282
2013 return if $self->{deny_save}; 2288 return if $self->{deny_save};
2014 2289
2015 local $self->{last_access} = $self->last_access;#d# 2290 local $self->{last_access} = $self->last_access;#d#
2016 2291
2017 cf::async { 2292 cf::async {
2293 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2294 $_->contr->save for $self->players;
2019 }; 2295 };
2296
2297 cf::get_slot 0.02;
2020 2298
2021 if ($uniq) { 2299 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2300 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2023 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2301 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2024 } else { 2302 } else {
2025 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2026 } 2304 }
2027} 2305}
2028 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2029sub swap_out { 2315sub swap_out {
2030 my ($self) = @_; 2316 my ($self) = @_;
2031 2317
2032 # save first because save cedes
2033 $self->save;
2034
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2319
2320 return if $self->in_memory != cf::MAP_ACTIVE;
2321 return if $self->{deny_save};
2037 return if $self->players; 2322 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save};
2040 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2041 $self->clear; 2333 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2334}
2044 2335
2045sub reset_at { 2336sub reset_at {
2046 my ($self) = @_; 2337 my ($self) = @_;
2047 2338
2065 2356
2066 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2067 2358
2068 return if $self->players; 2359 return if $self->players;
2069 2360
2070 warn "resetting map ", $self->path; 2361 cf::trace "resetting map ", $self->path, "\n";
2071 2362
2072 $self->in_memory (cf::MAP_SWAPPED); 2363 $self->in_memory (cf::MAP_SWAPPED);
2073 2364
2074 # need to save uniques path 2365 # need to save uniques path
2075 unless ($self->{deny_save}) { 2366 unless ($self->{deny_save}) {
2079 if $uniq; 2370 if $uniq;
2080 } 2371 }
2081 2372
2082 delete $cf::MAP{$self->path}; 2373 delete $cf::MAP{$self->path};
2083 2374
2375 $self->deactivate;
2376 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2377 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2378
2088 $self->unlink_save; 2379 $self->unlink_save;
2089 $self->destroy; 2380 $self->destroy;
2090} 2381}
2091 2382
2092my $nuke_counter = "aaaa"; 2383my $nuke_counter = "aaaa";
2093 2384
2094sub nuke { 2385sub nuke {
2095 my ($self) = @_; 2386 my ($self) = @_;
2096 2387
2388 {
2389 my $lock = cf::lock_acquire "map_data:$self->{path}";
2390
2097 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2098 2392
2099 $self->unlink_save; 2393 $self->unlink_save;
2100 2394
2101 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2102 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2400
2107 $cf::MAP{$self->path} = $self; 2401 $cf::MAP{$self->path} = $self;
2402 }
2108 2403
2109 $self->reset; # polite request, might not happen 2404 $self->reset; # polite request, might not happen
2110} 2405}
2111 2406
2112=item $maps = cf::map::tmp_maps 2407=item $maps = cf::map::tmp_maps
2154 2449
2155sub unique_maps() { 2450sub unique_maps() {
2156 [ 2451 [
2157 map { 2452 map {
2158 utf8::decode $_; 2453 utf8::decode $_;
2159 /\.map$/ 2454 s/\.map$//; # TODO future compatibility hack
2455 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2456 ? ()
2160 ? normalise $_ 2457 : normalise $_
2161 : ()
2162 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2163 ] 2459 ]
2164} 2460}
2165 2461
2166package cf; 2462=item cf::map::static_maps
2463
2464Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2465file in the shared directory excluding F</styles> and F</editor>). May
2466block.
2467
2468=cut
2469
2470sub static_maps() {
2471 my @dirs = "";
2472 my @maps;
2473
2474 while (@dirs) {
2475 my $dir = shift @dirs;
2476
2477 next if $dir eq "/styles" || $dir eq "/editor";
2478
2479 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2480 or return;
2481
2482 for (@$files) {
2483 s/\.map$// or next;
2484 utf8::decode $_;
2485 push @maps, "$dir/$_";
2486 }
2487
2488 push @dirs, map "$dir/$_", @$dirs;
2489 }
2490
2491 \@maps
2492}
2167 2493
2168=back 2494=back
2169 2495
2170=head3 cf::object 2496=head3 cf::object
2171 2497
2175 2501
2176=over 4 2502=over 4
2177 2503
2178=item $ob->inv_recursive 2504=item $ob->inv_recursive
2179 2505
2180Returns the inventory of the object _and_ their inventories, recursively. 2506Returns the inventory of the object I<and> their inventories, recursively,
2507but I<not> the object itself.
2181 2508
2182=cut 2509=cut
2183 2510
2184sub inv_recursive_; 2511sub inv_recursive_;
2185sub inv_recursive_ { 2512sub inv_recursive_ {
2188 2515
2189sub inv_recursive { 2516sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2517 inv_recursive_ inv $_[0]
2191} 2518}
2192 2519
2520=item $ref = $ob->ref
2521
2522Creates and returns a persistent reference to an object that can be stored as a string.
2523
2524=item $ob = cf::object::deref ($refstring)
2525
2526returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2527even if the object actually exists. May block.
2528
2529=cut
2530
2531sub deref {
2532 my ($ref) = @_;
2533
2534 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2535 my ($uuid, $name) = ($1, $2);
2536 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2537 or return;
2538 $pl->ob->uuid eq $uuid
2539 or return;
2540
2541 $pl->ob
2542 } else {
2543 warn "$ref: cannot resolve object reference\n";
2544 undef
2545 }
2546}
2547
2193package cf; 2548package cf;
2194 2549
2195=back 2550=back
2196 2551
2197=head3 cf::object::player 2552=head3 cf::object::player
2203Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2558Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2204can be C<undef>. Does the right thing when the player is currently in a 2559can be C<undef>. Does the right thing when the player is currently in a
2205dialogue with the given NPC character. 2560dialogue with the given NPC character.
2206 2561
2207=cut 2562=cut
2563
2564our $SAY_CHANNEL = {
2565 id => "say",
2566 title => "Map",
2567 reply => "say ",
2568 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2569};
2570
2571our $CHAT_CHANNEL = {
2572 id => "chat",
2573 title => "Chat",
2574 reply => "chat ",
2575 tooltip => "Player chat and shouts, global to the server.",
2576};
2208 2577
2209# rough implementation of a future "reply" method that works 2578# rough implementation of a future "reply" method that works
2210# with dialog boxes. 2579# with dialog boxes.
2211#TODO: the first argument must go, split into a $npc->reply_to ( method 2580#TODO: the first argument must go, split into a $npc->reply_to ( method
2212sub cf::object::player::reply($$$;$) { 2581sub cf::object::player::reply($$$;$) {
2219 2588
2220 } else { 2589 } else {
2221 my $pl = $self->contr; 2590 my $pl = $self->contr;
2222 2591
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2592 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2593 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2594 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226 $diag->{id},
2227 msgtype => "reply",
2228 msg => $diag->{pl}->expand_cfpod ($msg),
2229 add_topics => []
2230 );
2231 2595
2232 } else { 2596 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2597 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2598 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2235 } 2599 }
2236 } 2600 }
2601}
2602
2603=item $object->send_msg ($channel, $msg, $color, [extra...])
2604
2605=cut
2606
2607sub cf::object::send_msg {
2608 my $pl = shift->contr
2609 or return;
2610 $pl->send_msg (@_);
2237} 2611}
2238 2612
2239=item $player_object->may ("access") 2613=item $player_object->may ("access")
2240 2614
2241Returns wether the given player is authorized to access resource "access" 2615Returns wether the given player is authorized to access resource "access"
2254 2628
2255=item $player_object->enter_link 2629=item $player_object->enter_link
2256 2630
2257Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2258 2632
2259The player should be reasonably safe there for short amounts of time. You 2633The player should be reasonably safe there for short amounts of time (e.g.
2260I<MUST> call C<leave_link> as soon as possible, though. 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2635though, as the player cannot control the character while it is on the link
2636map.
2261 2637
2262Will never block. 2638Will never block.
2263 2639
2264=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2265 2641
2285sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2286 my ($self) = @_; 2662 my ($self) = @_;
2287 2663
2288 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2289 2665
2666 ++$self->{_link_recursion};
2667
2290 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2291 2669
2292 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2293 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2294 2672
2295 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2296} 2674}
2297 2675
2298sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2299 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2300 2678
2317 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2318 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2319 2697
2320 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2323 2701
2324 $map->load; 2702 $map->load;
2325 $map->load_diag; 2703 $map->load_neighbours;
2326 2704
2327 return unless $self->contr->active; 2705 return unless $self->contr->active;
2328 $self->activate_recursive;
2329 2706
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2331 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2332} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2333 2714
2715}
2716
2334=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2335 2718
2336Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2337her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2338that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2339the new (success) or old (failed) map position. In either case, $done will 2722the new (success) or old (failed) map position. In either case, $done will
2340be called at the end of this process. 2723be called at the end of this process.
2341 2724
2725Note that $check will be called with a potentially non-loaded map, so if
2726it needs a loaded map it has to call C<< ->load >>.
2727
2342=cut 2728=cut
2343 2729
2344our $GOTOGEN; 2730our $GOTOGEN;
2345 2731
2346sub cf::object::player::goto { 2732sub cf::object::player::goto {
2347 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2348 2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2740
2349 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2743
2352 $self->enter_link; 2744 $self->enter_link;
2353 2745
2354 (async { 2746 (async {
2747 $Coro::current->{desc} = "player::goto $path $x $y";
2748
2749 # *tag paths override both path and x|y
2750 if ($path =~ /^\*(.*)$/) {
2751 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2752 my $ob = $obs[rand @obs];
2753
2754 # see if we actually can go there
2755 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2756 $ob = $obs[rand @obs];
2757 } else {
2758 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2759 }
2760 # else put us there anyways for now #d#
2761
2762 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2763 } else {
2764 ($path, $x, $y) = (undef, undef, undef);
2765 }
2766 }
2767
2355 my $map = eval { 2768 my $map = eval {
2356 my $map = cf::map::find $path; 2769 my $map = defined $path ? cf::map::find $path : undef;
2357 2770
2358 if ($map) { 2771 if ($map) {
2359 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2361 } else { 2774 } else {
2362 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2363 } 2776 }
2364 2777
2365 $map 2778 $map
2366 }; 2779 };
2367 2780
2373 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2374 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2375 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2376 } 2789 }
2377 2790
2378 $done->() if $done; 2791 $done->($self) if $done;
2379 })->prio (1); 2792 })->prio (1);
2380} 2793}
2381 2794
2382=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2383 2796
2403} 2816}
2404 2817
2405sub prepare_random_map { 2818sub prepare_random_map {
2406 my ($exit) = @_; 2819 my ($exit) = @_;
2407 2820
2408 my $guard = cf::lock_acquire "exit_prepare:$exit";
2409
2410 # all this does is basically replace the /! path by 2821 # all this does is basically replace the /! path by
2411 # a new random map path (?random/...) with a seed 2822 # a new random map path (?random/...) with a seed
2412 # that depends on the exit object 2823 # that depends on the exit object
2413 2824
2414 my $rmp = parse_random_map_params $exit->msg; 2825 my $rmp = parse_random_map_params $exit->msg;
2416 if ($exit->map) { 2827 if ($exit->map) {
2417 $rmp->{region} = $exit->region->name; 2828 $rmp->{region} = $exit->region->name;
2418 $rmp->{origin_map} = $exit->map->path; 2829 $rmp->{origin_map} = $exit->map->path;
2419 $rmp->{origin_x} = $exit->x; 2830 $rmp->{origin_x} = $exit->x;
2420 $rmp->{origin_y} = $exit->y; 2831 $rmp->{origin_y} = $exit->y;
2832
2833 $exit->map->touch;
2421 } 2834 }
2422 2835
2423 $rmp->{random_seed} ||= $exit->random_seed; 2836 $rmp->{random_seed} ||= $exit->random_seed;
2424 2837
2425 my $data = cf::to_json $rmp; 2838 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2426 my $md5 = Digest::MD5::md5_hex $data; 2839 my $md5 = Digest::MD5::md5_hex $data;
2427 my $meta = "$RANDOMDIR/$md5.meta"; 2840 my $meta = "$RANDOMDIR/$md5.meta";
2428 2841
2429 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2842 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2430 aio_write $fh, 0, (length $data), $data, 0; 2843 aio_write $fh, 0, (length $data), $data, 0;
2431 undef $fh; 2844 undef $fh;
2432 aio_rename "$meta~", $meta; 2845 aio_rename "$meta~", $meta;
2433 2846
2847 my $slaying = "?random/$md5";
2848
2849 if ($exit->valid) {
2434 $exit->slaying ("?random/$md5"); 2850 $exit->slaying ("?random/$md5");
2435 $exit->msg (undef); 2851 $exit->msg (undef);
2852 }
2436 } 2853 }
2437} 2854}
2438 2855
2439sub cf::object::player::enter_exit { 2856sub cf::object::player::enter_exit {
2440 my ($self, $exit) = @_; 2857 my ($self, $exit) = @_;
2441 2858
2442 return unless $self->type == cf::PLAYER; 2859 return unless $self->type == cf::PLAYER;
2443 2860
2444 if ($exit->slaying eq "/!") {
2445 #TODO: this should de-fi-ni-te-ly not be a sync-job
2446 # the problem is that $exit might not survive long enough
2447 # so it needs to be done right now, right here
2448 cf::sync_job { prepare_random_map $exit };
2449 }
2450
2451 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2452 my $hp = $exit->stats->hp;
2453 my $sp = $exit->stats->sp;
2454
2455 $self->enter_link; 2861 $self->enter_link;
2456 2862
2457 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED);
2460
2461 (async { 2863 (async {
2462 $self->deactivate_recursive; # just to be sure 2864 $Coro::current->{desc} = "enter_exit";
2865
2463 unless (eval { 2866 unless (eval {
2867 $self->deactivate_recursive; # just to be sure
2868
2869 # random map handling
2870 {
2871 my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873 prepare_random_map $exit
2874 if $exit->slaying eq "/!";
2875 }
2876
2877 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2878 my $x = $exit->stats->hp;
2879 my $y = $exit->stats->sp;
2880
2464 $self->goto ($slaying, $hp, $sp); 2881 $self->goto ($map, $x, $y);
2465 2882
2883 # if exit is damned, update players death & WoR home-position
2884 $self->contr->savebed ($map, $x, $y)
2885 if $exit->flag (cf::FLAG_DAMNED);
2886
2466 1; 2887 1
2467 }) { 2888 }) {
2468 $self->message ("Something went wrong deep within the crossfire server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2469 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2470 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2471 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2472 2893
2473 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2474 $self->leave_link; 2895 $self->leave_link;
2475 } 2896 }
2476 })->prio (1); 2897 })->prio (1);
2477} 2898}
2478 2899
2490sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2491 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2492 2913
2493 utf8::encode $text; 2914 utf8::encode $text;
2494 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916}
2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2495} 2941}
2496 2942
2497=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2498 2944
2499Send a drawinfo or msg packet to the client, formatting the msg for the 2945Send a drawinfo or msg packet to the client, formatting the msg for the
2501the message, with C<log> being the default. If C<$color> is negative, suppress 2947the message, with C<log> being the default. If C<$color> is negative, suppress
2502the message unless the client supports the msg packet. 2948the message unless the client supports the msg packet.
2503 2949
2504=cut 2950=cut
2505 2951
2952# non-persistent channels (usually the info channel)
2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2960 "c/identify" => {
2961 id => "infobox",
2962 title => "Identify",
2963 reply => undef,
2964 tooltip => "Items recently identified",
2965 },
2966 "c/examine" => {
2967 id => "infobox",
2968 title => "Examine",
2969 reply => undef,
2970 tooltip => "Signs and other items you examined",
2971 },
2972 "c/shopinfo" => {
2973 id => "infobox",
2974 title => "Shop Info",
2975 reply => undef,
2976 tooltip => "What your bargaining skill tells you about the shop",
2977 },
2978 "c/book" => {
2979 id => "infobox",
2980 title => "Book",
2981 reply => undef,
2982 tooltip => "The contents of a note or book",
2983 },
2984 "c/lookat" => {
2985 id => "infobox",
2986 title => "Look",
2987 reply => undef,
2988 tooltip => "What you saw there",
2989 },
2990 "c/who" => {
2991 id => "infobox",
2992 title => "Players",
2993 reply => undef,
2994 tooltip => "Shows players who are currently online",
2995 },
2996 "c/body" => {
2997 id => "infobox",
2998 title => "Body Parts",
2999 reply => undef,
3000 tooltip => "Shows which body parts you posess and are available",
3001 },
3002 "c/statistics" => {
3003 id => "infobox",
3004 title => "Statistics",
3005 reply => undef,
3006 tooltip => "Shows your primary statistics",
3007 },
3008 "c/skills" => {
3009 id => "infobox",
3010 title => "Skills",
3011 reply => undef,
3012 tooltip => "Shows your experience per skill and item power",
3013 },
3014 "c/shopitems" => {
3015 id => "infobox",
3016 title => "Shop Items",
3017 reply => undef,
3018 tooltip => "Shows the items currently for sale in this shop",
3019 },
3020 "c/resistances" => {
3021 id => "infobox",
3022 title => "Resistances",
3023 reply => undef,
3024 tooltip => "Shows your resistances",
3025 },
3026 "c/pets" => {
3027 id => "infobox",
3028 title => "Pets",
3029 reply => undef,
3030 tooltip => "Shows information abotu your pets/a specific pet",
3031 },
3032 "c/perceiveself" => {
3033 id => "infobox",
3034 title => "Perceive Self",
3035 reply => undef,
3036 tooltip => "You gained detailed knowledge about yourself",
3037 },
3038 "c/uptime" => {
3039 id => "infobox",
3040 title => "Uptime",
3041 reply => undef,
3042 tooltip => "How long the server has been running since last restart",
3043 },
3044 "c/mapinfo" => {
3045 id => "infobox",
3046 title => "Map Info",
3047 reply => undef,
3048 tooltip => "Information related to the maps",
3049 },
3050 "c/party" => {
3051 id => "party",
3052 title => "Party",
3053 reply => "gsay ",
3054 tooltip => "Messages and chat related to your party",
3055 },
3056 "c/death" => {
3057 id => "death",
3058 title => "Death",
3059 reply => undef,
3060 tooltip => "Reason for and more info about your most recent death",
3061 },
3062 "c/say" => $SAY_CHANNEL,
3063 "c/chat" => $CHAT_CHANNEL,
3064);
3065
2506sub cf::client::send_msg { 3066sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 3067 my ($self, $channel, $msg, $color, @extra) = @_;
2508 3068
2509 $msg = $self->pl->expand_cfpod ($msg); 3069 $msg = $self->pl->expand_cfpod ($msg)
3070 unless $color & cf::NDI_VERBATIM;
2510 3071
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 3072 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 3073
3074 # check predefined channels, for the benefit of C
3075 if ($CHANNEL{$channel}) {
3076 $channel = $CHANNEL{$channel};
3077
3078 $self->ext_msg (channel_info => $channel);
3079 $channel = $channel->{id};
3080
2513 if (ref $channel) { 3081 } elsif (ref $channel) {
2514 # send meta info to client, if not yet sent 3082 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 3083 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 3084 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 3085 $self->ext_msg (channel_info => $channel);
2518 } 3086 }
2519 3087
2520 $channel = $channel->{id}; 3088 $channel = $channel->{id};
2521 } 3089 }
2522 3090
2523 return unless @extra || length $msg; 3091 return unless @extra || length $msg;
2524 3092
2525 if ($self->can_msg) { 3093 # default colour, mask it out
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 3094 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2527 } else { 3095 if $color & cf::NDI_DEF;
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537 3096
2538 if ($color >= 0) { 3097 my $pkt = "msg "
2539 if (0 && $msg =~ /\[/) { 3098 . $self->{json_coder}->encode (
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2541 } else { 3100 );
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg")
2544 }
2545 }
2546 }
2547}
2548 3101
3102 $self->send_big_packet ($pkt);
3103}
3104
2549=item $client->ext_event ($type, %msg) 3105=item $client->ext_msg ($type, @msg)
2550 3106
2551Sends an ext event to the client. 3107Sends an ext event to the client.
2552 3108
2553=cut 3109=cut
2554 3110
2555sub cf::client::ext_event($$%) { 3111sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 3112 my ($self, $type, @msg) = @_;
2557 3113
2558 return unless $self->extcmd; 3114 if ($self->extcmd == 2) {
2559 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3116 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 3117 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3119 }
3120}
3121
3122=item $client->ext_reply ($msgid, @msg)
3123
3124Sends an ext reply to the client.
3125
3126=cut
3127
3128sub cf::client::ext_reply($$@) {
3129 my ($self, $id, @msg) = @_;
3130
3131 if ($self->extcmd == 2) {
3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3133 } elsif ($self->extcmd == 1) {
3134 #TODO: version 1, remove
3135 unshift @msg, msgtype => "reply", msgid => $id;
3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3137 }
2562} 3138}
2563 3139
2564=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2565 3141
2566Queues a query to the client, calling the given callback with 3142Queues a query to the client, calling the given callback with
2621 my ($ns, $buf) = @_; 3197 my ($ns, $buf) = @_;
2622 3198
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3199 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 3200
2625 if (ref $msg) { 3201 if (ref $msg) {
3202 my ($type, $reply, @payload) =
3203 "ARRAY" eq ref $msg
3204 ? @$msg
3205 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3206
3207 my @reply;
3208
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3209 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 3210 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 3211 }
3212
3213 $ns->ext_reply ($reply, @reply)
3214 if $reply;
3215
2632 } else { 3216 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 3218 }
2635 3219
2636 cf::override; 3220 cf::override;
2637 }, 3221 },
2638); 3222);
2658 3242
2659 $coro 3243 $coro
2660} 3244}
2661 3245
2662cf::client->attach ( 3246cf::client->attach (
2663 on_destroy => sub { 3247 on_client_destroy => sub {
2664 my ($ns) = @_; 3248 my ($ns) = @_;
2665 3249
2666 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2667 }, 3251 },
2668); 3252);
2683our $safe = new Safe "safe"; 3267our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
2685 3269
2686$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
2687 3271
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3272$safe->permit_only (Opcode::opset qw(
3273 :base_core :base_mem :base_orig :base_math :base_loop
3274 grepstart grepwhile mapstart mapwhile
3275 sort time
3276));
2689 3277
2690# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
2691 3279
2692=pod 3280=pod
2693 3281
2694The following functions and methods are available within a safe environment: 3282The following functions and methods are available within a safe environment:
2695 3283
2696 cf::object 3284 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 3285 contr pay_amount pay_player map x y force_find force_add destroy
2698 insert remove 3286 insert remove name archname title slaying race decrease split
3287 value
2699 3288
2700 cf::object::player 3289 cf::object::player
2701 player 3290 player
2702 3291
2703 cf::player 3292 cf::player
2708 3297
2709=cut 3298=cut
2710 3299
2711for ( 3300for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3301 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2713 insert remove)], 3302 insert remove inv nrof name archname title slaying race
3303 decrease split destroy change_exp value msg lore send_msg)],
2714 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 3305 ["cf::player" => qw(peaceful send_msg)],
2716 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
2717) { 3307) {
2718 no strict 'refs';
2719 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
2720 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2721 for @funs; 3310 for @funs;
2722} 3311}
2723 3312
2738 3327
2739 my $qcode = $code; 3328 my $qcode = $code;
2740 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2741 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
2742 3331
3332 %vars = (_dummy => 0) unless %vars;
3333
3334 my @res;
2743 local $_; 3335 local $_;
2744 local @safe::cf::_safe_eval_args = values %vars;
2745 3336
2746 my $eval = 3337 my $eval =
2747 "do {\n" 3338 "do {\n"
2748 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2749 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
2750 . $code 3341 . $code
2751 . "\n}" 3342 . "\n}"
2752 ; 3343 ;
2753 3344
3345 if ($CFG{safe_eval}) {
2754 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
2755 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2756 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
2757 3354
2758 if ($@) { 3355 if ($@) {
2759 warn "$@"; 3356 warn "$@",
2760 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
2761 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
2762 } 3359 }
2763 3360
2764 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
2765} 3362}
2766 3363
2780=cut 3377=cut
2781 3378
2782sub register_script_function { 3379sub register_script_function {
2783 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
2784 3381
2785 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
2786 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
2787} 3384}
2788 3385
2789=back 3386=back
2790 3387
2791=cut 3388=cut
2794# the server's init and main functions 3391# the server's init and main functions
2795 3392
2796sub load_facedata($) { 3393sub load_facedata($) {
2797 my ($path) = @_; 3394 my ($path) = @_;
2798 3395
3396 # HACK to clear player env face cache, we need some signal framework
3397 # for this (global event?)
3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3399
3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3401
2799 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
2800 3403
2801 my $facedata;
2802 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
2803 or die "$path: $!"; 3405 or die "$path: $!";
2804 3406
2805 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
2806 3408
2807 $facedata->{version} == 2 3409 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
2809 3411
3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3414 $facedata->{resource}{"res/exp_table"} = {
3415 type => FT_RSRC,
3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3418 };
3419 cf::cede_to_tick;
3420
2810 { 3421 {
2811 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
2812 3423
2813 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3426
2815 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
2819 3432
2820 cf::cede_to_tick; 3433 cf::cede_to_tick;
2821 } 3434 }
2822 3435
2823 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
2824 next unless $info->{smooth}; 3437 next unless $info->{smooth};
3438
2825 my $idx = cf::face::find $face 3439 my $idx = cf::face::find $face
2826 or next; 3440 or next;
3441
2827 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
2828 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
2829 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2830 } else { 3445 } else {
2831 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
2832 } 3447 }
2833 3448
2834 cf::cede_to_tick; 3449 cf::cede_to_tick;
2835 } 3450 }
2836 } 3451 }
2845 3460
2846 cf::anim::invalidate_all; # d'oh 3461 cf::anim::invalidate_all; # d'oh
2847 } 3462 }
2848 3463
2849 { 3464 {
2850 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3465 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical;
2854 3466
2855 while (my ($name, $info) = each %$res) { 3467 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({ 3468 if (defined $info->{type}) {
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2863 3470
2864 if ($name =~ /\.jpg$/) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3472 cf::face::set_type $idx, $info->{type};
2867 } else { 3473 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3474 $RESOURCE{$name} = $info; # unused
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 } 3475 }
2874 3476
2875 cf::cede_to_tick; 3477 cf::cede_to_tick;
2876 } 3478 }
2877 } 3479 }
2878 3480
3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3482
2879 1 3483 1
2880} 3484}
2881 3485
3486register_exticmd fx_want => sub {
3487 my ($ns, $want) = @_;
3488
3489 while (my ($k, $v) = each %$want) {
3490 $ns->fx_want ($k, $v);
3491 }
3492};
3493
3494sub load_resource_file($) {
3495 my $guard = lock_acquire "load_resource_file";
3496
3497 my $status = load_resource_file_ $_[0];
3498 get_slot 0.1, 100;
3499 cf::arch::commit_load;
3500
3501 $status
3502}
3503
2882sub reload_regions { 3504sub reload_regions {
3505 # HACK to clear player env face cache, we need some signal framework
3506 # for this (global event?)
3507 %ext::player_env::MUSIC_FACE_CACHE = ();
3508
2883 load_resource_file "$MAPDIR/regions" 3509 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3510 or die "unable to load regions file\n";
2885 3511
2886 for (cf::region::list) { 3512 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3513 $_->{match} = qr/$_->{match}/
2895} 3521}
2896 3522
2897sub reload_archetypes { 3523sub reload_archetypes {
2898 load_resource_file "$DATADIR/archetypes" 3524 load_resource_file "$DATADIR/archetypes"
2899 or die "unable to load archetypes\n"; 3525 or die "unable to load archetypes\n";
2900 #d# NEED to laod twice to resolve forward references
2901 # this really needs to be done in an extra post-pass
2902 # (which needs to be synchronous, so solve it differently)
2903 load_resource_file "$DATADIR/archetypes"
2904 or die "unable to load archetypes\n";
2905} 3526}
2906 3527
2907sub reload_treasures { 3528sub reload_treasures {
2908 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
2909 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
2910} 3531}
2911 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
2912sub reload_resources { 3556sub reload_resources {
2913 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
2914 3558
3559 reload_exp_table;
3560 reload_materials;
3561 reload_facedata;
3562 reload_sound;
3563 reload_archetypes;
2915 reload_regions; 3564 reload_regions;
2916 reload_facedata;
2917 #reload_archetypes;#d#
2918 reload_archetypes;
2919 reload_treasures; 3565 reload_treasures;
2920 3566
2921 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
2922} 3568}
2923 3569
2924sub init { 3570sub reload_config {
2925 reload_resources; 3571 trace "reloading config file...\n";
2926}
2927 3572
2928sub cfg_load { 3573 0 < aio_load "$CONFDIR/config", my $config
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3574 or die "$CONFDIR/config: $!";
2930 or return;
2931 3575
2932 local $/; 3576 utf8::decode $config;
2933 *CFG = YAML::Syck::Load <$fh>; 3577 *CFG = yaml_load $config;
2934 3578
2935 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2936 3580
2937 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2938 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2939 3583
2940 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
2944 }; 3588 };
2945 warn $@ if $@; 3589 warn $@ if $@;
2946 } 3590 }
2947} 3591}
2948 3592
3593sub pidfile() {
3594 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3595 or die "$PIDFILE: $!";
3596 flock $fh, &Fcntl::LOCK_EX
3597 or die "$PIDFILE: flock: $!";
3598 $fh
3599}
3600
3601# make sure only one server instance is running at any one time
3602sub atomic {
3603 my $fh = pidfile;
3604
3605 my $pid = <$fh>;
3606 kill 9, $pid if $pid > 0;
3607
3608 seek $fh, 0, 0;
3609 print $fh $$;
3610}
3611
3612sub main_loop {
3613 trace "EV::loop starting\n";
3614 if (1) {
3615 EV::loop;
3616 }
3617 trace "EV::loop returned\n";
3618 goto &main_loop unless $REALLY_UNLOOP;
3619}
3620
2949sub main { 3621sub main {
3622 cf::init_globals; # initialise logging
3623
3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3628
3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3630
2950 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
2951 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
2952 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3633 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2953 (async { 3634 (async {
2954 Event::one_event; 3635 $Coro::current->{desc} = "IDLE BUG HANDLER";
3636 EV::loop EV::LOOP_ONESHOT;
2955 })->prio (Coro::PRIO_MAX); 3637 })->prio (Coro::PRIO_MAX);
2956 }; 3638 };
2957 3639
2958 cfg_load; 3640 evthread_start IO::AIO::poll_fileno;
3641
3642 cf::sync_job {
3643 cf::incloader::init ();
3644
3645 cf::init_anim;
3646 cf::init_attackmess;
3647 cf::init_dynamic;
3648
3649 cf::load_settings;
3650
3651 reload_resources;
3652 reload_config;
2959 db_init; 3653 db_init;
3654
3655 cf::init_uuid;
3656 cf::init_signals;
3657 cf::init_skills;
3658
3659 cf::init_beforeplay;
3660
3661 atomic;
3662
2960 load_extensions; 3663 load_extensions;
2961 3664
2962 $TICK_WATCHER->start; 3665 utime time, time, $RUNTIMEFILE;
2963 Event::loop; 3666
3667 # no (long-running) fork's whatsoever before this point(!)
3668 use POSIX ();
3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3670
3671 cf::_post_init 0;
3672 };
3673
3674 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n";
3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3682 goto &main_loop;
2964} 3683}
2965 3684
2966############################################################################# 3685#############################################################################
2967# initialisation and cleanup 3686# initialisation and cleanup
2968 3687
2969# install some emergency cleanup handlers 3688# install some emergency cleanup handlers
2970BEGIN { 3689BEGIN {
3690 our %SIGWATCHER = ();
2971 for my $signal (qw(INT HUP TERM)) { 3691 for my $signal (qw(INT HUP TERM)) {
2972 Event->signal ( 3692 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2973 reentrant => 0,
2974 data => WF_AUTOCANCEL,
2975 signal => $signal,
2976 prio => 0,
2977 cb => sub {
2978 cf::cleanup "SIG$signal"; 3693 cf::cleanup "SIG$signal";
2979 },
2980 ); 3694 };
2981 } 3695 }
2982} 3696}
2983 3697
2984sub write_runtime { 3698sub write_runtime_sync {
2985 my $runtime = "$LOCALDIR/runtime"; 3699 my $t0 = AE::time;
2986 3700
2987 # first touch the runtime file to show we are still running: 3701 # first touch the runtime file to show we are still running:
2988 # the fsync below can take a very very long time. 3702 # the fsync below can take a very very long time.
2989 3703
2990 IO::AIO::aio_utime $runtime, undef, undef; 3704 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2991 3705
2992 my $guard = cf::lock_acquire "write_runtime"; 3706 my $guard = cf::lock_acquire "write_runtime";
2993 3707
2994 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2995 or return; 3709 or return;
2996 3710
2997 my $value = $cf::RUNTIME + 90 + 10; 3711 my $value = $cf::RUNTIME + 90 + 10;
2998 # 10 is the runtime save interval, for a monotonic clock 3712 # 10 is the runtime save interval, for a monotonic clock
2999 # 60 allows for the watchdog to kill the server. 3713 # 60 allows for the watchdog to kill the server.
3009 aio_utime $fh, undef, undef; 3723 aio_utime $fh, undef, undef;
3010 3724
3011 close $fh 3725 close $fh
3012 or return; 3726 or return;
3013 3727
3014 aio_rename "$runtime~", $runtime 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3015 and return; 3729 and return;
3016 3730
3017 warn "runtime file written.\n"; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3018 3732
3019 1 3733 1
3734}
3735
3736our $uuid_lock;
3737our $uuid_skip;
3738
3739sub write_uuid_sync($) {
3740 $uuid_skip ||= $_[0];
3741
3742 return if $uuid_lock;
3743 local $uuid_lock = 1;
3744
3745 my $uuid = "$LOCALDIR/uuid";
3746
3747 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3748 or return;
3749
3750 my $value = uuid_seq uuid_cur;
3751
3752 unless ($value) {
3753 info "cowardly refusing to write zero uuid value!\n";
3754 return;
3755 }
3756
3757 my $value = uuid_str $value + $uuid_skip;
3758 $uuid_skip = 0;
3759
3760 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3761 and return;
3762
3763 # always fsync - this file is important
3764 aio_fsync $fh
3765 and return;
3766
3767 close $fh
3768 or return;
3769
3770 aio_rename "$uuid~", $uuid
3771 and return;
3772
3773 trace "uuid file written ($value).\n";
3774
3775 1
3776
3777}
3778
3779sub write_uuid($$) {
3780 my ($skip, $sync) = @_;
3781
3782 $sync ? write_uuid_sync $skip
3783 : async { write_uuid_sync $skip };
3020} 3784}
3021 3785
3022sub emergency_save() { 3786sub emergency_save() {
3023 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3024 3788
3025 warn "enter emergency perl save\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
3026 3795
3027 cf::sync_job { 3796 cf::sync_job {
3797 cf::write_runtime_sync; # external watchdog should not bark
3798
3028 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3029 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3030 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3031 warn "begin emergency player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3032 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3033 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3034 $pl->valid or next; 3805 $pl->valid or next;
3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3035 $pl->save; 3807 $pl->save;
3036 } 3808 }
3037 warn "end emergency player save\n"; 3809 info "emergency_perl_save: end player save\n";
3038 3810
3039 warn "begin emergency map save\n"; 3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3813 info "emergency_perl_save: begin map save\n";
3040 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3041 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3042 $map->valid or next; 3816 $map->valid or next;
3043 $map->save; 3817 $map->save;
3044 } 3818 }
3045 warn "end emergency map save\n"; 3819 info "emergency_perl_save: end map save\n";
3046 3820
3047 warn "begin emergency database checkpoint\n"; 3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3823 info "emergency_perl_save: begin database checkpoint\n";
3048 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3049 warn "end emergency database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3826
3827 info "emergency_perl_save: begin write uuid\n";
3828 write_uuid_sync 1;
3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
3050 }; 3849 };
3051 3850
3052 warn "leave emergency perl save\n"; 3851 info "emergency_perl_save: leave\n";
3053} 3852}
3054 3853
3055sub post_cleanup { 3854sub post_cleanup {
3056 my ($make_core) = @_; 3855 my ($make_core) = @_;
3057 3856
3857 IO::AIO::flush;
3858
3058 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3059 if $make_core; 3860 if $make_core;
3861
3862 my $fh = pidfile;
3863 unlink $PIDFILE if <$fh> == $$;
3864}
3865
3866# a safer delete_package, copied from Symbol
3867sub clear_package($) {
3868 my $pkg = shift;
3869
3870 # expand to full symbol table name if needed
3871 unless ($pkg =~ /^main::.*::$/) {
3872 $pkg = "main$pkg" if $pkg =~ /^::/;
3873 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3874 $pkg .= '::' unless $pkg =~ /::$/;
3875 }
3876
3877 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3878 my $stem_symtab = *{$stem}{HASH};
3879
3880 defined $stem_symtab and exists $stem_symtab->{$leaf}
3881 or return;
3882
3883 # clear all symbols
3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3885 for my $name (keys %$leaf_symtab) {
3886 _gv_clear *{"$pkg$name"};
3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3888 }
3060} 3889}
3061 3890
3062sub do_reload_perl() { 3891sub do_reload_perl() {
3063 # can/must only be called in main 3892 # can/must only be called in main
3064 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3065 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3066 return; 3895 return;
3067 } 3896 }
3068 3897
3069 warn "reloading..."; 3898 return if $RELOAD++;
3070 3899
3071 warn "entering sync_job"; 3900 my $t1 = AE::time;
3072 3901
3902 while ($RELOAD) {
3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3905
3906 trace "perl_reload: entering sync_job";
3907
3073 cf::sync_job { 3908 cf::sync_job {
3074 cf::write_runtime; # external watchdog should not bark
3075 cf::emergency_save; 3909 #cf::emergency_save;
3076 cf::write_runtime; # external watchdog should not bark
3077 3910
3078 warn "syncing database to disk";
3079 BDB::db_env_txn_checkpoint $DB_ENV;
3080
3081 # if anything goes wrong in here, we should simply crash as we already saved
3082
3083 warn "cancelling all WF_AUTOCANCEL watchers";
3084 for (Event::all_watchers) {
3085 $_->cancel if $_->data & WF_AUTOCANCEL;
3086 }
3087
3088 warn "flushing outstanding aio requests";
3089 for (;;) {
3090 BDB::flush;
3091 IO::AIO::flush;
3092 Coro::cede;
3093 last unless IO::AIO::nreqs || BDB::nreqs;
3094 warn "iterate...";
3095 }
3096
3097 ++$RELOAD;
3098
3099 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3100 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3101 %EXT_CORO = (); 3913 %EXT_CORO = ();
3102 3914
3103 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3104 %COMMAND = (); 3916 %COMMAND = ();
3105 3917
3106 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3107 %EXTCMD = (); 3919 %EXTCMD = ();
3108 %EXTICMD = (); 3920 %EXTICMD = ();
3109 3921
3110 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3111 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3112 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3113 3925
3114 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3115 eval { 3927 eval {
3116 $cb->($pkg); 3928 $cb->($pkg);
3117 1 3929 1
3118 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3931 }
3932
3933 trace "... clearing $pkg";
3934 clear_package $pkg;
3119 } 3935 }
3120 3936
3121 warn "... nuking $pkg";
3122 Symbol::delete_package $pkg;
3123 }
3124
3125 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3126 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3127 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3128 3940
3129 warn "... unloading $k"; 3941 trace "... unloading $k";
3130 delete $INC{$k}; 3942 delete $INC{$k};
3131 3943
3132 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3133 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3134 3946
3135 if (my $cb = $k->can ("unload_module")) { 3947 if (my $cb = $k->can ("unload_module")) {
3136 $cb->(); 3948 $cb->();
3949 }
3950
3951 clear_package $k;
3137 } 3952 }
3138 3953
3139 Symbol::delete_package $k;
3140 }
3141
3142 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3143 Symbol::delete_package "safe::$_" 3955 clear_package "safe::$_"
3144 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3145 3957
3146 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3147 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3148 delete $INC{"cf/pod.pm"}; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3149 3961
3150 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3151 # and global variables created in xs 3963 # and global variables created in xs
3152 #Symbol::delete_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3153 3965
3154 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3155 3967
3156 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3157 require cf; 3969 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3970 cf::_connect_to_perl_1;
3159 3971
3160 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3161 cf::cfg_load; 3973 cf::reload_config;
3162 3974
3163 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3164 cf::load_extensions; 3976 cf::load_extensions;
3165 3977
3978 if ($REATTACH_ON_RELOAD) {
3166 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3167 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3168 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3169 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3170 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3171 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3985 }
3172 3986
3173 warn "leaving sync_job"; 3987 cf::_post_init 1;
3174 3988
3989 trace "perl_reload: leaving sync_job";
3990
3175 1 3991 1
3176 } or do { 3992 } or do {
3177 warn $@; 3993 error $@;
3178 warn "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3179 exit 1; 3995 };
3996
3997 --$RELOAD;
3180 }; 3998 }
3181 3999
3182 warn "reloaded"; 4000 $t1 = AE::time - $t1;
4001 info "perl_reload: completed in ${t1}s\n";
3183}; 4002};
3184 4003
3185our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3186 4005
3187sub reload_perl() { 4006sub reload_perl() {
3188 # doing reload synchronously and two reloads happen back-to-back, 4007 # doing reload synchronously and two reloads happen back-to-back,
3189 # coro crashes during coro_state_free->destroy here. 4008 # coro crashes during coro_state_free->destroy here.
3190 4009
3191 $RELOAD_WATCHER ||= Event->timer ( 4010 $RELOAD_WATCHER ||= cf::async {
3192 reentrant => 0, 4011 Coro::AIO::aio_wait cache_extensions;
3193 after => 0, 4012
3194 data => WF_AUTOCANCEL, 4013 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3195 cb => sub {
3196 do_reload_perl; 4014 do_reload_perl;
3197 undef $RELOAD_WATCHER; 4015 undef $RELOAD_WATCHER;
3198 }, 4016 };
3199 ); 4017 };
3200} 4018}
3201 4019
3202register_command "reload" => sub { 4020register_command "reload" => sub {
3203 my ($who, $arg) = @_; 4021 my ($who, $arg) = @_;
3204 4022
3205 if ($who->flag (FLAG_WIZ)) { 4023 if ($who->flag (FLAG_WIZ)) {
3206 $who->message ("reloading server."); 4024 $who->message ("reloading server.");
4025 async {
4026 $Coro::current->{desc} = "perl_reload";
3207 async { reload_perl }; 4027 reload_perl;
4028 };
3208 } 4029 }
3209}; 4030};
3210 4031
3211unshift @INC, $LIBDIR; 4032#############################################################################
3212 4033
3213my $bug_warning = 0; 4034my $bug_warning = 0;
3214 4035
3215our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3216our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3217 4038
3218sub wait_for_tick { 4039sub wait_for_tick() {
3219 return unless $TICK_WATCHER->is_active;
3220 return if $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3221 4041
3222 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3223 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3224 $signal->wait; 4044 $signal->wait;
3225} 4045}
3226 4046
3227sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3228 return unless $TICK_WATCHER->is_active;
3229 return if $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3230 4049
3231 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 4052 $signal->wait;
3234} 4053}
3235 4054
3236 my $min = 1e6;#d# 4055sub tick {
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer (
3239 reentrant => 0,
3240 parked => 1,
3241 prio => 0,
3242 at => $NEXT_TICK || $TICK,
3243 data => WF_AUTOCANCEL,
3244 cb => sub {
3245 if ($Coro::current != $Coro::main) { 4056 if ($Coro::current != $Coro::main) {
3246 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4057 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3247 unless ++$bug_warning > 10; 4058 unless ++$bug_warning > 10;
3248 return; 4059 return;
3249 } 4060 }
3250 4061
3251 $NOW = $tick_start = Event::time;
3252
3253 cf::server_tick; # one server iteration 4062 cf::server_tick; # one server iteration
3254 4063
3255 0 && sync_job {#d# 4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3256 for(1..10) {
3257 my $t = Event::time;
3258 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3259 or die;
3260 4065
3261 $map->width (50); 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3262 $map->height (50); 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3263 $map->alloc; 4068 Coro::async_pool {
3264 $map->_load_objects ("/tmp/x.map", 1); 4069 $Coro::current->{desc} = "runtime saver";
3265 my $t = Event::time - $t; 4070 write_runtime_sync
3266 4071 or error "ERROR: unable to write runtime file: $!";
3267 #next unless $t < 0.0013;#d#
3268 if ($t < $min) {
3269 $min = $t;
3270 }
3271 $avg = $avg * 0.99 + $t * 0.01;
3272 }
3273 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3274 exit 0;
3275 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3276 }; 4072 };
4073 }
3277 4074
3278 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK;
3280
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10;
3283 Coro::async_pool {
3284 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!";
3286 };
3287 }
3288
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 4076 $sig->send;
3294 } 4077 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 4078 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 4079 $sig->send;
3297 } 4080 }
3298 4081
3299 $NOW = Event::time; 4082 $LOAD = ($NOW - $TICK_START) / $TICK;
3300
3301 # if we are delayed by four ticks or more, skip them all
3302 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3303
3304 $TICK_WATCHER->at ($NEXT_TICK);
3305 $TICK_WATCHER->start;
3306
3307 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4083 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 4084
3310 _post_tick; 4085 if (0) {
3311 4086 if ($NEXT_TICK) {
3312 4087 my $jitter = $TICK_START - $NEXT_TICK;
4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4089 debug "jitter $JITTER\n";#d#
4090 }
3313 }, 4091 }
3314); 4092}
3315 4093
3316{ 4094{
3317 BDB::max_poll_time $TICK * 0.1; 4095 # configure BDB
3318 $BDB_POLL_WATCHER = Event->io ( 4096
3319 reentrant => 0,
3320 fd => BDB::poll_fileno,
3321 poll => 'r',
3322 prio => 0,
3323 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb,
3325 );
3326 BDB::min_parallel 8; 4097 BDB::min_parallel 16;
3327 4098 BDB::max_poll_reqs $TICK * 0.1;
3328 BDB::set_sync_prepare { 4099 $AnyEvent::BDB::WATCHER->priority (1);
3329 my $status;
3330 my $current = $Coro::current;
3331 (
3332 sub {
3333 $status = $!;
3334 $current->ready; undef $current;
3335 },
3336 sub {
3337 Coro::schedule while defined $current;
3338 $! = $status;
3339 },
3340 )
3341 };
3342 4100
3343 unless ($DB_ENV) { 4101 unless ($DB_ENV) {
3344 $DB_ENV = BDB::db_env_create; 4102 $DB_ENV = BDB::db_env_create;
4103 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4104 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4105 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4106 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4107 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3345 4108
3346 cf::sync_job { 4109 cf::sync_job {
3347 eval { 4110 eval {
3348 BDB::db_env_open 4111 BDB::db_env_open
3349 $DB_ENV, 4112 $DB_ENV,
3351 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4114 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4115 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 4116 0666;
3354 4117
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4118 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3356
3357 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3358 $DB_ENV->set_lk_detect;
3359 }; 4119 };
3360 4120
3361 cf::cleanup "db_env_open(db): $@" if $@; 4121 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 4122 };
3363 } 4123 }
4124
4125 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4126 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4127 };
4128 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4129 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4130 };
4131 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4132 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4133 };
3364} 4134}
3365 4135
3366{ 4136{
4137 # configure IO::AIO
4138
3367 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
3368
3369 undef $Coro::AIO::WATCHER;
3370 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
3371 $AIO_POLL_WATCHER = Event->io ( 4141 undef $AnyEvent::AIO::WATCHER;
3372 reentrant => 0,
3373 data => WF_AUTOCANCEL,
3374 fd => IO::AIO::poll_fileno,
3375 poll => 'r',
3376 prio => 6,
3377 cb => \&IO::AIO::poll_cb,
3378 );
3379} 4142}
3380 4143
3381my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
3382 4146
3383sub _log_backtrace { 4147sub _log_backtrace {
3384 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
3385 4149
3386 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
3387 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3388 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
3389 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
3390 ++$_log_backtrace; 4158 ++$_log_backtrace;
4159 my $perl_bt = Carp::longmess $msg;
3391 async { 4160 async {
4161 $Coro::current->{desc} = "abt $msg";
4162
3392 my @bt = fork_call { 4163 my @bt = fork_call {
3393 @addr = map { sprintf "%x", $_ } @addr; 4164 @addr = map { sprintf "%x", $_ } @addr;
3394 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4165 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3395 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4166 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3396 or die "addr2line: $!"; 4167 or die "addr2line: $!";
3404 } 4175 }
3405 4176
3406 @funcs 4177 @funcs
3407 }; 4178 };
3408 4179
3409 LOG llevInfo, "[ABT] $msg\n"; 4180 LOG llevInfo, "[ABT] $perl_bt\n";
4181 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3410 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
3411 --$_log_backtrace; 4183 --$_log_backtrace;
3412 }; 4184 };
3413 } else { 4185 } else {
3414 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
3415 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3416 } 4188 }
3417} 4189}
3418 4190
3419# load additional modules 4191# load additional modules
3420use cf::pod; 4192require "cf/$_.pm" for @EXTRA_MODULES;
4193cf::_connect_to_perl_2;
3421 4194
3422END { cf::emergency_save } 4195END { cf::emergency_save }
3423 4196
34241 41971
3425 4198

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines