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.303 by root, Wed Jul 11 15:57:31 2007 UTC vs.
Revision 1.505 by root, Sun Jan 31 03:46:20 2010 UTC

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

Diff Legend

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