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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.517 by root, Thu Apr 15 06:07:51 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines