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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines