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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.321 by root, Thu Jul 26 21:44:43 2007 UTC vs.
Revision 1.566 by root, Sun May 1 16:58:16 2011 UTC

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

Diff Legend

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