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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines