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.285 by root, Sun Jun 24 04:21:42 2007 UTC vs.
Revision 1.511 by root, Wed Apr 7 18:35:56 2010 UTC

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

Diff Legend

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