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.329 by root, Fri Aug 10 05:38:16 2007 UTC vs.
Revision 1.504 by root, Sat Jan 30 23:50:16 2010 UTC

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

Diff Legend

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