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.310 by elmex, Mon Jul 16 15:43:49 2007 UTC vs.
Revision 1.526 by root, Wed Apr 21 05:48:35 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines