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.316 by root, Mon Jul 23 21:02:50 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
172=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
173 232
174This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call. 235that call.
177 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
178=back 243=back
179 244
180=cut 245=cut
181 246
182BEGIN { 247$Coro::State::WARNHOOK = sub {
183 *CORE::GLOBAL::warn = sub {
184 my $msg = join "", @_; 248 my $msg = join "", @_;
185 249
186 $msg .= "\n" 250 $msg .= "\n"
187 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
188 252
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 254
191 utf8::encode $msg;
192 LOG llevError, $msg; 255 LOG llevError, $msg;
193 }; 256};
194} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
195 271
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
206for my $pkg (qw( 282for my $pkg (qw(
207 cf::global cf::attachable 283 cf::global cf::attachable
208 cf::object cf::object::player 284 cf::object cf::object::player
209 cf::client cf::player 285 cf::client cf::player
210 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
211 cf::map cf::party cf::region 288 cf::party cf::region
212)) { 289)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 291}
216 292
217$Event::DIED = sub { 293$EV::DIED = sub {
218 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
219}; 295};
220 296
221############################################################################# 297#############################################################################
222 298
223=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 322 $d
247 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
248} 324}
249 325
250=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
251 327
252Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
253 329
254=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
255 331
256Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
257 333
258=cut 334=cut
259 335
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 337
262sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
264 354
265=item cf::lock_wait $string 355=item cf::lock_wait $string
266 356
267Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
268 358
269=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
270 360
271Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
274returned. 364returned.
275 365
366Locks are *not* recursive, locking from the same coro twice results in a
367deadlocked coro.
368
276Lock names should begin with a unique identifier (for example, cf::map::find 369Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 370uses map_find and cf::map::load uses map_load).
278 371
279=item $locked = cf::lock_active $string 372=item $locked = cf::lock_active $string
280 373
281Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
282 375
283=cut 376=cut
284 377
285our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
286 379
287sub lock_wait($) { 380sub lock_wait($) {
288 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
289
290 # wait for lock, if any
291 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule;
294 }
295} 382}
296 383
297sub lock_acquire($) { 384sub lock_acquire($) {
298 my ($key) = @_; 385 $LOCKS->guard ($_[0])
299
300 # wait, to be sure we are not locked
301 lock_wait $key;
302
303 $LOCK{$key} = [];
304
305 Coro::guard {
306 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} };
308 }
309} 386}
310 387
311sub lock_active($) { 388sub lock_active($) {
312 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
313
314 ! ! $LOCK{$key}
315} 390}
316 391
317sub freeze_mainloop { 392sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
319 394
320 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
321 $TICK_WATCHER->start; 396}
322 }; 397
323 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
324 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
325} 411}
326 412
327=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
328 414
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
337 423
338=cut 424=cut
339 425
340our @SLOT_QUEUE; 426our @SLOT_QUEUE;
341our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
342 429
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager");
433
345 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
346 436
347 while () { 437 while () {
348 next_job: 438 next_job:
439
349 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
350 if ($avail > 0.01) { 441
351 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
352 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
353 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
354 $job->[2]->send; 446 $job->[2]->send;
355 Coro::cede; 447 Coro::cede;
356 goto next_job; 448 goto next_job;
357 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
358 } 451 }
359 } 452 }
360 453
361 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 457 $signal->wait;
365 } else { 458 } else {
459 $busy = 0;
366 Coro::schedule; 460 Coro::schedule;
367 } 461 }
368 } 462 }
369}; 463};
370 464
371sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
372 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
373 469
374 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
375 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
376 473
377 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
378 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
379 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
390 487
391BEGIN { *async = \&Coro::async_pool } 488BEGIN { *async = \&Coro::async_pool }
392 489
393=item cf::sync_job { BLOCK } 490=item cf::sync_job { BLOCK }
394 491
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 492The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 493is always able to handle events or runnable, as Deliantra is only
397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 494partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 495acceptable.
399 496
400If it must be done, put the blocking parts into C<sync_job>. This will run 497If it must be done, put the blocking parts into C<sync_job>. This will run
401the given BLOCK in another coroutine while waiting for the result. The 498the given BLOCK in another coroutine while waiting for the result. The
… …
406 503
407sub sync_job(&) { 504sub sync_job(&) {
408 my ($job) = @_; 505 my ($job) = @_;
409 506
410 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 508 my $time = EV::time;
412 509
413 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
415 512
416 # TODO: use suspend/resume instead 513 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 514
418 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
419 516
420 my $busy = 1; 517 my $busy = 1;
421 my @res; 518 my @res;
422 519
423 (async { 520 (async {
521 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 522 @res = eval { $job->() };
425 warn $@ if $@; 523 warn $@ if $@;
426 undef $busy; 524 undef $busy;
427 })->prio (Coro::PRIO_MAX); 525 })->prio (Coro::PRIO_MAX);
428 526
429 while ($busy) { 527 while ($busy) {
430 Coro::cede or Event::one_event; 528 if (Coro::nready) {
529 Coro::cede_notself;
530 } else {
531 EV::loop EV::LOOP_ONESHOT;
431 } 532 }
533 }
432 534
433 $time = Event::time - $time; 535 my $time = EV::time - $time;
434 536
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
439 538
440 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
441 } else { 540 } else {
442 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
443 542
… …
468=item fork_call { }, $args 567=item fork_call { }, $args
469 568
470Executes the given code block with the given arguments in a seperate 569Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 570process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 571Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 572never block itself or use any form of event handling.
474 573
475=cut 574=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 575
486sub fork_call(&@) { 576sub fork_call(&@) {
487 my ($cb, @args) = @_; 577 my ($cb, @args) = @_;
488 578
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 579 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 580 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 581 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 582
494 if (my $pid = fork) { 583 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 584 reset_signals;
508 local $SIG{__WARN__}; 585 &$cb
509 local $SIG{__DIE__}; 586 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 587
516 eval { 588 wantarray ? @res : $res[-1]
517 close $fh1; 589}
518 590
519 my @res = eval { $cb->(@args) }; 591=item $coin = coin_from_name $name
520 592
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 593=cut
522 close $fh2;
523 };
524 594
525 warn $@ if $@; 595our %coin_alias = (
526 _exit 0; 596 "silver" => "silvercoin",
527 } 597 "silvercoin" => "silvercoin",
598 "silvercoins" => "silvercoin",
599 "gold" => "goldcoin",
600 "goldcoin" => "goldcoin",
601 "goldcoins" => "goldcoin",
602 "platinum" => "platinacoin",
603 "platinumcoin" => "platinacoin",
604 "platinumcoins" => "platinacoin",
605 "platina" => "platinacoin",
606 "platinacoin" => "platinacoin",
607 "platinacoins" => "platinacoin",
608 "royalty" => "royalty",
609 "royalties" => "royalty",
610);
611
612sub coin_from_name($) {
613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
528} 616}
529 617
530=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
531 619
532Returns a single value from the environment database. 620Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 622=item cf::db_put $family => $key => $value
535 623
536Stores the given C<$value> in the family. It can currently store binary 624Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 625data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 626
627=item $db = cf::db_table "name"
628
629Create and/or open a new database table. The string must not be "db" and must be unique
630within each server.
631
539=cut 632=cut
633
634sub db_table($) {
635 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV;
637
638 eval {
639 $db->set_flags (BDB::CHKSUM);
640
641 utf8::encode $name;
642 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
643 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
644 cf::cleanup "db_open(db): $!" if $!;
645 };
646 cf::cleanup "db_open(db): $@" if $@;
647
648 $db
649}
540 650
541our $DB; 651our $DB;
542 652
543sub db_init { 653sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 654 cf::sync_job {
548 eval { 655 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 656 };
558} 657}
559 658
560sub db_get($$) { 659sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 660 my $key = "$_[0]/$_[1]";
562 661
… …
612 if (1) { 711 if (1) {
613 $md5 = 712 $md5 =
614 join "\x00", 713 join "\x00",
615 $processversion, 714 $processversion,
616 map { 715 map {
617 Coro::cede; 716 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 717 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 718 } 0.. $#$src;
620 719
621 720
622 my $dbmd5 = db_get cache => "$id/md5"; 721 my $dbmd5 = db_get cache => "$id/md5";
… …
660 759
661############################################################################# 760#############################################################################
662 761
663=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
664 763
665Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
666attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
668 767
669In the following description, CLASS can be any of C<global>, C<object> 768In the following description, CLASS can be any of C<global>, C<object>
670C<player>, C<client> or C<map> (i.e. the attachable objects in 769C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 770Deliantra).
672 771
673=over 4 772=over 4
674 773
675=item $attachable->attach ($attachment, key => $value...) 774=item $attachable->attach ($attachment, key => $value...)
676 775
… …
720=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
721 820
722Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
723given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
724 823
725Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
726that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
727 826
728These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
729 828
730=over 4 829=over 4
… …
958 } 1057 }
959 1058
960 0 1059 0
961} 1060}
962 1061
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1063
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1065
967Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
968 1067
… …
974 1073
975=cut 1074=cut
976 1075
977############################################################################# 1076#############################################################################
978# object support 1077# object support
979#
980 1078
1079sub _object_equal($$);
1080sub _object_equal($$) {
1081 my ($a, $b) = @_;
1082
1083 return 0 unless (ref $a) eq (ref $b);
1084
1085 if ("HASH" eq ref $a) {
1086 my @ka = keys %$a;
1087 my @kb = keys %$b;
1088
1089 return 0 if @ka != @kb;
1090
1091 for (0 .. $#ka) {
1092 return 0 unless $ka[$_] eq $kb[$_];
1093 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1094 }
1095
1096 } elsif ("ARRAY" eq ref $a) {
1097
1098 return 0 if @$a != @$b;
1099
1100 for (0 .. $#$a) {
1101 return 0 unless _object_equal $a->[$_], $b->[$_];
1102 }
1103
1104 } elsif ($a ne $b) {
1105 return 0;
1106 }
1107
1108 1
1109}
1110
1111our $SLOW_MERGES;#d#
981sub _can_merge { 1112sub _can_merge {
982 my ($ob1, $ob2) = @_; 1113 my ($ob1, $ob2) = @_;
983 1114
984 local $Storable::canonical = 1; 1115 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1116
988 $fob1 eq $fob2 1117 # we do the slow way here
1118 return _object_equal $ob1, $ob2
989} 1119}
990 1120
991sub reattach { 1121sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1123 my ($obj) = @_;
994 1124
1125 # no longer needed after getting rid of delete_package?
995 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
996 1127
997 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
998 1129
999 @$registry = (); 1130 @$registry = ();
1000 1131
… …
1015cf::attachable->attach ( 1146cf::attachable->attach (
1016 prio => -1000000, 1147 prio => -1000000,
1017 on_instantiate => sub { 1148 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
1019 1150
1020 $data = from_json $data; 1151 $data = decode_json $data;
1021 1152
1022 for (@$data) { 1153 for (@$data) {
1023 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
1024 1155
1025 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
… …
1041sub object_freezer_save { 1172sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1173 my ($filename, $rdata, $objs) = @_;
1043 1174
1044 sync_job { 1175 sync_job {
1045 if (length $$rdata) { 1176 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1048 1180
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1186 aio_fsync $fh;
1187 }
1053 close $fh; 1188 aio_close $fh;
1054 1189
1055 if (@$objs) { 1190 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1197 aio_fsync $fh;
1198 }
1061 close $fh; 1199 aio_close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1201 }
1064 } else { 1202 } else {
1065 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1066 } 1204 }
1067 1205
1068 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1069 } else { 1210 } else {
1070 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1071 } 1212 }
1072 } else { 1213 } else {
1073 aio_unlink $filename; 1214 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1075 } 1216 }
1076 } 1217 };
1077} 1218}
1078 1219
1079sub object_freezer_as_string { 1220sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1221 my ($rdata, $objs) = @_;
1081 1222
… …
1093 or return; 1234 or return;
1094 1235
1095 unless (aio_stat "$filename.pst") { 1236 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1237 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1238 or return;
1239
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1240 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs};
1099 } 1242 }
1100 1243
1244 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1245 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1246 $decname, length $data, scalar @{$av || []};
1247
1103 return ($data, $av); 1248 ($data, $av)
1104} 1249}
1105 1250
1106=head2 COMMAND CALLBACKS 1251=head2 COMMAND CALLBACKS
1107 1252
1108=over 4 1253=over 4
… …
1162 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1163 1308
1164 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1165} 1310}
1166 1311
1312use File::Glob ();
1313
1167cf::player->attach ( 1314cf::player->attach (
1168 on_command => sub { 1315 on_command => sub {
1169 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1170 1317
1171 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
… …
1186 my ($type, $reply, @payload) = 1333 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1334 "ARRAY" eq ref $msg
1188 ? @$msg 1335 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1336 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1337
1338 my @reply;
1339
1191 if (my $cb = $EXTCMD{$type}) { 1340 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1341 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1342 }
1343
1344 $pl->ext_reply ($reply, @reply)
1345 if $reply;
1346
1197 } else { 1347 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1349 }
1200 1350
1201 cf::override; 1351 cf::override;
1202 }, 1352 },
1203); 1353);
1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1204 1367
1205sub load_extensions { 1368sub load_extensions {
1206 cf::sync_job { 1369 cf::sync_job {
1207 my %todo; 1370 my %todo;
1208 1371
… …
1228 1391
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1394
1232 $ext{source} = 1395 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1235 . $source 1398 . $source
1236 . "\n};\n1"; 1399 . "\n};\n1";
1237 1400
1238 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1239 } 1402 }
1240 1403
1404 my $pass = 0;
1241 my %done; 1405 my %done;
1242 while (%todo) { 1406 while (%todo) {
1243 my $progress; 1407 my $progress;
1244 1408
1409 ++$pass;
1410
1411 ext:
1245 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip 1414 next ext
1248 unless exists $done{$_}; 1415 unless exists $done{$_};
1249 } 1416 }
1250 1417
1251 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1252 1419
1253 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1254 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1255 : "$v->{base}: extension inactive.\n";
1256 1424
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1257 if (exists $v->{meta}{mandatory}) { 1426 if exists $v->{meta}{mandatory};
1258 warn $msg; 1427 } else {
1259 warn "mandatory extension failed to load, exiting.\n"; 1428 $done{$k} = delete $todo{$k};
1260 exit 1; 1429 push @EXTS, $v->{pkg};
1261 } 1430 $progress = 1;
1262 1431
1263 warn $msg; 1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1264 } 1434 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
1269 } 1435 }
1270 1436
1271 skip: 1437 unless ($progress) {
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1273 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 }
1274 } 1445 }
1275 }; 1446 };
1276} 1447}
1277 1448
1278############################################################################# 1449#############################################################################
1279 1450
1280=back 1451=back
1281 1452
1282=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1283 1454
1284Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1285 1456
1286=cut 1457=cut
1287 1458
1288package cf::player; 1459package cf::player;
1289 1460
1290use Coro::AIO; 1461use Coro::AIO;
1291 1462
1292=head3 cf::player 1463=head3 cf::player
1293 1464
1294=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}
1295 1480
1296=item cf::player::find $login 1481=item cf::player::find $login
1297 1482
1298Returns the given player object, loading it if necessary (might block). 1483Returns the given player object, loading it if necessary (might block).
1299 1484
… …
1318 1503
1319sub exists($) { 1504sub exists($) {
1320 my ($login) = @_; 1505 my ($login) = @_;
1321 1506
1322 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1323 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1324} 1509}
1325 1510
1326sub find($) { 1511sub find($) {
1327 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1328 my $login = $_[0]; 1513 my $login = $_[0];
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1520 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1521 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1522 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1523 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1524
1340 my $pl = load_pl path $login 1525 my $f = new_from_file cf::object::thawer path $login
1341 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;
1342 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1343 } 1534 }
1344 } 1535 }
1345} 1536}
1346 1537
… …
1355 return if $pl->{deny_save}; 1546 return if $pl->{deny_save};
1356 1547
1357 aio_mkdir playerdir $pl, 0770; 1548 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1549 $pl->{last_save} = $cf::RUNTIME;
1359 1550
1551 cf::get_slot 0.01;
1552
1360 $pl->save_pl ($path); 1553 $pl->save_pl ($path);
1361 Coro::cede; 1554 cf::cede_to_tick;
1362} 1555}
1363 1556
1364sub new($) { 1557sub new($) {
1365 my ($login) = @_; 1558 my ($login) = @_;
1366 1559
… …
1372 $cf::PLAYER{$login} = $self; 1565 $cf::PLAYER{$login} = $self;
1373 1566
1374 $self 1567 $self
1375} 1568}
1376 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
1377=item $pl->quit_character 1580=item $pl->quit_character
1378 1581
1379Nukes the player without looking back. If logged in, the connection will 1582Nukes the player without looking back. If logged in, the connection will
1380be destroyed. May block for a long time. 1583be destroyed. May block for a long time.
1381 1584
… …
1385 my ($pl) = @_; 1588 my ($pl) = @_;
1386 1589
1387 my $name = $pl->ob->name; 1590 my $name = $pl->ob->name;
1388 1591
1389 $pl->{deny_save} = 1; 1592 $pl->{deny_save} = 1;
1390 $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
1391 1594
1392 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1393 $pl->deactivate; 1596 $pl->deactivate;
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1394 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1599 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1395 $pl->ns->destroy if $pl->ns; 1600 $pl->ns->destroy if $pl->ns;
1396 1601
1397 my $path = playerdir $pl; 1602 my $path = playerdir $pl;
1398 my $temp = "$path~$cf::RUNTIME~deleting~"; 1603 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1434 or return []; 1639 or return [];
1435 1640
1436 my @logins; 1641 my @logins;
1437 1642
1438 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") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1649 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1650 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1651 $buf !~ /^password -------------$/m or next; # official not-valid tag
1652 }
1442 1653
1443 utf8::decode $login; 1654 utf8::decode $login;
1444 push @logins, $login; 1655 push @logins, $login;
1445 } 1656 }
1446 1657
… …
1473 } 1684 }
1474 1685
1475 \@paths 1686 \@paths
1476} 1687}
1477 1688
1478=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1479 1690
1480Expand crossfire pod fragments into protocol xml. 1691Expand deliantra pod fragments into protocol xml.
1481
1482=cut
1483
1484sub expand_cfpod {
1485 ((my $self), (local $_)) = @_;
1486
1487 # escape & and <
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490
1491 # this is buggy, it needs to properly take care of nested <'s
1492
1493 1 while
1494 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527 1692
1528=item $player->ext_reply ($msgid, @msg) 1693=item $player->ext_reply ($msgid, @msg)
1529 1694
1530Sends an ext reply to the player. 1695Sends an ext reply to the player.
1531 1696
1532=cut 1697=cut
1533 1698
1534sub ext_reply($$@) { 1699sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1700 my ($self, $id, @msg) = @_;
1536 1701
1537 if ($self->ns->extcmd == 2) { 1702 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1703}
1545 1704
1546=item $player->ext_msg ($type, @msg) 1705=item $player->ext_msg ($type, @msg)
1547 1706
1548Sends an ext event to the client. 1707Sends an ext event to the client.
… …
1604our $MAX_RESET = 3600; 1763our $MAX_RESET = 3600;
1605our $DEFAULT_RESET = 3000; 1764our $DEFAULT_RESET = 3000;
1606 1765
1607sub generate_random_map { 1766sub generate_random_map {
1608 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
1609 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1610 $self->_create_random_map ( 1772 $self->_create_random_map (
1611 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1612 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1613 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1735 1897
1736# the temporary/swap location 1898# the temporary/swap location
1737sub save_path { 1899sub save_path {
1738 my ($self) = @_; 1900 my ($self) = @_;
1739 1901
1740 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1902 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1741 "$TMPDIR/$path.map" 1903 "$TMPDIR/$path.map"
1742} 1904}
1743 1905
1744# the unique path, undef == no special unique path 1906# the unique path, undef == no special unique path
1745sub uniq_path { 1907sub uniq_path {
1746 my ($self) = @_; 1908 my ($self) = @_;
1747 1909
1748 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1749 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1750}
1751
1752# and all this just because we cannot iterate over
1753# all maps in C++...
1754sub change_all_map_light {
1755 my ($change) = @_;
1756
1757 $_->change_map_light ($change)
1758 for grep $_->outdoor, values %cf::MAP;
1759} 1912}
1760 1913
1761sub decay_objects { 1914sub decay_objects {
1762 my ($self) = @_; 1915 my ($self) = @_;
1763 1916
… …
1776 1929
1777sub load_header_from($) { 1930sub load_header_from($) {
1778 my ($self, $path) = @_; 1931 my ($self, $path) = @_;
1779 1932
1780 utf8::encode $path; 1933 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1934 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 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;
1786 1942
1787 $self->{load_path} = $path; 1943 $self->{load_path} = $path;
1788 1944
1789 1 1945 1
1790} 1946}
… …
1844sub find { 2000sub find {
1845 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
1846 2002
1847 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
1848 2004
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
1850 2007
1851 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path";
1853 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
1854 or return; 2010 or return;
1855 2011
1856 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
1857 2013
… …
1859 or return; 2015 or return;
1860 2016
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2017 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 2018 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 2019 #$cf::WAIT_FOR_TICK->wait;
2020 undef $guard2;
2021 undef $guard1;
1864 $map->reset; 2022 $map->reset;
1865 undef $guard;
1866 return find $path; 2023 return find $path;
1867 } 2024 }
1868 2025
1869 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
1870 } 2027 }
1871} 2028}
1872 2029
1873sub pre_load { } 2030sub pre_load { }
1874sub post_load { } 2031#sub post_load { } # XS
1875 2032
1876sub load { 2033sub load {
1877 my ($self) = @_; 2034 my ($self) = @_;
1878 2035
1879 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
1880 2037
1881 my $path = $self->{path}; 2038 my $path = $self->{path};
1882 2039
1883 { 2040 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 2041 my $guard = cf::lock_acquire "map_data:$path";
1885 2042
2043 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 2044 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 2045
1888 $self->in_memory (cf::MAP_LOADING); 2046 $self->in_memory (cf::MAP_LOADING);
1889 2047
1890 $self->alloc; 2048 $self->alloc;
1891 2049
1892 $self->pre_load; 2050 $self->pre_load;
1893 Coro::cede; 2051 cf::cede_to_tick;
1894 2052
2053 my $f = new_from_file cf::object::thawer $self->{load_path};
2054 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2055 $self->_load_objects ($f)
1896 or return; 2056 or return;
1897 2057
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2058 $self->post_load_original
1899 if delete $self->{load_original}; 2059 if delete $self->{load_original};
1900 2060
1901 if (my $uniq = $self->uniq_path) { 2061 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2062 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2063 unless (aio_stat $uniq) {
2064 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2065 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2066 $self->_load_objects ($f);
2067 $f->resolve_delayed_derefs;
2068 }
1906 } 2069 }
1907 } 2070 }
1908 2071
1909 Coro::cede; 2072 $f->resolve_delayed_derefs;
2073
2074 cf::cede_to_tick;
1910 # now do the right thing for maps 2075 # now do the right thing for maps
1911 $self->link_multipart_objects; 2076 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2077 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2078 unless $self->difficulty;
1914 Coro::cede; 2079 cf::cede_to_tick;
1915 2080
1916 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2082 $self->decay_objects;
1918 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
1919 $self->update_buttons; 2084 $self->update_buttons;
1920 Coro::cede; 2085 cf::cede_to_tick;
1921 $self->set_darkness_map;
1922 Coro::cede;
1923 $self->activate; 2086 $self->activate;
1924 } 2087 }
1925 2088
2089 $self->{last_save} = $cf::RUNTIME;
2090 $self->last_access ($cf::RUNTIME);
2091
1926 $self->in_memory (cf::MAP_IN_MEMORY); 2092 $self->in_memory (cf::MAP_ACTIVE);
1927 } 2093 }
1928 2094
1929 $self->post_load; 2095 $self->post_load;
1930} 2096}
1931 2097
… …
1940 2106
1941 $self 2107 $self
1942} 2108}
1943 2109
1944# 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
1945sub load_diag { 2111sub load_neighbours {
1946 my ($map) = @_; 2112 my ($map) = @_;
1947 2113
1948 my @diag; # diagonal neighbours 2114 my @neigh; # diagonal neighbours
1949 2115
1950 for (0 .. 3) { 2116 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 2117 my $neigh = $map->tile_path ($_)
1952 or next; 2118 or next;
1953 $neigh = find $neigh, $map 2119 $neigh = find $neigh, $map
1954 or next; 2120 or next;
1955 $neigh->load; 2121 $neigh->load;
1956 2122
2123 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2124 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2125 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 2126 }
1960 2127
1961 for (@diag) { 2128 for (grep defined $_->[0], @neigh) {
2129 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 2130 my $neigh = find $path, $origin
1963 or next; 2131 or next;
1964 $neigh->load; 2132 $neigh->load;
1965 } 2133 }
1966} 2134}
1967 2135
… …
1972} 2140}
1973 2141
1974sub do_load_sync { 2142sub do_load_sync {
1975 my ($map) = @_; 2143 my ($map) = @_;
1976 2144
2145 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2146 if $Coro::current == $Coro::main;
2147
1977 cf::sync_job { $map->load }; 2148 cf::sync_job { $map->load };
1978} 2149}
1979 2150
1980our %MAP_PREFETCH; 2151our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2152our $MAP_PREFETCHER = undef;
1982 2153
1983sub find_async { 2154sub find_async {
1984 my ($path, $origin) = @_; 2155 my ($path, $origin, $load) = @_;
1985 2156
1986 $path = normalise $path, $origin && $origin->{path}; 2157 $path = normalise $path, $origin && $origin->{path};
1987 2158
1988 if (my $map = $cf::MAP{$path}) { 2159 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2160 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1990 } 2161 }
1991 2162
1992 undef $MAP_PREFETCH{$path}; 2163 $MAP_PREFETCH{$path} |= $load;
2164
1993 $MAP_PREFETCHER ||= cf::async { 2165 $MAP_PREFETCHER ||= cf::async {
2166 $Coro::current->{desc} = "map prefetcher";
2167
1994 while (%MAP_PREFETCH) { 2168 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2169 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2170 if (my $map = find $k) {
1997 $map->load; 2171 $map->load if $v;
1998 } 2172 }
1999 2173
2000 delete $MAP_PREFETCH{$path}; 2174 delete $MAP_PREFETCH{$k};
2001 } 2175 }
2002 } 2176 }
2003 undef $MAP_PREFETCHER; 2177 undef $MAP_PREFETCHER;
2004 }; 2178 };
2005 $MAP_PREFETCHER->prio (6); 2179 $MAP_PREFETCHER->prio (6);
… …
2008} 2182}
2009 2183
2010sub save { 2184sub save {
2011 my ($self) = @_; 2185 my ($self) = @_;
2012 2186
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2188
2015 $self->{last_save} = $cf::RUNTIME; 2189 $self->{last_save} = $cf::RUNTIME;
2016 2190
2017 return unless $self->dirty; 2191 return unless $self->dirty;
2018 2192
… …
2024 return if $self->{deny_save}; 2198 return if $self->{deny_save};
2025 2199
2026 local $self->{last_access} = $self->last_access;#d# 2200 local $self->{last_access} = $self->last_access;#d#
2027 2201
2028 cf::async { 2202 cf::async {
2203 $Coro::current->{desc} = "map player save";
2029 $_->contr->save for $self->players; 2204 $_->contr->save for $self->players;
2030 }; 2205 };
2206
2207 cf::get_slot 0.02;
2031 2208
2032 if ($uniq) { 2209 if ($uniq) {
2033 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2210 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2034 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2211 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2035 } else { 2212 } else {
… …
2041 my ($self) = @_; 2218 my ($self) = @_;
2042 2219
2043 # save first because save cedes 2220 # save first because save cedes
2044 $self->save; 2221 $self->save;
2045 2222
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2223 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2224
2048 return if $self->players; 2225 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2226 return if $self->in_memory != cf::MAP_ACTIVE;
2050 return if $self->{deny_save}; 2227 return if $self->{deny_save};
2051 2228
2229 $self->in_memory (cf::MAP_SWAPPED);
2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2233 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2234}
2055 2235
2056sub reset_at { 2236sub reset_at {
2057 my ($self) = @_; 2237 my ($self) = @_;
2058 2238
… …
2076 2256
2077 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2078 2258
2079 return if $self->players; 2259 return if $self->players;
2080 2260
2081 warn "resetting map ", $self->path; 2261 warn "resetting map ", $self->path, "\n";
2082 2262
2083 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
2084 2264
2085 # need to save uniques path 2265 # need to save uniques path
2086 unless ($self->{deny_save}) { 2266 unless ($self->{deny_save}) {
… …
2090 if $uniq; 2270 if $uniq;
2091 } 2271 }
2092 2272
2093 delete $cf::MAP{$self->path}; 2273 delete $cf::MAP{$self->path};
2094 2274
2275 $self->deactivate;
2276 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2277 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2278
2099 $self->unlink_save; 2279 $self->unlink_save;
2100 $self->destroy; 2280 $self->destroy;
2101} 2281}
2102 2282
2103my $nuke_counter = "aaaa"; 2283my $nuke_counter = "aaaa";
2104 2284
2105sub nuke { 2285sub nuke {
2106 my ($self) = @_; 2286 my ($self) = @_;
2107 2287
2288 {
2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290
2108 delete $cf::MAP{$self->path}; 2291 delete $cf::MAP{$self->path};
2109 2292
2110 $self->unlink_save; 2293 $self->unlink_save;
2111 2294
2112 bless $self, "cf::map"; 2295 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2296 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2297 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2298 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2299 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2300
2118 $cf::MAP{$self->path} = $self; 2301 $cf::MAP{$self->path} = $self;
2302 }
2119 2303
2120 $self->reset; # polite request, might not happen 2304 $self->reset; # polite request, might not happen
2121} 2305}
2122 2306
2123=item $maps = cf::map::tmp_maps 2307=item $maps = cf::map::tmp_maps
… …
2165 2349
2166sub unique_maps() { 2350sub unique_maps() {
2167 [ 2351 [
2168 map { 2352 map {
2169 utf8::decode $_; 2353 utf8::decode $_;
2170 /\.map$/ 2354 s/\.map$//; # TODO future compatibility hack
2355 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2356 ? ()
2171 ? normalise $_ 2357 : normalise $_
2172 : ()
2173 } @{ aio_readdir $UNIQUEDIR or [] } 2358 } @{ aio_readdir $UNIQUEDIR or [] }
2174 ] 2359 ]
2175} 2360}
2176 2361
2177package 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}
2178 2393
2179=back 2394=back
2180 2395
2181=head3 cf::object 2396=head3 cf::object
2182 2397
… …
2186 2401
2187=over 4 2402=over 4
2188 2403
2189=item $ob->inv_recursive 2404=item $ob->inv_recursive
2190 2405
2191Returns 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.
2192 2408
2193=cut 2409=cut
2194 2410
2195sub inv_recursive_; 2411sub inv_recursive_;
2196sub inv_recursive_ { 2412sub inv_recursive_ {
… …
2199 2415
2200sub inv_recursive { 2416sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2202} 2418}
2203 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
2204package cf; 2448package cf;
2205 2449
2206=back 2450=back
2207 2451
2208=head3 cf::object::player 2452=head3 cf::object::player
… …
2214Sends 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>
2215can 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
2216dialogue with the given NPC character. 2460dialogue with the given NPC character.
2217 2461
2218=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};
2219 2477
2220# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2221# with dialog boxes. 2479# with dialog boxes.
2222#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
2223sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
… …
2235 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2236 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2237 2495
2238 } else { 2496 } else {
2239 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2240 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2241 } 2499 }
2242 } 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 (@_);
2243} 2511}
2244 2512
2245=item $player_object->may ("access") 2513=item $player_object->may ("access")
2246 2514
2247Returns wether the given player is authorized to access resource "access" 2515Returns wether the given player is authorized to access resource "access"
… …
2260 2528
2261=item $player_object->enter_link 2529=item $player_object->enter_link
2262 2530
2263Freezes 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}>).
2264 2532
2265The 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.
2266I<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.
2267 2537
2268Will never block. 2538Will never block.
2269 2539
2270=item $player_object->leave_link ($map, $x, $y) 2540=item $player_object->leave_link ($map, $x, $y)
2271 2541
… …
2323 ($x, $y) = (-1, -1) 2593 ($x, $y) = (-1, -1)
2324 unless (defined $x) && (defined $y); 2594 unless (defined $x) && (defined $y);
2325 2595
2326 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2598 if $x <= 0 && $y <= 0;
2329 2599
2330 $map->load; 2600 $map->load;
2331 $map->load_diag; 2601 $map->load_neighbours;
2332 2602
2333 return unless $self->contr->active; 2603 return unless $self->contr->active;
2334 $self->activate_recursive;
2335 2604
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2337 $self->enter_map ($map, $x, $y); 2606 $self->enter_map ($map, $x, $y);
2607
2608 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive;
2338} 2610}
2339 2611
2340=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2341 2613
2342Moves 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
2343her, loading and preparing them map, calling the provided $check callback 2615her, loading and preparing them map, calling the provided $check callback
2344that 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
2345the new (success) or old (failed) map position. In either case, $done will 2617the new (success) or old (failed) map position. In either case, $done will
2346be called at the end of this process. 2618be called at the end of this process.
2347 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 >>.
2622
2348=cut 2623=cut
2349 2624
2350our $GOTOGEN; 2625our $GOTOGEN;
2351 2626
2352sub cf::object::player::goto { 2627sub cf::object::player::goto {
… …
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357 2632
2358 $self->enter_link; 2633 $self->enter_link;
2359 2634
2360 (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
2361 my $map = eval { 2657 my $map = eval {
2362 my $map = cf::map::find $path; 2658 my $map = defined $path ? cf::map::find $path : undef;
2363 2659
2364 if ($map) { 2660 if ($map) {
2365 $map = $map->customise_for ($self); 2661 $map = $map->customise_for ($self);
2366 $map = $check->($map) if $check && $map; 2662 $map = $check->($map) if $check && $map;
2367 } else { 2663 } else {
2368 $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);
2369 } 2665 }
2370 2666
2371 $map 2667 $map
2372 }; 2668 };
2373 2669
… …
2409} 2705}
2410 2706
2411sub prepare_random_map { 2707sub prepare_random_map {
2412 my ($exit) = @_; 2708 my ($exit) = @_;
2413 2709
2414 my $guard = cf::lock_acquire "exit_prepare:$exit";
2415
2416 # all this does is basically replace the /! path by 2710 # all this does is basically replace the /! path by
2417 # a new random map path (?random/...) with a seed 2711 # a new random map path (?random/...) with a seed
2418 # that depends on the exit object 2712 # that depends on the exit object
2419 2713
2420 my $rmp = parse_random_map_params $exit->msg; 2714 my $rmp = parse_random_map_params $exit->msg;
… …
2422 if ($exit->map) { 2716 if ($exit->map) {
2423 $rmp->{region} = $exit->region->name; 2717 $rmp->{region} = $exit->region->name;
2424 $rmp->{origin_map} = $exit->map->path; 2718 $rmp->{origin_map} = $exit->map->path;
2425 $rmp->{origin_x} = $exit->x; 2719 $rmp->{origin_x} = $exit->x;
2426 $rmp->{origin_y} = $exit->y; 2720 $rmp->{origin_y} = $exit->y;
2721
2722 $exit->map->touch;
2427 } 2723 }
2428 2724
2429 $rmp->{random_seed} ||= $exit->random_seed; 2725 $rmp->{random_seed} ||= $exit->random_seed;
2430 2726
2431 my $data = cf::to_json $rmp; 2727 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2432 my $md5 = Digest::MD5::md5_hex $data; 2728 my $md5 = Digest::MD5::md5_hex $data;
2433 my $meta = "$RANDOMDIR/$md5.meta"; 2729 my $meta = "$RANDOMDIR/$md5.meta";
2434 2730
2435 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2731 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2436 aio_write $fh, 0, (length $data), $data, 0; 2732 aio_write $fh, 0, (length $data), $data, 0;
2437 undef $fh; 2733 undef $fh;
2438 aio_rename "$meta~", $meta; 2734 aio_rename "$meta~", $meta;
2439 2735
2736 my $slaying = "?random/$md5";
2737
2738 if ($exit->valid) {
2440 $exit->slaying ("?random/$md5"); 2739 $exit->slaying ("?random/$md5");
2441 $exit->msg (undef); 2740 $exit->msg (undef);
2741 }
2442 } 2742 }
2443} 2743}
2444 2744
2445sub cf::object::player::enter_exit { 2745sub cf::object::player::enter_exit {
2446 my ($self, $exit) = @_; 2746 my ($self, $exit) = @_;
2447 2747
2448 return unless $self->type == cf::PLAYER; 2748 return unless $self->type == cf::PLAYER;
2449 2749
2450 if ($exit->slaying eq "/!") {
2451 #TODO: this should de-fi-ni-te-ly not be a sync-job
2452 # the problem is that $exit might not survive long enough
2453 # so it needs to be done right now, right here
2454 cf::sync_job { prepare_random_map $exit };
2455 }
2456
2457 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2458 my $hp = $exit->stats->hp;
2459 my $sp = $exit->stats->sp;
2460
2461 $self->enter_link; 2750 $self->enter_link;
2462 2751
2463 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED);
2466
2467 (async { 2752 (async {
2468 $self->deactivate_recursive; # just to be sure 2753 $Coro::current->{desc} = "enter_exit";
2754
2469 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
2470 $self->goto ($slaying, $hp, $sp); 2770 $self->goto ($map, $x, $y);
2471 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
2472 1; 2776 1
2473 }) { 2777 }) {
2474 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the deliantra server. "
2475 . "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. "
2476 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
2477 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
2478 2782
2479 warn "ERROR in enter_exit: $@"; 2783 warn "ERROR in enter_exit: $@";
… …
2496sub cf::client::send_drawinfo { 2800sub cf::client::send_drawinfo {
2497 my ($self, $text, $flags) = @_; 2801 my ($self, $text, $flags) = @_;
2498 2802
2499 utf8::encode $text; 2803 utf8::encode $text;
2500 $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);
2805}
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);
2501} 2830}
2502 2831
2503=item $client->send_msg ($channel, $msg, $color, [extra...]) 2832=item $client->send_msg ($channel, $msg, $color, [extra...])
2504 2833
2505Send 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
… …
2507the 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
2508the message unless the client supports the msg packet. 2837the message unless the client supports the msg packet.
2509 2838
2510=cut 2839=cut
2511 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
2512sub cf::client::send_msg { 2955sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2956 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2957
2515 $msg = $self->pl->expand_cfpod ($msg); 2958 $msg = $self->pl->expand_cfpod ($msg)
2959 unless $color & cf::NDI_VERBATIM;
2516 2960
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2961 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 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
2519 if (ref $channel) { 2970 } elsif (ref $channel) {
2520 # send meta info to client, if not yet sent 2971 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2972 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2973 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => %$channel); 2974 $self->ext_msg (channel_info => $channel);
2524 } 2975 }
2525 2976
2526 $channel = $channel->{id}; 2977 $channel = $channel->{id};
2527 } 2978 }
2528 2979
2529 return unless @extra || length $msg; 2980 return unless @extra || length $msg;
2530 2981
2531 if ($self->can_msg) { 2982 # default colour, mask it out
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2983 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2533 } else { 2984 if $color & cf::NDI_DEF;
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543 2985
2544 if ($color >= 0) { 2986 my $pkt = "msg "
2545 if (0 && $msg =~ /\[/) { 2987 . $self->{json_coder}->encode (
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2988 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2547 } else { 2989 );
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2990
2549 $self->send_packet ("drawinfo $color $msg") 2991 $self->send_big_packet ($pkt);
2550 }
2551 }
2552 }
2553} 2992}
2554 2993
2555=item $client->ext_msg ($type, @msg) 2994=item $client->ext_msg ($type, @msg)
2556 2995
2557Sends an ext event to the client. 2996Sends an ext event to the client.
… …
2559=cut 2998=cut
2560 2999
2561sub cf::client::ext_msg($$@) { 3000sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 3001 my ($self, $type, @msg) = @_;
2563 3002
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 3003 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3004 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 3005 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 3006 push @msg, msgtype => "event_$type";
2570 $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}));
2571 } 3026 }
2572} 3027}
2573 3028
2574=item $success = $client->query ($flags, "text", \&cb) 3029=item $success = $client->query ($flags, "text", \&cb)
2575 3030
… …
2636 my ($type, $reply, @payload) = 3091 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 3092 "ARRAY" eq ref $msg
2638 ? @$msg 3093 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3094 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 3095
3096 my @reply;
3097
2641 if (my $cb = $EXTICMD{$type}) { 3098 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 3099 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 3100 }
3101
3102 $ns->ext_reply ($reply, @reply)
3103 if $reply;
3104
2647 } else { 3105 } else {
2648 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";
2649 } 3107 }
2650 3108
2651 cf::override; 3109 cf::override;
… …
2698our $safe = new Safe "safe"; 3156our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 3157our $safe_hole = new Safe::Hole;
2700 3158
2701$SIG{FPE} = 'IGNORE'; 3159$SIG{FPE} = 'IGNORE';
2702 3160
2703$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));
2704 3166
2705# here we export the classes and methods available to script code 3167# here we export the classes and methods available to script code
2706 3168
2707=pod 3169=pod
2708 3170
2709The following functions and methods are available within a safe environment: 3171The following functions and methods are available within a safe environment:
2710 3172
2711 cf::object 3173 cf::object
2712 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
2713 insert remove 3175 insert remove name archname title slaying race decrease split
3176 value
2714 3177
2715 cf::object::player 3178 cf::object::player
2716 player 3179 player
2717 3180
2718 cf::player 3181 cf::player
… …
2723 3186
2724=cut 3187=cut
2725 3188
2726for ( 3189for (
2727 ["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
2728 insert remove)], 3191 insert remove inv nrof name archname title slaying race
3192 decrease split destroy change_exp value msg lore send_msg)],
2729 ["cf::object::player" => qw(player)], 3193 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3194 ["cf::player" => qw(peaceful send_msg)],
2731 ["cf::map" => qw(trigger)], 3195 ["cf::map" => qw(trigger)],
2732) { 3196) {
2733 no strict 'refs'; 3197 no strict 'refs';
2734 my ($pkg, @funs) = @$_; 3198 my ($pkg, @funs) = @$_;
2735 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2753 3217
2754 my $qcode = $code; 3218 my $qcode = $code;
2755 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3219 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2756 $qcode =~ s/\n/\\n/g; 3220 $qcode =~ s/\n/\\n/g;
2757 3221
3222 %vars = (_dummy => 0) unless %vars;
3223
3224 my @res;
2758 local $_; 3225 local $_;
2759 local @safe::cf::_safe_eval_args = values %vars;
2760 3226
2761 my $eval = 3227 my $eval =
2762 "do {\n" 3228 "do {\n"
2763 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3229 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2764 . "#line 0 \"{$qcode}\"\n" 3230 . "#line 0 \"{$qcode}\"\n"
2765 . $code 3231 . $code
2766 . "\n}" 3232 . "\n}"
2767 ; 3233 ;
2768 3234
3235 if ($CFG{safe_eval}) {
2769 sub_generation_inc; 3236 sub_generation_inc;
3237 local @safe::cf::_safe_eval_args = values %vars;
2770 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3238 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2771 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 }
2772 3244
2773 if ($@) { 3245 if ($@) {
2774 warn "$@"; 3246 warn "$@";
2775 warn "while executing safe code '$code'\n"; 3247 warn "while executing safe code '$code'\n";
2776 warn "with arguments " . (join " ", %vars) . "\n"; 3248 warn "with arguments " . (join " ", %vars) . "\n";
… …
2795=cut 3267=cut
2796 3268
2797sub register_script_function { 3269sub register_script_function {
2798 my ($fun, $cb) = @_; 3270 my ($fun, $cb) = @_;
2799 3271
2800 no strict 'refs'; 3272 $fun = "safe::$fun" if $CFG{safe_eval};
2801 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3273 *$fun = $safe_hole->wrap ($cb);
2802} 3274}
2803 3275
2804=back 3276=back
2805 3277
2806=cut 3278=cut
… …
2808############################################################################# 3280#############################################################################
2809# the server's init and main functions 3281# the server's init and main functions
2810 3282
2811sub load_facedata($) { 3283sub load_facedata($) {
2812 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;
2813 3291
2814 warn "loading facedata from $path\n"; 3292 warn "loading facedata from $path\n";
2815 3293
2816 my $facedata; 3294 my $facedata;
2817 0 < aio_load $path, $facedata 3295 0 < aio_load $path, $facedata
… …
2820 $facedata = Coro::Storable::thaw $facedata; 3298 $facedata = Coro::Storable::thaw $facedata;
2821 3299
2822 $facedata->{version} == 2 3300 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3301 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 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
2825 { 3312 {
2826 my $faces = $facedata->{faceinfo}; 3313 my $faces = $facedata->{faceinfo};
2827 3314
2828 while (my ($face, $info) = each %$faces) { 3315 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3316 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3317
2830 cf::face::set_visibility $idx, $info->{visibility}; 3318 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3319 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2834 3322
2835 cf::cede_to_tick; 3323 cf::cede_to_tick;
2836 } 3324 }
2837 3325
2838 while (my ($face, $info) = each %$faces) { 3326 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3327 next unless $info->{smooth};
3328
2840 my $idx = cf::face::find $face 3329 my $idx = cf::face::find $face
2841 or next; 3330 or next;
3331
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3332 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3333 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3334 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3335 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3336 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2860 3350
2861 cf::anim::invalidate_all; # d'oh 3351 cf::anim::invalidate_all; # d'oh
2862 } 3352 }
2863 3353
2864 { 3354 {
2865 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3355 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3356
2870 while (my ($name, $info) = each %$res) { 3357 while (my ($name, $info) = each %$res) {
2871 my $meta = $enc->encode ({ 3358 if (defined $info->{type}) {
2872 name => $name,
2873 type => $info->{type},
2874 copyright => $info->{copyright}, #TODO#
2875 });
2876
2877 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3359 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2878 3360
2879 if ($name =~ /\.jpg$/) {
2880 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2881 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3362 cf::face::set_type $idx, $info->{type};
2882 } else { 3363 } else {
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3364 $RESOURCE{$name} = $info;
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_type $idx, 1;
2887 cf::face::set_data $idx, 0, $data, $chk;
2888 } 3365 }
2889 3366
2890 cf::cede_to_tick; 3367 cf::cede_to_tick;
2891 } 3368 }
2892 } 3369 }
2893 3370
3371 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3372
2894 1 3373 1
2895} 3374}
2896 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
2897sub 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
2898 load_resource_file "$MAPDIR/regions" 3419 load_resource_file "$MAPDIR/regions"
2899 or die "unable to load regions file\n"; 3420 or die "unable to load regions file\n";
2900 3421
2901 for (cf::region::list) { 3422 for (cf::region::list) {
2902 $_->{match} = qr/$_->{match}/ 3423 $_->{match} = qr/$_->{match}/
… …
2910} 3431}
2911 3432
2912sub reload_archetypes { 3433sub reload_archetypes {
2913 load_resource_file "$DATADIR/archetypes" 3434 load_resource_file "$DATADIR/archetypes"
2914 or die "unable to load archetypes\n"; 3435 or die "unable to load archetypes\n";
2915 #d# NEED to laod twice to resolve forward references
2916 # this really needs to be done in an extra post-pass
2917 # (which needs to be synchronous, so solve it differently)
2918 load_resource_file "$DATADIR/archetypes"
2919 or die "unable to load archetypes\n";
2920} 3436}
2921 3437
2922sub reload_treasures { 3438sub reload_treasures {
2923 load_resource_file "$DATADIR/treasures" 3439 load_resource_file "$DATADIR/treasures"
2924 or die "unable to load treasurelists\n"; 3440 or die "unable to load treasurelists\n";
2925} 3441}
2926 3442
2927sub reload_resources { 3443sub reload_resources {
2928 warn "reloading resource files...\n"; 3444 warn "reloading resource files...\n";
2929 3445
3446 reload_facedata;
3447 reload_archetypes;
2930 reload_regions; 3448 reload_regions;
2931 reload_facedata;
2932 #reload_archetypes;#d#
2933 reload_archetypes;
2934 reload_treasures; 3449 reload_treasures;
2935 3450
2936 warn "finished reloading resource files\n"; 3451 warn "finished reloading resource files\n";
2937} 3452}
2938 3453
2939sub init { 3454sub reload_config {
2940 reload_resources; 3455 warn "reloading config file...\n";
2941}
2942 3456
2943sub cfg_load {
2944 open my $fh, "<:utf8", "$CONFDIR/config" 3457 open my $fh, "<:utf8", "$CONFDIR/config"
2945 or return; 3458 or return;
2946 3459
2947 local $/; 3460 local $/;
2948 *CFG = YAML::Syck::Load <$fh>; 3461 *CFG = YAML::XS::Load scalar <$fh>;
2949 3462
2950 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2951 3464
2952 $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};
2953 $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};
… …
2957 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2958 and die "WARNING: m(un)lockall failed: $!\n"; 3471 and die "WARNING: m(un)lockall failed: $!\n";
2959 }; 3472 };
2960 warn $@ if $@; 3473 warn $@ if $@;
2961 } 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;
2962} 3505}
2963 3506
2964sub 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
2965 # we must not ever block the main coroutine 3522 # we must not ever block the main coroutine
2966 local $Coro::idle = sub { 3523 local $Coro::idle = sub {
2967 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#
2968 (async { 3525 (async {
2969 Event::one_event; 3526 $Coro::current->{desc} = "IDLE BUG HANDLER";
3527 EV::loop EV::LOOP_ONESHOT;
2970 })->prio (Coro::PRIO_MAX); 3528 })->prio (Coro::PRIO_MAX);
2971 }; 3529 };
2972 3530
2973 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;
2974 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
2975 load_extensions; 3550 load_extensions;
2976 3551
2977 $TICK_WATCHER->start; 3552 utime time, time, $RUNTIMEFILE;
2978 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;
2979} 3562}
2980 3563
2981############################################################################# 3564#############################################################################
2982# initialisation and cleanup 3565# initialisation and cleanup
2983 3566
2984# install some emergency cleanup handlers 3567# install some emergency cleanup handlers
2985BEGIN { 3568BEGIN {
3569 our %SIGWATCHER = ();
2986 for my $signal (qw(INT HUP TERM)) { 3570 for my $signal (qw(INT HUP TERM)) {
2987 Event->signal ( 3571 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2988 reentrant => 0,
2989 data => WF_AUTOCANCEL,
2990 signal => $signal,
2991 prio => 0,
2992 cb => sub {
2993 cf::cleanup "SIG$signal"; 3572 cf::cleanup "SIG$signal";
2994 },
2995 ); 3573 };
2996 } 3574 }
2997} 3575}
2998 3576
2999sub write_runtime { 3577sub write_runtime_sync {
3000 my $runtime = "$LOCALDIR/runtime";
3001
3002 # first touch the runtime file to show we are still running: 3578 # first touch the runtime file to show we are still running:
3003 # the fsync below can take a very very long time. 3579 # the fsync below can take a very very long time.
3004 3580
3005 IO::AIO::aio_utime $runtime, undef, undef; 3581 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3006 3582
3007 my $guard = cf::lock_acquire "write_runtime"; 3583 my $guard = cf::lock_acquire "write_runtime";
3008 3584
3009 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3585 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3010 or return; 3586 or return;
3011 3587
3012 my $value = $cf::RUNTIME + 90 + 10; 3588 my $value = $cf::RUNTIME + 90 + 10;
3013 # 10 is the runtime save interval, for a monotonic clock 3589 # 10 is the runtime save interval, for a monotonic clock
3014 # 60 allows for the watchdog to kill the server. 3590 # 60 allows for the watchdog to kill the server.
… …
3024 aio_utime $fh, undef, undef; 3600 aio_utime $fh, undef, undef;
3025 3601
3026 close $fh 3602 close $fh
3027 or return; 3603 or return;
3028 3604
3029 aio_rename "$runtime~", $runtime 3605 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3030 and return; 3606 and return;
3031 3607
3032 warn "runtime file written.\n"; 3608 warn "runtime file written.\n";
3033 3609
3034 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 };
3035} 3661}
3036 3662
3037sub emergency_save() { 3663sub emergency_save() {
3038 my $freeze_guard = cf::freeze_mainloop; 3664 my $freeze_guard = cf::freeze_mainloop;
3039 3665
3040 warn "enter emergency perl save\n"; 3666 warn "emergency_perl_save: enter\n";
3041 3667
3042 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
3043 # use a peculiar iteration method to avoid tripping on perl 3674 # use a peculiar iteration method to avoid tripping on perl
3044 # refcount bugs in for. also avoids problems with players 3675 # refcount bugs in for. also avoids problems with players
3045 # and maps saved/destroyed asynchronously. 3676 # and maps saved/destroyed asynchronously.
3046 warn "begin emergency player save\n"; 3677 warn "emergency_perl_save: begin player save\n";
3047 for my $login (keys %cf::PLAYER) { 3678 for my $login (keys %cf::PLAYER) {
3048 my $pl = $cf::PLAYER{$login} or next; 3679 my $pl = $cf::PLAYER{$login} or next;
3049 $pl->valid or next; 3680 $pl->valid or next;
3681 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3050 $pl->save; 3682 $pl->save;
3051 } 3683 }
3052 warn "end emergency player save\n"; 3684 warn "emergency_perl_save: end player save\n";
3053 3685
3054 warn "begin emergency map save\n"; 3686 warn "emergency_perl_save: begin map save\n";
3055 for my $path (keys %cf::MAP) { 3687 for my $path (keys %cf::MAP) {
3056 my $map = $cf::MAP{$path} or next; 3688 my $map = $cf::MAP{$path} or next;
3057 $map->valid or next; 3689 $map->valid or next;
3058 $map->save; 3690 $map->save;
3059 } 3691 }
3060 warn "end emergency map save\n"; 3692 warn "emergency_perl_save: end map save\n";
3061 3693
3062 warn "begin emergency database checkpoint\n"; 3694 warn "emergency_perl_save: begin database checkpoint\n";
3063 BDB::db_env_txn_checkpoint $DB_ENV; 3695 BDB::db_env_txn_checkpoint $DB_ENV;
3064 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";
3065 }; 3701 };
3066 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
3067 warn "leave emergency perl save\n"; 3708 warn "emergency_perl_save: leave\n";
3068} 3709}
3069 3710
3070sub post_cleanup { 3711sub post_cleanup {
3071 my ($make_core) = @_; 3712 my ($make_core) = @_;
3072 3713
3073 warn Carp::longmess "post_cleanup backtrace" 3714 warn Carp::longmess "post_cleanup backtrace"
3074 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#
3075} 3745}
3076 3746
3077sub do_reload_perl() { 3747sub do_reload_perl() {
3078 # can/must only be called in main 3748 # can/must only be called in main
3079 if ($Coro::current != $Coro::main) { 3749 if ($Coro::current != $Coro::main) {
3080 warn "can only reload from main coroutine"; 3750 warn "can only reload from main coroutine";
3081 return; 3751 return;
3082 } 3752 }
3083 3753
3754 return if $RELOAD++;
3755
3756 my $t1 = EV::time;
3757
3758 while ($RELOAD) {
3084 warn "reloading..."; 3759 warn "reloading...";
3085 3760
3086 warn "entering sync_job"; 3761 warn "entering sync_job";
3087 3762
3088 cf::sync_job { 3763 cf::sync_job {
3089 cf::write_runtime; # external watchdog should not bark 3764 cf::write_runtime_sync; # external watchdog should not bark
3090 cf::emergency_save; 3765 cf::emergency_save;
3091 cf::write_runtime; # external watchdog should not bark 3766 cf::write_runtime_sync; # external watchdog should not bark
3092 3767
3093 warn "syncing database to disk"; 3768 warn "syncing database to disk";
3094 BDB::db_env_txn_checkpoint $DB_ENV; 3769 BDB::db_env_txn_checkpoint $DB_ENV;
3095 3770
3096 # 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
3097 3772
3098 warn "cancelling all WF_AUTOCANCEL watchers";
3099 for (Event::all_watchers) {
3100 $_->cancel if $_->data & WF_AUTOCANCEL;
3101 }
3102
3103 warn "flushing outstanding aio requests"; 3773 warn "flushing outstanding aio requests";
3104 for (;;) {
3105 BDB::flush;
3106 IO::AIO::flush;
3107 Coro::cede;
3108 last unless IO::AIO::nreqs || BDB::nreqs; 3774 while (IO::AIO::nreqs || BDB::nreqs) {
3109 warn "iterate..."; 3775 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3110 }
3111
3112 ++$RELOAD;
3113
3114 warn "cancelling all extension coros";
3115 $_->cancel for values %EXT_CORO;
3116 %EXT_CORO = ();
3117
3118 warn "removing commands";
3119 %COMMAND = ();
3120
3121 warn "removing ext/exti commands";
3122 %EXTCMD = ();
3123 %EXTICMD = ();
3124
3125 warn "unloading/nuking all extensions";
3126 for my $pkg (@EXTS) {
3127 warn "... unloading $pkg";
3128
3129 if (my $cb = $pkg->can ("unload")) {
3130 eval {
3131 $cb->($pkg);
3132 1
3133 } or warn "$pkg unloaded, but with errors: $@";
3134 } 3776 }
3135 3777
3136 warn "... nuking $pkg"; 3778 warn "cancelling all extension coros";
3137 Symbol::delete_package $pkg; 3779 $_->cancel for values %EXT_CORO;
3138 } 3780 %EXT_CORO = ();
3139 3781
3140 warn "unloading all perl modules loaded from $LIBDIR"; 3782 warn "removing commands";
3141 while (my ($k, $v) = each %INC) { 3783 %COMMAND = ();
3142 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3143 3784
3785 warn "removing ext/exti commands";
3786 %EXTCMD = ();
3787 %EXTICMD = ();
3788
3789 warn "unloading/nuking all extensions";
3790 for my $pkg (@EXTS) {
3144 warn "... unloading $k"; 3791 warn "... unloading $pkg";
3145 delete $INC{$k};
3146 3792
3147 $k =~ s/\.pm$//;
3148 $k =~ s/\//::/g;
3149
3150 if (my $cb = $k->can ("unload_module")) { 3793 if (my $cb = $pkg->can ("unload")) {
3794 eval {
3151 $cb->(); 3795 $cb->($pkg);
3796 1
3797 } or warn "$pkg unloaded, but with errors: $@";
3798 }
3799
3800 warn "... clearing $pkg";
3801 clear_package $pkg;
3152 } 3802 }
3153 3803
3154 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;
3155 } 3819 }
3156 3820
3157 warn "getting rid of safe::, as good as possible"; 3821 warn "getting rid of safe::, as good as possible";
3158 Symbol::delete_package "safe::$_" 3822 clear_package "safe::$_"
3159 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);
3160 3824
3161 warn "unloading cf.pm \"a bit\""; 3825 warn "unloading cf.pm \"a bit\"";
3162 delete $INC{"cf.pm"}; 3826 delete $INC{"cf.pm"};
3163 delete $INC{"cf/pod.pm"}; 3827 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3164 3828
3165 # don't, removes xs symbols, too, 3829 # don't, removes xs symbols, too,
3166 # and global variables created in xs 3830 # and global variables created in xs
3167 #Symbol::delete_package __PACKAGE__; 3831 #clear_package __PACKAGE__;
3168 3832
3169 warn "unload completed, starting to reload now"; 3833 warn "unload completed, starting to reload now";
3170 3834
3171 warn "reloading cf.pm"; 3835 warn "reloading cf.pm";
3172 require cf; 3836 require cf;
3173 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3837 cf::_connect_to_perl_1;
3174 3838
3175 warn "loading config and database again"; 3839 warn "loading config and database again";
3176 cf::cfg_load; 3840 cf::reload_config;
3177 3841
3178 warn "loading extensions"; 3842 warn "loading extensions";
3179 cf::load_extensions; 3843 cf::load_extensions;
3180 3844
3845 if ($REATTACH_ON_RELOAD) {
3181 warn "reattaching attachments to objects/players"; 3846 warn "reattaching attachments to objects/players";
3182 _global_reattach; # objects, sockets 3847 _global_reattach; # objects, sockets
3183 warn "reattaching attachments to maps"; 3848 warn "reattaching attachments to maps";
3184 reattach $_ for values %MAP; 3849 reattach $_ for values %MAP;
3185 warn "reattaching attachments to players"; 3850 warn "reattaching attachments to players";
3186 reattach $_ for values %PLAYER; 3851 reattach $_ for values %PLAYER;
3852 }
3187 3853
3854 warn "running post_init jobs";
3855 (pop @POST_INIT)->(1) while @POST_INIT;
3856
3188 warn "leaving sync_job"; 3857 warn "leaving sync_job";
3189 3858
3190 1 3859 1
3191 } or do { 3860 } or do {
3192 warn $@; 3861 warn $@;
3193 warn "error while reloading, exiting."; 3862 cf::cleanup "error while reloading, exiting.";
3194 exit 1;
3195 }; 3863 };
3196 3864
3197 warn "reloaded"; 3865 warn "reloaded";
3866 --$RELOAD;
3867 }
3868
3869 $t1 = EV::time - $t1;
3870 warn "reload completed in ${t1}s\n";
3198}; 3871};
3199 3872
3200our $RELOAD_WATCHER; # used only during reload 3873our $RELOAD_WATCHER; # used only during reload
3201 3874
3202sub reload_perl() { 3875sub reload_perl() {
3203 # doing reload synchronously and two reloads happen back-to-back, 3876 # doing reload synchronously and two reloads happen back-to-back,
3204 # coro crashes during coro_state_free->destroy here. 3877 # coro crashes during coro_state_free->destroy here.
3205 3878
3206 $RELOAD_WATCHER ||= Event->timer ( 3879 $RELOAD_WATCHER ||= cf::async {
3207 reentrant => 0, 3880 Coro::AIO::aio_wait cache_extensions;
3208 after => 0, 3881
3209 data => WF_AUTOCANCEL, 3882 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3210 cb => sub {
3211 do_reload_perl; 3883 do_reload_perl;
3212 undef $RELOAD_WATCHER; 3884 undef $RELOAD_WATCHER;
3213 }, 3885 };
3214 ); 3886 };
3215} 3887}
3216 3888
3217register_command "reload" => sub { 3889register_command "reload" => sub {
3218 my ($who, $arg) = @_; 3890 my ($who, $arg) = @_;
3219 3891
3220 if ($who->flag (FLAG_WIZ)) { 3892 if ($who->flag (FLAG_WIZ)) {
3221 $who->message ("reloading server."); 3893 $who->message ("reloading server.");
3894 async {
3895 $Coro::current->{desc} = "perl_reload";
3222 async { reload_perl }; 3896 reload_perl;
3897 };
3223 } 3898 }
3224}; 3899};
3225 3900
3226unshift @INC, $LIBDIR; 3901unshift @INC, $LIBDIR;
3227 3902
… …
3229 3904
3230our @WAIT_FOR_TICK; 3905our @WAIT_FOR_TICK;
3231our @WAIT_FOR_TICK_BEGIN; 3906our @WAIT_FOR_TICK_BEGIN;
3232 3907
3233sub wait_for_tick { 3908sub wait_for_tick {
3234 return unless $TICK_WATCHER->is_active;
3235 return if $Coro::current == $Coro::main; 3909 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3236 3910
3237 my $signal = new Coro::Signal; 3911 my $signal = new Coro::Signal;
3238 push @WAIT_FOR_TICK, $signal; 3912 push @WAIT_FOR_TICK, $signal;
3239 $signal->wait; 3913 $signal->wait;
3240} 3914}
3241 3915
3242sub wait_for_tick_begin { 3916sub wait_for_tick_begin {
3243 return unless $TICK_WATCHER->is_active;
3244 return if $Coro::current == $Coro::main; 3917 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3245 3918
3246 my $signal = new Coro::Signal; 3919 my $signal = new Coro::Signal;
3247 push @WAIT_FOR_TICK_BEGIN, $signal; 3920 push @WAIT_FOR_TICK_BEGIN, $signal;
3248 $signal->wait; 3921 $signal->wait;
3249} 3922}
3250 3923
3251 my $min = 1e6;#d# 3924sub tick {
3252 my $avg = 10;
3253$TICK_WATCHER = Event->timer (
3254 reentrant => 0,
3255 parked => 1,
3256 prio => 0,
3257 at => $NEXT_TICK || $TICK,
3258 data => WF_AUTOCANCEL,
3259 cb => sub {
3260 if ($Coro::current != $Coro::main) { 3925 if ($Coro::current != $Coro::main) {
3261 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"
3262 unless ++$bug_warning > 10; 3927 unless ++$bug_warning > 10;
3263 return; 3928 return;
3264 } 3929 }
3265 3930
3266 $NOW = $tick_start = Event::time;
3267
3268 cf::server_tick; # one server iteration 3931 cf::server_tick; # one server iteration
3269 3932
3270 0 && sync_job {#d# 3933 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3271 for(1..10) {
3272 my $t = Event::time;
3273 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3274 or die;
3275 3934
3276 $map->width (50); 3935 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3277 $map->height (50); 3936 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3278 $map->alloc; 3937 Coro::async_pool {
3279 $map->_load_objects ("/tmp/x.map", 1); 3938 $Coro::current->{desc} = "runtime saver";
3280 my $t = Event::time - $t; 3939 write_runtime_sync
3281 3940 or warn "ERROR: unable to write runtime file: $!";
3282 #next unless $t < 0.0013;#d#
3283 if ($t < $min) {
3284 $min = $t;
3285 }
3286 $avg = $avg * 0.99 + $t * 0.01;
3287 }
3288 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3289 exit 0;
3290 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3291 }; 3941 };
3942 }
3292 3943
3293 $RUNTIME += $TICK;
3294 $NEXT_TICK += $TICK;
3295
3296 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3297 $NEXT_RUNTIME_WRITE = $NOW + 10;
3298 Coro::async_pool {
3299 write_runtime
3300 or warn "ERROR: unable to write runtime file: $!";
3301 };
3302 }
3303
3304# my $AFTER = Event::time;
3305# warn $AFTER - $NOW;#d#
3306
3307 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3944 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3308 $sig->send; 3945 $sig->send;
3309 } 3946 }
3310 while (my $sig = shift @WAIT_FOR_TICK) { 3947 while (my $sig = shift @WAIT_FOR_TICK) {
3311 $sig->send; 3948 $sig->send;
3312 } 3949 }
3313 3950
3314 $NOW = Event::time; 3951 $LOAD = ($NOW - $TICK_START) / $TICK;
3315
3316 # if we are delayed by four ticks or more, skip them all
3317 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3318
3319 $TICK_WATCHER->at ($NEXT_TICK);
3320 $TICK_WATCHER->start;
3321
3322 $LOAD = ($NOW - $tick_start) / $TICK;
3323 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3952 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3324 3953
3325 _post_tick; 3954 if (0) {
3326 3955 if ($NEXT_TICK) {
3327 3956 my $jitter = $TICK_START - $NEXT_TICK;
3957 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3958 warn "jitter $JITTER\n";#d#
3959 }
3328 }, 3960 }
3329); 3961}
3330 3962
3331{ 3963{
3332 BDB::max_poll_time $TICK * 0.1; 3964 # configure BDB
3333 $BDB_POLL_WATCHER = Event->io ( 3965
3334 reentrant => 0,
3335 fd => BDB::poll_fileno,
3336 poll => 'r',
3337 prio => 0,
3338 data => WF_AUTOCANCEL,
3339 cb => \&BDB::poll_cb,
3340 );
3341 BDB::min_parallel 8; 3966 BDB::min_parallel 16;
3342 3967 BDB::max_poll_reqs $TICK * 0.1;
3343 BDB::set_sync_prepare { 3968 $AnyEvent::BDB::WATCHER->priority (1);
3344 my $status;
3345 my $current = $Coro::current;
3346 (
3347 sub {
3348 $status = $!;
3349 $current->ready; undef $current;
3350 },
3351 sub {
3352 Coro::schedule while defined $current;
3353 $! = $status;
3354 },
3355 )
3356 };
3357 3969
3358 unless ($DB_ENV) { 3970 unless ($DB_ENV) {
3359 $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);
3360 3977
3361 cf::sync_job { 3978 cf::sync_job {
3362 eval { 3979 eval {
3363 BDB::db_env_open 3980 BDB::db_env_open
3364 $DB_ENV, 3981 $DB_ENV,
… …
3366 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
3367 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3984 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3368 0666; 3985 0666;
3369 3986
3370 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3987 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3371
3372 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3373 $DB_ENV->set_lk_detect;
3374 }; 3988 };
3375 3989
3376 cf::cleanup "db_env_open(db): $@" if $@; 3990 cf::cleanup "db_env_open(db): $@" if $@;
3377 }; 3991 };
3378 } 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 };
3379} 4003}
3380 4004
3381{ 4005{
4006 # configure IO::AIO
4007
3382 IO::AIO::min_parallel 8; 4008 IO::AIO::min_parallel 8;
3383
3384 undef $Coro::AIO::WATCHER;
3385 IO::AIO::max_poll_time $TICK * 0.1; 4009 IO::AIO::max_poll_time $TICK * 0.1;
3386 $AIO_POLL_WATCHER = Event->io ( 4010 undef $AnyEvent::AIO::WATCHER;
3387 reentrant => 0,
3388 data => WF_AUTOCANCEL,
3389 fd => IO::AIO::poll_fileno,
3390 poll => 'r',
3391 prio => 6,
3392 cb => \&IO::AIO::poll_cb,
3393 );
3394} 4011}
3395 4012
3396my $_log_backtrace; 4013my $_log_backtrace;
3397 4014
3398sub _log_backtrace { 4015sub _log_backtrace {
… …
3401 $msg =~ s/\n//; 4018 $msg =~ s/\n//;
3402 4019
3403 # limit the # of concurrent backtraces 4020 # limit the # of concurrent backtraces
3404 if ($_log_backtrace < 2) { 4021 if ($_log_backtrace < 2) {
3405 ++$_log_backtrace; 4022 ++$_log_backtrace;
4023 my $perl_bt = Carp::longmess $msg;
3406 async { 4024 async {
4025 $Coro::current->{desc} = "abt $msg";
4026
3407 my @bt = fork_call { 4027 my @bt = fork_call {
3408 @addr = map { sprintf "%x", $_ } @addr; 4028 @addr = map { sprintf "%x", $_ } @addr;
3409 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4029 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3410 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 |"
3411 or die "addr2line: $!"; 4031 or die "addr2line: $!";
… …
3419 } 4039 }
3420 4040
3421 @funcs 4041 @funcs
3422 }; 4042 };
3423 4043
3424 LOG llevInfo, "[ABT] $msg\n"; 4044 LOG llevInfo, "[ABT] $perl_bt\n";
4045 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3425 LOG llevInfo, "[ABT] $_\n" for @bt; 4046 LOG llevInfo, "[ABT] $_\n" for @bt;
3426 --$_log_backtrace; 4047 --$_log_backtrace;
3427 }; 4048 };
3428 } else { 4049 } else {
3429 LOG llevInfo, "[ABT] $msg\n"; 4050 LOG llevInfo, "[ABT] $msg\n";
3430 LOG llevInfo, "[ABT] [suppressed]\n"; 4051 LOG llevInfo, "[ABT] [suppressed]\n";
3431 } 4052 }
3432} 4053}
3433 4054
3434# load additional modules 4055# load additional modules
3435use cf::pod; 4056require "cf/$_.pm" for @EXTRA_MODULES;
4057cf::_connect_to_perl_2;
3436 4058
3437END { cf::emergency_save } 4059END { cf::emergency_save }
3438 4060
34391 40611
3440 4062

Diff Legend

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