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.352 by root, Sun Sep 2 04:57:14 2007 UTC vs.
Revision 1.496 by root, Sun Nov 15 18:03:59 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 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.64 (); 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;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.32 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::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";
41Compress::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
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
75 112
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 115our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
83 117
118our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 120our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 121our $DB_ENV;
122
123our @EXTRA_MODULES = qw(pod match mapscript);
86 124
87our %CFG; 125our %CFG;
88 126
89our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 128our $RUNTIME;
129our $NOW;
91 130
92our %PLAYER; # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 132our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
95 134
96# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 137
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
102 147
103binmode STDOUT; 148binmode STDOUT;
104binmode STDERR; 149binmode STDERR;
105 150
106# read virtual server time, if available 151# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
111} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
112 159
113mkdir $_ 160mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 162
116our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
117 164
118sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
119 177
120############################################################################# 178#############################################################################
121 179
122=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
123 181
159 217
160The raw value load value from the last tick. 218The raw value load value from the last tick.
161 219
162=item %cf::CFG 220=item %cf::CFG
163 221
164Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 223from wherever your confdir points to.
166 224
167=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
168 226
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
170returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
171per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172 230
173=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
174 232
175This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 235that call.
178 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
179=back 243=back
180 244
181=cut 245=cut
182 246
183BEGIN { 247$Coro::State::WARNHOOK = sub {
184 *CORE::GLOBAL::warn = sub {
185 my $msg = join "", @_; 248 my $msg = join "", @_;
186 249
187 $msg .= "\n" 250 $msg .= "\n"
188 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
189 252
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 254
192 utf8::encode $msg;
193 LOG llevError, $msg; 255 LOG llevError, $msg;
194 }; 256};
195} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
196 271
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 282for my $pkg (qw(
208 cf::global cf::attachable 283 cf::global cf::attachable
209 cf::object cf::object::player 284 cf::object cf::object::player
210 cf::client cf::player 285 cf::client cf::player
211 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
212 cf::map cf::party cf::region 288 cf::party cf::region
213)) { 289)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 291}
217 292
218$Event::DIED = sub { 293$EV::DIED = sub {
219 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
220}; 295};
221 296
222############################################################################# 297#############################################################################
223 298
224=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 322 $d
248 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
249} 324}
250 325
251=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
252 327
253Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
254 329
255=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
256 331
257Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
258 333
259=cut 334=cut
260 335
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 337
263sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
265 354
266=item cf::lock_wait $string 355=item cf::lock_wait $string
267 356
268Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
269 358
270=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
271 360
272Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
275returned. 364returned.
276 365
277Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 367deadlocked coro.
284 373
285Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
286 375
287=cut 376=cut
288 377
289our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
290 379
291sub lock_wait($) { 380sub lock_wait($) {
292 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
293
294 # wait for lock, if any
295 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule;
298 }
299} 382}
300 383
301sub lock_acquire($) { 384sub lock_acquire($) {
302 my ($key) = @_; 385 $LOCKS->guard ($_[0])
303
304 # wait, to be sure we are not locked
305 lock_wait $key;
306
307 $LOCK{$key} = [];
308
309 Coro::guard {
310 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} };
312 }
313} 386}
314 387
315sub lock_active($) { 388sub lock_active($) {
316 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
317
318 ! ! $LOCK{$key}
319} 390}
320 391
321sub freeze_mainloop { 392sub freeze_mainloop {
322 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
323 394
324 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
325 $TICK_WATCHER->start; 396}
326 }; 397
327 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
328 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
329} 411}
330 412
331=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
332 414
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
344our @SLOT_QUEUE; 426our @SLOT_QUEUE;
345our $SLOT_QUEUE; 427our $SLOT_QUEUE;
346 428
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 429$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 430$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager");
432
349 my $signal = new Coro::Signal; 433 my $signal = new Coro::Signal;
350 434
351 while () { 435 while () {
352 next_job: 436 next_job:
353 my $avail = cf::till_tick; 437 my $avail = cf::till_tick;
361 } 445 }
362 } 446 }
363 } 447 }
364 448
365 if (@SLOT_QUEUE) { 449 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 450 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 451 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 452 $signal->wait;
369 } else { 453 } else {
370 Coro::schedule; 454 Coro::schedule;
371 } 455 }
372 } 456 }
373}; 457};
374 458
375sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
376 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
377 463
378 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
380 466
394 480
395BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
396 482
397=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
398 484
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 486is always able to handle events or runnable, as Deliantra is only
401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable. 488acceptable.
403 489
404If it must be done, put the blocking parts into C<sync_job>. This will run 490If it must be done, put the blocking parts into C<sync_job>. This will run
405the given BLOCK in another coroutine while waiting for the result. The 491the given BLOCK in another coroutine while waiting for the result. The
410 496
411sub sync_job(&) { 497sub sync_job(&) {
412 my ($job) = @_; 498 my ($job) = @_;
413 499
414 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 501 my $time = EV::time;
416 502
417 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
419 505
420 # TODO: use suspend/resume instead 506 LOG llevError, Carp::longmess "sync job";#d#
421 # (but this is cancel-safe) 507
422 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
423 509
424 my $busy = 1; 510 my $busy = 1;
425 my @res; 511 my @res;
426 512
427 (async { 513 (async {
514 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 515 @res = eval { $job->() };
429 warn $@ if $@; 516 warn $@ if $@;
430 undef $busy; 517 undef $busy;
431 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
432 519
433 while ($busy) { 520 while ($busy) {
434 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
435 } 525 }
526 }
436 527
437 $time = Event::time - $time; 528 my $time = EV::time - $time;
438 529
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
443 531
444 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
445 } else { 533 } else {
446 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
447 535
472=item fork_call { }, $args 560=item fork_call { }, $args
473 561
474Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
478 566
479=cut 567=cut
480 568
481sub fork_call(&@) { 569sub fork_call(&@) {
482 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
483 571
484 # we seemingly have to make a local copy of the whole thing, 572 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 573 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 574 # TODO: investigate and fix (likely this will be rather laborious)
487 575
488 my @res = Coro::Util::fork_eval { 576 my @res = Coro::Util::fork_eval {
489 reset_signals; 577 reset_signals;
490 &$cb 578 &$cb
491 }, @args; 579 }, @args;
492 580
493 wantarray ? @res : $res[-1] 581 wantarray ? @res : $res[-1]
494} 582}
495 583
584=item $coin = coin_from_name $name
585
586=cut
587
588our %coin_alias = (
589 "silver" => "silvercoin",
590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
609}
610
496=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
497 612
498Returns a single value from the environment database. 613Returns a single value from the environment database.
499 614
500=item cf::db_put $family => $key => $value 615=item cf::db_put $family => $key => $value
501 616
502Stores the given C<$value> in the family. It can currently store binary 617Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 618data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 619
620=item $db = cf::db_table "name"
621
622Create and/or open a new database table. The string must not be "db" and must be unique
623within each server.
624
505=cut 625=cut
626
627sub db_table($) {
628 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV;
630
631 eval {
632 $db->set_flags (BDB::CHKSUM);
633
634 utf8::encode $name;
635 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
636 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
637 cf::cleanup "db_open(db): $!" if $!;
638 };
639 cf::cleanup "db_open(db): $@" if $@;
640
641 $db
642}
506 643
507our $DB; 644our $DB;
508 645
509sub db_init { 646sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 647 cf::sync_job {
514 eval { 648 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 649 };
524} 650}
525 651
526sub db_get($$) { 652sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 653 my $key = "$_[0]/$_[1]";
528 654
626 752
627############################################################################# 753#############################################################################
628 754
629=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
630 756
631Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
632attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
634 760
635In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
636C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 763Deliantra).
638 764
639=over 4 765=over 4
640 766
641=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
642 768
686=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
687 813
688Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
689given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
690 816
691Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
692that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
693 819
694These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
695 821
696=over 4 822=over 4
924 } 1050 }
925 1051
926 0 1052 0
927} 1053}
928 1054
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1056
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1058
933Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
934 1060
940 1066
941=cut 1067=cut
942 1068
943############################################################################# 1069#############################################################################
944# object support 1070# object support
945#
946 1071
1072sub _object_equal($$);
1073sub _object_equal($$) {
1074 my ($a, $b) = @_;
1075
1076 return 0 unless (ref $a) eq (ref $b);
1077
1078 if ("HASH" eq ref $a) {
1079 my @ka = keys %$a;
1080 my @kb = keys %$b;
1081
1082 return 0 if @ka != @kb;
1083
1084 for (0 .. $#ka) {
1085 return 0 unless $ka[$_] eq $kb[$_];
1086 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1087 }
1088
1089 } elsif ("ARRAY" eq ref $a) {
1090
1091 return 0 if @$a != @$b;
1092
1093 for (0 .. $#$a) {
1094 return 0 unless _object_equal $a->[$_], $b->[$_];
1095 }
1096
1097 } elsif ($a ne $b) {
1098 return 0;
1099 }
1100
1101 1
1102}
1103
1104our $SLOW_MERGES;#d#
947sub _can_merge { 1105sub _can_merge {
948 my ($ob1, $ob2) = @_; 1106 my ($ob1, $ob2) = @_;
949 1107
950 local $Storable::canonical = 1; 1108 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1109
954 $fob1 eq $fob2 1110 # we do the slow way here
1111 return _object_equal $ob1, $ob2
955} 1112}
956 1113
957sub reattach { 1114sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1116 my ($obj) = @_;
960 1117
1118 # no longer needed after getting rid of delete_package?
961 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
962 1120
963 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
964 1122
965 @$registry = (); 1123 @$registry = ();
966 1124
981cf::attachable->attach ( 1139cf::attachable->attach (
982 prio => -1000000, 1140 prio => -1000000,
983 on_instantiate => sub { 1141 on_instantiate => sub {
984 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
985 1143
986 $data = from_json $data; 1144 $data = decode_json $data;
987 1145
988 for (@$data) { 1146 for (@$data) {
989 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
990 1148
991 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1165sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1166 my ($filename, $rdata, $objs) = @_;
1009 1167
1010 sync_job { 1168 sync_job {
1011 if (length $$rdata) { 1169 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1014 1173
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1019 close $fh; 1181 aio_close $fh;
1020 1182
1021 if (@$objs) { 1183 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1027 close $fh; 1192 aio_close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1194 }
1030 } else { 1195 } else {
1031 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1032 } 1197 }
1033 1198
1034 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1035 } else { 1203 } else {
1036 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1037 } 1205 }
1038 } else { 1206 } else {
1039 aio_unlink $filename; 1207 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1041 } 1209 }
1042 } 1210 };
1043} 1211}
1044 1212
1045sub object_freezer_as_string { 1213sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1214 my ($rdata, $objs) = @_;
1047 1215
1059 or return; 1227 or return;
1060 1228
1061 unless (aio_stat "$filename.pst") { 1229 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1230 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1231 or return;
1232
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1233 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs};
1065 } 1235 }
1066 1236
1237 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1238 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1239 $decname, length $data, scalar @{$av || []};
1240
1069 return ($data, $av); 1241 ($data, $av)
1070} 1242}
1071 1243
1072=head2 COMMAND CALLBACKS 1244=head2 COMMAND CALLBACKS
1073 1245
1074=over 4 1246=over 4
1128 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1129 1301
1130 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1131} 1303}
1132 1304
1305use File::Glob ();
1306
1133cf::player->attach ( 1307cf::player->attach (
1134 on_command => sub { 1308 on_command => sub {
1135 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1136 1310
1137 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
1169 1343
1170 cf::override; 1344 cf::override;
1171 }, 1345 },
1172); 1346);
1173 1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1360
1174sub load_extensions { 1361sub load_extensions {
1175 cf::sync_job { 1362 cf::sync_job {
1176 my %todo; 1363 my %todo;
1177 1364
1178 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
1197 1384
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200 1387
1201 $ext{source} = 1388 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1203 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1204 . $source 1391 . $source
1205 . "\n};\n1"; 1392 . "\n};\n1";
1206 1393
1207 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
1223 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1225 1412
1226 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1227 warn $msg; 1414 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1229 exit 1;
1230 } 1416 }
1231 1417
1232 warn $msg; 1418 warn $msg;
1233 } 1419 }
1234 1420
1248 1434
1249=back 1435=back
1250 1436
1251=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1252 1438
1253Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1254 1440
1255=cut 1441=cut
1256 1442
1257package cf::player; 1443package cf::player;
1258 1444
1259use Coro::AIO; 1445use Coro::AIO;
1260 1446
1261=head3 cf::player 1447=head3 cf::player
1262 1448
1263=over 4 1449=over 4
1450
1451=item cf::player::num_playing
1452
1453Returns the official number of playing players, as per the Crossfire metaserver rules.
1454
1455=cut
1456
1457sub num_playing {
1458 scalar grep
1459 $_->ob->map
1460 && !$_->hidden
1461 && !$_->ob->flag (cf::FLAG_WIZ),
1462 cf::player::list
1463}
1264 1464
1265=item cf::player::find $login 1465=item cf::player::find $login
1266 1466
1267Returns the given player object, loading it if necessary (might block). 1467Returns the given player object, loading it if necessary (might block).
1268 1468
1287 1487
1288sub exists($) { 1488sub exists($) {
1289 my ($login) = @_; 1489 my ($login) = @_;
1290 1490
1291 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1292 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1293} 1493}
1294 1494
1295sub find($) { 1495sub find($) {
1296 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1297 my $login = $_[0]; 1497 my $login = $_[0];
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1504 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1505 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1506 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1507 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1508
1309 my $pl = load_pl path $login 1509 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1510 or return;
1511
1512 my $pl = cf::player::load_pl $f
1513 or return;
1514
1515 local $cf::PLAYER_LOADING{$login} = $pl;
1516 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1312 } 1518 }
1313 } 1519 }
1314} 1520}
1315 1521
1323 1529
1324 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1325 1531
1326 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1327 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1534
1535 cf::get_slot 0.01;
1328 1536
1329 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1330 cf::cede_to_tick; 1538 cf::cede_to_tick;
1331} 1539}
1332 1540
1364 my ($pl) = @_; 1572 my ($pl) = @_;
1365 1573
1366 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1367 1575
1368 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1369 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1370 1578
1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1372 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1373 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1374 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1375 1585
1376 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1377 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
1413 or return []; 1623 or return [];
1414 1624
1415 my @logins; 1625 my @logins;
1416 1626
1417 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1628 my $path = path $login;
1629
1630 # a .pst is a dead give-away for a valid player
1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1636 }
1421 1637
1422 utf8::decode $login; 1638 utf8::decode $login;
1423 push @logins, $login; 1639 push @logins, $login;
1424 } 1640 }
1425 1641
1452 } 1668 }
1453 1669
1454 \@paths 1670 \@paths
1455} 1671}
1456 1672
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1458 1674
1459Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1460
1461=cut
1462
1463sub expand_cfpod {
1464 ((my $self), (local $_)) = @_;
1465
1466 # escape & and <
1467 s/&/&amp;/g;
1468 s/(?<![BIUGHT])</&lt;/g;
1469
1470 # this is buggy, it needs to properly take care of nested <'s
1471
1472 1 while
1473 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1478 # replace G<male|female> tags
1479 || s{G<([^>|]*)\|([^>]*)>}{
1480 $self->gender ? $2 : $1
1481 }ge
1482 # replace H<hint text>
1483 || s{H<([^\>]*)>}
1484 {
1485 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "")
1488 [$self->{hintmode}]
1489 }ge;
1490
1491 # create single paragraphs (very hackish)
1492 s/(?<=\S)\n(?=\w)/ /g;
1493
1494 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines
1499
1500 $_
1501}
1502
1503sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode}
1506}
1507 1676
1508=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1509 1678
1510Sends an ext reply to the player. 1679Sends an ext reply to the player.
1511 1680
1578our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1579our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1580 1749
1581sub generate_random_map { 1750sub generate_random_map {
1582 my ($self, $rmp) = @_; 1751 my ($self, $rmp) = @_;
1752
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754
1583 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1584 $self->_create_random_map ( 1756 $self->_create_random_map (
1585 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1586 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1587 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1709 1881
1710# the temporary/swap location 1882# the temporary/swap location
1711sub save_path { 1883sub save_path {
1712 my ($self) = @_; 1884 my ($self) = @_;
1713 1885
1714 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1715 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1716} 1888}
1717 1889
1718# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1719sub uniq_path { 1891sub uniq_path {
1720 my ($self) = @_; 1892 my ($self) = @_;
1721 1893
1722 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1723 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1724}
1725
1726# and all this just because we cannot iterate over
1727# all maps in C++...
1728sub change_all_map_light {
1729 my ($change) = @_;
1730
1731 $_->change_map_light ($change)
1732 for grep $_->outdoor, values %cf::MAP;
1733} 1896}
1734 1897
1735sub decay_objects { 1898sub decay_objects {
1736 my ($self) = @_; 1899 my ($self) = @_;
1737 1900
1750 1913
1751sub load_header_from($) { 1914sub load_header_from($) {
1752 my ($self, $path) = @_; 1915 my ($self, $path) = @_;
1753 1916
1754 utf8::encode $path; 1917 utf8::encode $path;
1755 #aio_open $path, O_RDONLY, 0 1918 my $f = new_from_file cf::object::thawer $path
1756 # or return;
1757
1758 $self->_load_header ($path)
1759 or return; 1919 or return;
1920
1921 $self->_load_header ($f)
1922 or return;
1923
1924 local $MAP_LOADING{$self->{path}} = $self;
1925 $f->resolve_delayed_derefs;
1760 1926
1761 $self->{load_path} = $path; 1927 $self->{load_path} = $path;
1762 1928
1763 1 1929 1
1764} 1930}
1818sub find { 1984sub find {
1819 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1820 1986
1821 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1822 1988
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1823 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1824 1991
1825 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1826 my $guard = cf::lock_acquire "map_find:$path";
1827 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1828 or return; 1994 or return;
1829 1995
1830 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1831 1997
1833 or return; 1999 or return;
1834 2000
1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1836 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1837 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
2005 undef $guard1;
1838 $map->reset; 2006 $map->reset;
1839 undef $guard;
1840 return find $path; 2007 return find $path;
1841 } 2008 }
1842 2009
1843 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1844 } 2011 }
1853 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
1854 2021
1855 my $path = $self->{path}; 2022 my $path = $self->{path};
1856 2023
1857 { 2024 {
1858 my $guard1 = cf::lock_acquire "map_data:$path"; 2025 my $guard = cf::lock_acquire "map_data:$path";
1859 my $guard2 = cf::lock_acquire "map_load:$path";
1860 2026
2027 return unless $self->valid;
1861 return if $self->in_memory != cf::MAP_SWAPPED; 2028 return unless $self->in_memory == cf::MAP_SWAPPED;
1862 2029
1863 $self->in_memory (cf::MAP_LOADING); 2030 $self->in_memory (cf::MAP_LOADING);
1864 2031
1865 $self->alloc; 2032 $self->alloc;
1866 2033
1867 $self->pre_load; 2034 $self->pre_load;
1868 cf::cede_to_tick; 2035 cf::cede_to_tick;
1869 2036
2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2038 $f->skip_block;
1870 $self->_load_objects ($self->{load_path}, 1) 2039 $self->_load_objects ($f)
1871 or return; 2040 or return;
1872 2041
1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
1874 if delete $self->{load_original}; 2043 if delete $self->{load_original};
1875 2044
1876 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
1877 utf8::encode $uniq; 2046 utf8::encode $uniq;
1878 if (aio_open $uniq, O_RDONLY, 0) { 2047 unless (aio_stat $uniq) {
2048 if (my $f = new_from_file cf::object::thawer $uniq) {
1879 $self->clear_unique_items; 2049 $self->clear_unique_items;
1880 $self->_load_objects ($uniq, 0); 2050 $self->_load_objects ($f);
2051 $f->resolve_delayed_derefs;
2052 }
1881 } 2053 }
1882 } 2054 }
2055
2056 $f->resolve_delayed_derefs;
1883 2057
1884 cf::cede_to_tick; 2058 cf::cede_to_tick;
1885 # now do the right thing for maps 2059 # now do the right thing for maps
1886 $self->link_multipart_objects; 2060 $self->link_multipart_objects;
1887 $self->difficulty ($self->estimate_difficulty) 2061 $self->difficulty ($self->estimate_difficulty)
1891 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
1892 $self->decay_objects; 2066 $self->decay_objects;
1893 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
1894 $self->update_buttons; 2068 $self->update_buttons;
1895 cf::cede_to_tick; 2069 cf::cede_to_tick;
1896 $self->set_darkness_map;
1897 cf::cede_to_tick;
1898 $self->activate; 2070 $self->activate;
1899 } 2071 }
1900 2072
1901 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
1903 2075
1904 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
1905 } 2077 }
1906 2078
1907 $self->post_load; 2079 $self->post_load;
1908} 2080}
1909 2081
1967 my ($path, $origin, $load) = @_; 2139 my ($path, $origin, $load) = @_;
1968 2140
1969 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1970 2142
1971 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1973 } 2145 }
1974 2146
1975 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
1976 2148
1977 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1978 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1979 while (my ($k, $v) = each %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1980 if (my $map = find $k) { 2154 if (my $map = find $k) {
1981 $map->load if $v; 2155 $map->load if $v;
1982 } 2156 }
2008 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2009 2183
2010 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2011 2185
2012 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2013 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2014 }; 2189 };
2190
2191 cf::get_slot 0.02;
2015 2192
2016 if ($uniq) { 2193 if ($uniq) {
2017 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2018 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2019 } else { 2196 } else {
2028 $self->save; 2205 $self->save;
2029 2206
2030 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2031 2208
2032 return if $self->players; 2209 return if $self->players;
2033 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2034 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2035 2212
2213 $self->in_memory (cf::MAP_SWAPPED);
2214
2215 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP;
2036 $self->clear; 2217 $self->clear;
2037 $self->in_memory (cf::MAP_SWAPPED);
2038} 2218}
2039 2219
2040sub reset_at { 2220sub reset_at {
2041 my ($self) = @_; 2221 my ($self) = @_;
2042 2222
2060 2240
2061 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2062 2242
2063 return if $self->players; 2243 return if $self->players;
2064 2244
2065 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2066 2246
2067 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2068 2248
2069 # need to save uniques path 2249 # need to save uniques path
2070 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2074 if $uniq; 2254 if $uniq;
2075 } 2255 }
2076 2256
2077 delete $cf::MAP{$self->path}; 2257 delete $cf::MAP{$self->path};
2078 2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2261 $self->clear;
2080
2081 $_->clear_links_to ($self) for values %cf::MAP;
2082 2262
2083 $self->unlink_save; 2263 $self->unlink_save;
2084 $self->destroy; 2264 $self->destroy;
2085} 2265}
2086 2266
2153 2333
2154sub unique_maps() { 2334sub unique_maps() {
2155 [ 2335 [
2156 map { 2336 map {
2157 utf8::decode $_; 2337 utf8::decode $_;
2158 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2159 ? normalise $_ 2341 : normalise $_
2160 : ()
2161 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2162 ] 2343 ]
2163} 2344}
2164 2345
2165package cf; 2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2166 2377
2167=back 2378=back
2168 2379
2169=head3 cf::object 2380=head3 cf::object
2170 2381
2174 2385
2175=over 4 2386=over 4
2176 2387
2177=item $ob->inv_recursive 2388=item $ob->inv_recursive
2178 2389
2179Returns the inventory of the object _and_ their inventories, recursively. 2390Returns the inventory of the object I<and> their inventories, recursively,
2391but I<not> the object itself.
2180 2392
2181=cut 2393=cut
2182 2394
2183sub inv_recursive_; 2395sub inv_recursive_;
2184sub inv_recursive_ { 2396sub inv_recursive_ {
2187 2399
2188sub inv_recursive { 2400sub inv_recursive {
2189 inv_recursive_ inv $_[0] 2401 inv_recursive_ inv $_[0]
2190} 2402}
2191 2403
2404=item $ref = $ob->ref
2405
2406Creates and returns a persistent reference to an object that can be stored as a string.
2407
2408=item $ob = cf::object::deref ($refstring)
2409
2410returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2411even if the object actually exists. May block.
2412
2413=cut
2414
2415sub deref {
2416 my ($ref) = @_;
2417
2418 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2419 my ($uuid, $name) = ($1, $2);
2420 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2421 or return;
2422 $pl->ob->uuid eq $uuid
2423 or return;
2424
2425 $pl->ob
2426 } else {
2427 warn "$ref: cannot resolve object reference\n";
2428 undef
2429 }
2430}
2431
2192package cf; 2432package cf;
2193 2433
2194=back 2434=back
2195 2435
2196=head3 cf::object::player 2436=head3 cf::object::player
2202Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2442Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2203can be C<undef>. Does the right thing when the player is currently in a 2443can be C<undef>. Does the right thing when the player is currently in a
2204dialogue with the given NPC character. 2444dialogue with the given NPC character.
2205 2445
2206=cut 2446=cut
2447
2448our $SAY_CHANNEL = {
2449 id => "say",
2450 title => "Map",
2451 reply => "say ",
2452 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2453};
2454
2455our $CHAT_CHANNEL = {
2456 id => "chat",
2457 title => "Chat",
2458 reply => "chat ",
2459 tooltip => "Player chat and shouts, global to the server.",
2460};
2207 2461
2208# rough implementation of a future "reply" method that works 2462# rough implementation of a future "reply" method that works
2209# with dialog boxes. 2463# with dialog boxes.
2210#TODO: the first argument must go, split into a $npc->reply_to ( method 2464#TODO: the first argument must go, split into a $npc->reply_to ( method
2211sub cf::object::player::reply($$$;$) { 2465sub cf::object::player::reply($$$;$) {
2223 my $dialog = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2225 2479
2226 } else { 2480 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2482 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2229 } 2483 }
2230 } 2484 }
2231} 2485}
2232 2486
2233=item $object->send_msg ($channel, $msg, $color, [extra...]) 2487=item $object->send_msg ($channel, $msg, $color, [extra...])
2258 2512
2259=item $player_object->enter_link 2513=item $player_object->enter_link
2260 2514
2261Freezes the player and moves him/her to a special map (C<{link}>). 2515Freezes the player and moves him/her to a special map (C<{link}>).
2262 2516
2263The player should be reasonably safe there for short amounts of time. You 2517The player should be reasonably safe there for short amounts of time (e.g.
2264I<MUST> call C<leave_link> as soon as possible, though. 2518for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link
2520map.
2265 2521
2266Will never block. 2522Will never block.
2267 2523
2268=item $player_object->leave_link ($map, $x, $y) 2524=item $player_object->leave_link ($map, $x, $y)
2269 2525
2321 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2322 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2323 2579
2324 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2325 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2326 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2327 2583
2328 $map->load; 2584 $map->load;
2329 $map->load_neighbours; 2585 $map->load_neighbours;
2330 2586
2331 return unless $self->contr->active; 2587 return unless $self->contr->active;
2332 $self->activate_recursive;
2333 2588
2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2335 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2336} 2594}
2337 2595
2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2339 2597
2340Moves the player to the given map-path and coordinates by first freezing 2598Moves the player to the given map-path and coordinates by first freezing
2341her, loading and preparing them map, calling the provided $check callback 2599her, loading and preparing them map, calling the provided $check callback
2342that has to return the map if sucecssful, and then unfreezes the player on 2600that has to return the map if sucecssful, and then unfreezes the player on
2343the new (success) or old (failed) map position. In either case, $done will 2601the new (success) or old (failed) map position. In either case, $done will
2344be called at the end of this process. 2602be called at the end of this process.
2345 2603
2604Note that $check will be called with a potentially non-loaded map, so if
2605it needs a loaded map it has to call C<< ->load >>.
2606
2346=cut 2607=cut
2347 2608
2348our $GOTOGEN; 2609our $GOTOGEN;
2349 2610
2350sub cf::object::player::goto { 2611sub cf::object::player::goto {
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2355 2616
2356 $self->enter_link; 2617 $self->enter_link;
2357 2618
2358 (async { 2619 (async {
2620 $Coro::current->{desc} = "player::goto $path $x $y";
2621
2622 # *tag paths override both path and x|y
2623 if ($path =~ /^\*(.*)$/) {
2624 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2625 my $ob = $obs[rand @obs];
2626
2627 # see if we actually can go there
2628 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2629 $ob = $obs[rand @obs];
2630 } else {
2631 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2632 }
2633 # else put us there anyways for now #d#
2634
2635 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2636 } else {
2637 ($path, $x, $y) = (undef, undef, undef);
2638 }
2639 }
2640
2359 my $map = eval { 2641 my $map = eval {
2360 my $map = cf::map::find $path; 2642 my $map = defined $path ? cf::map::find $path : undef;
2361 2643
2362 if ($map) { 2644 if ($map) {
2363 $map = $map->customise_for ($self); 2645 $map = $map->customise_for ($self);
2364 $map = $check->($map) if $check && $map; 2646 $map = $check->($map) if $check && $map;
2365 } else { 2647 } else {
2366 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2367 } 2649 }
2368 2650
2369 $map 2651 $map
2370 }; 2652 };
2371 2653
2407} 2689}
2408 2690
2409sub prepare_random_map { 2691sub prepare_random_map {
2410 my ($exit) = @_; 2692 my ($exit) = @_;
2411 2693
2412 my $guard = cf::lock_acquire "exit_prepare:$exit";
2413
2414 # all this does is basically replace the /! path by 2694 # all this does is basically replace the /! path by
2415 # a new random map path (?random/...) with a seed 2695 # a new random map path (?random/...) with a seed
2416 # that depends on the exit object 2696 # that depends on the exit object
2417 2697
2418 my $rmp = parse_random_map_params $exit->msg; 2698 my $rmp = parse_random_map_params $exit->msg;
2420 if ($exit->map) { 2700 if ($exit->map) {
2421 $rmp->{region} = $exit->region->name; 2701 $rmp->{region} = $exit->region->name;
2422 $rmp->{origin_map} = $exit->map->path; 2702 $rmp->{origin_map} = $exit->map->path;
2423 $rmp->{origin_x} = $exit->x; 2703 $rmp->{origin_x} = $exit->x;
2424 $rmp->{origin_y} = $exit->y; 2704 $rmp->{origin_y} = $exit->y;
2705
2706 $exit->map->touch;
2425 } 2707 }
2426 2708
2427 $rmp->{random_seed} ||= $exit->random_seed; 2709 $rmp->{random_seed} ||= $exit->random_seed;
2428 2710
2429 my $data = cf::to_json $rmp; 2711 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2430 my $md5 = Digest::MD5::md5_hex $data; 2712 my $md5 = Digest::MD5::md5_hex $data;
2431 my $meta = "$RANDOMDIR/$md5.meta"; 2713 my $meta = "$RANDOMDIR/$md5.meta";
2432 2714
2433 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2715 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2434 aio_write $fh, 0, (length $data), $data, 0; 2716 aio_write $fh, 0, (length $data), $data, 0;
2435 undef $fh; 2717 undef $fh;
2436 aio_rename "$meta~", $meta; 2718 aio_rename "$meta~", $meta;
2437 2719
2720 my $slaying = "?random/$md5";
2721
2722 if ($exit->valid) {
2438 $exit->slaying ("?random/$md5"); 2723 $exit->slaying ("?random/$md5");
2439 $exit->msg (undef); 2724 $exit->msg (undef);
2725 }
2440 } 2726 }
2441} 2727}
2442 2728
2443sub cf::object::player::enter_exit { 2729sub cf::object::player::enter_exit {
2444 my ($self, $exit) = @_; 2730 my ($self, $exit) = @_;
2445 2731
2446 return unless $self->type == cf::PLAYER; 2732 return unless $self->type == cf::PLAYER;
2447 2733
2448 if ($exit->slaying eq "/!") {
2449 #TODO: this should de-fi-ni-te-ly not be a sync-job
2450 # the problem is that $exit might not survive long enough
2451 # so it needs to be done right now, right here
2452 cf::sync_job { prepare_random_map $exit };
2453 }
2454
2455 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2456 my $hp = $exit->stats->hp;
2457 my $sp = $exit->stats->sp;
2458
2459 $self->enter_link; 2734 $self->enter_link;
2460 2735
2461 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED);
2464
2465 (async { 2736 (async {
2466 $self->deactivate_recursive; # just to be sure 2737 $Coro::current->{desc} = "enter_exit";
2738
2467 unless (eval { 2739 unless (eval {
2740 $self->deactivate_recursive; # just to be sure
2741
2742 # random map handling
2743 {
2744 my $guard = cf::lock_acquire "exit_prepare:$exit";
2745
2746 prepare_random_map $exit
2747 if $exit->slaying eq "/!";
2748 }
2749
2750 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2751 my $x = $exit->stats->hp;
2752 my $y = $exit->stats->sp;
2753
2468 $self->goto ($slaying, $hp, $sp); 2754 $self->goto ($map, $x, $y);
2469 2755
2756 # if exit is damned, update players death & WoR home-position
2757 $self->contr->savebed ($map, $x, $y)
2758 if $exit->flag (cf::FLAG_DAMNED);
2759
2470 1; 2760 1
2471 }) { 2761 }) {
2472 $self->message ("Something went wrong deep within the crossfire server. " 2762 $self->message ("Something went wrong deep within the deliantra server. "
2473 . "I'll try to bring you back to the map you were before. " 2763 . "I'll try to bring you back to the map you were before. "
2474 . "Please report this to the dungeon master!", 2764 . "Please report this to the dungeon master!",
2475 cf::NDI_UNIQUE | cf::NDI_RED); 2765 cf::NDI_UNIQUE | cf::NDI_RED);
2476 2766
2477 warn "ERROR in enter_exit: $@"; 2767 warn "ERROR in enter_exit: $@";
2494sub cf::client::send_drawinfo { 2784sub cf::client::send_drawinfo {
2495 my ($self, $text, $flags) = @_; 2785 my ($self, $text, $flags) = @_;
2496 2786
2497 utf8::encode $text; 2787 utf8::encode $text;
2498 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2789}
2790
2791=item $client->send_big_packet ($pkt)
2792
2793Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required.
2795
2796=cut
2797
2798our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2799
2800sub cf::client::send_big_packet {
2801 my ($self, $pkt) = @_;
2802
2803 # try lzf for large packets
2804 $pkt = "lzf " . Compress::LZF::compress $pkt
2805 if 1024 <= length $pkt and $self->{can_lzf};
2806
2807 # split very large packets
2808 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2809 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2810 $pkt = "frag";
2811 }
2812
2813 $self->send_packet ($pkt);
2499} 2814}
2500 2815
2501=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2502 2817
2503Send a drawinfo or msg packet to the client, formatting the msg for the 2818Send a drawinfo or msg packet to the client, formatting the msg for the
2505the message, with C<log> being the default. If C<$color> is negative, suppress 2820the message, with C<log> being the default. If C<$color> is negative, suppress
2506the message unless the client supports the msg packet. 2821the message unless the client supports the msg packet.
2507 2822
2508=cut 2823=cut
2509 2824
2825# non-persistent channels (usually the info channel)
2510our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2511 "c/identify" => { 2833 "c/identify" => {
2512 id => "identify", 2834 id => "infobox",
2513 title => "Identify", 2835 title => "Identify",
2514 reply => undef, 2836 reply => undef,
2515 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
2516 }, 2838 },
2517 "c/examine" => { 2839 "c/examine" => {
2518 id => "examine", 2840 id => "infobox",
2519 title => "Examine", 2841 title => "Examine",
2520 reply => undef, 2842 reply => undef,
2521 tooltip => "Signs and other items you examined", 2843 tooltip => "Signs and other items you examined",
2522 }, 2844 },
2845 "c/shopinfo" => {
2846 id => "infobox",
2847 title => "Shop Info",
2848 reply => undef,
2849 tooltip => "What your bargaining skill tells you about the shop",
2850 },
2851 "c/book" => {
2852 id => "infobox",
2853 title => "Book",
2854 reply => undef,
2855 tooltip => "The contents of a note or book",
2856 },
2857 "c/lookat" => {
2858 id => "infobox",
2859 title => "Look",
2860 reply => undef,
2861 tooltip => "What you saw there",
2862 },
2863 "c/who" => {
2864 id => "infobox",
2865 title => "Players",
2866 reply => undef,
2867 tooltip => "Shows players who are currently online",
2868 },
2869 "c/body" => {
2870 id => "infobox",
2871 title => "Body Parts",
2872 reply => undef,
2873 tooltip => "Shows which body parts you posess and are available",
2874 },
2875 "c/statistics" => {
2876 id => "infobox",
2877 title => "Statistics",
2878 reply => undef,
2879 tooltip => "Shows your primary statistics",
2880 },
2881 "c/skills" => {
2882 id => "infobox",
2883 title => "Skills",
2884 reply => undef,
2885 tooltip => "Shows your experience per skill and item power",
2886 },
2887 "c/shopitems" => {
2888 id => "infobox",
2889 title => "Shop Items",
2890 reply => undef,
2891 tooltip => "Shows the items currently for sale in this shop",
2892 },
2893 "c/resistances" => {
2894 id => "infobox",
2895 title => "Resistances",
2896 reply => undef,
2897 tooltip => "Shows your resistances",
2898 },
2899 "c/pets" => {
2900 id => "infobox",
2901 title => "Pets",
2902 reply => undef,
2903 tooltip => "Shows information abotu your pets/a specific pet",
2904 },
2905 "c/perceiveself" => {
2906 id => "infobox",
2907 title => "Perceive Self",
2908 reply => undef,
2909 tooltip => "You gained detailed knowledge about yourself",
2910 },
2911 "c/uptime" => {
2912 id => "infobox",
2913 title => "Uptime",
2914 reply => undef,
2915 tooltip => "How long the server has been running since last restart",
2916 },
2917 "c/mapinfo" => {
2918 id => "infobox",
2919 title => "Map Info",
2920 reply => undef,
2921 tooltip => "Information related to the maps",
2922 },
2923 "c/party" => {
2924 id => "party",
2925 title => "Party",
2926 reply => "gsay ",
2927 tooltip => "Messages and chat related to your party",
2928 },
2929 "c/death" => {
2930 id => "death",
2931 title => "Death",
2932 reply => undef,
2933 tooltip => "Reason for and more info about your most recent death",
2934 },
2935 "c/say" => $SAY_CHANNEL,
2936 "c/chat" => $CHAT_CHANNEL,
2523); 2937);
2524 2938
2525sub cf::client::send_msg { 2939sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2527 2941
2528 $msg = $self->pl->expand_cfpod ($msg); 2942 $msg = $self->pl->expand_cfpod ($msg)
2943 unless $color & cf::NDI_VERBATIM;
2529 2944
2530 $color &= cf::NDI_CLIENT_MASK; # just in case... 2945 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531 2946
2532 # check predefined channels, for the benefit of C 2947 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2948 if ($CHANNEL{$channel}) {
2949 $channel = $CHANNEL{$channel};
2534 2950
2951 $self->ext_msg (channel_info => $channel);
2952 $channel = $channel->{id};
2953
2535 if (ref $channel) { 2954 } elsif (ref $channel) {
2536 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel); 2958 $self->ext_msg (channel_info => $channel);
2540 } 2959 }
2542 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2543 } 2962 }
2544 2963
2545 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2546 2965
2547 if ($self->can_msg) {
2548 # default colour, mask it out 2966 # default colour, mask it out
2549 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2550 if $color & cf::NDI_DEF; 2968 if $color & cf::NDI_DEF;
2551 2969
2552 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2970 my $pkt = "msg "
2971 . $self->{json_coder}->encode (
2553 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2554 } else { 2973 );
2555 if ($color >= 0) {
2556 # replace some tags by gcfclient-compatible ones
2557 for ($msg) {
2558 1 while
2559 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2560 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2561 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2562 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2563 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2564 }
2565 2974
2566 $color &= cf::NDI_COLOR_MASK; 2975 $self->send_big_packet ($pkt);
2567
2568 utf8::encode $msg;
2569
2570 if (0 && $msg =~ /\[/) {
2571 # COMMAND/INFO
2572 $self->send_packet ("drawextinfo $color 10 8 $msg")
2573 } else {
2574 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2575 $self->send_packet ("drawinfo $color $msg")
2576 }
2577 }
2578 }
2579} 2976}
2580 2977
2581=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2582 2979
2583Sends an ext event to the client. 2980Sends an ext event to the client.
2586 2983
2587sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2588 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2589 2986
2590 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2591 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2592 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2593 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2594 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2595 } 2992 }
2596} 2993}
2597 2994
2598=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2599 2996
2603 3000
2604sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2605 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2606 3003
2607 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2608 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2609 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2610 #TODO: version 1, remove 3007 #TODO: version 1, remove
2611 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2612 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2613 } 3010 }
2614} 3011}
2615 3012
2616=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2617 3014
2756=pod 3153=pod
2757 3154
2758The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
2759 3156
2760 cf::object 3157 cf::object
2761 contr pay_amount pay_player map x y force_find force_add 3158 contr pay_amount pay_player map x y force_find force_add destroy
2762 insert remove name archname title slaying race decrease_ob_nr 3159 insert remove name archname title slaying race decrease split
3160 value
2763 3161
2764 cf::object::player 3162 cf::object::player
2765 player 3163 player
2766 3164
2767 cf::player 3165 cf::player
2772 3170
2773=cut 3171=cut
2774 3172
2775for ( 3173for (
2776 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3174 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2777 insert remove inv name archname title slaying race 3175 insert remove inv nrof name archname title slaying race
2778 decrease_ob_nr)], 3176 decrease split destroy change_exp value msg lore send_msg)],
2779 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
2780 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
2781 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
2782) { 3180) {
2783 no strict 'refs'; 3181 no strict 'refs';
2784 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
2785 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2802 my ($code, %vars) = @_; 3200 my ($code, %vars) = @_;
2803 3201
2804 my $qcode = $code; 3202 my $qcode = $code;
2805 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2806 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3205
3206 %vars = (_dummy => 0) unless %vars;
2807 3207
2808 local $_; 3208 local $_;
2809 local @safe::cf::_safe_eval_args = values %vars; 3209 local @safe::cf::_safe_eval_args = values %vars;
2810 3210
2811 my $eval = 3211 my $eval =
2888 { 3288 {
2889 my $faces = $facedata->{faceinfo}; 3289 my $faces = $facedata->{faceinfo};
2890 3290
2891 while (my ($face, $info) = each %$faces) { 3291 while (my ($face, $info) = each %$faces) {
2892 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3293
2893 cf::face::set_visibility $idx, $info->{visibility}; 3294 cf::face::set_visibility $idx, $info->{visibility};
2894 cf::face::set_magicmap $idx, $info->{magicmap}; 3295 cf::face::set_magicmap $idx, $info->{magicmap};
2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3296 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3297 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2897 3298
2898 cf::cede_to_tick; 3299 cf::cede_to_tick;
2899 } 3300 }
2900 3301
2901 while (my ($face, $info) = each %$faces) { 3302 while (my ($face, $info) = each %$faces) {
2902 next unless $info->{smooth}; 3303 next unless $info->{smooth};
3304
2903 my $idx = cf::face::find $face 3305 my $idx = cf::face::find $face
2904 or next; 3306 or next;
3307
2905 if (my $smooth = cf::face::find $info->{smooth}) { 3308 if (my $smooth = cf::face::find $info->{smooth}) {
2906 cf::face::set_smooth $idx, $smooth; 3309 cf::face::set_smooth $idx, $smooth;
2907 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3310 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2908 } else { 3311 } else {
2909 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3312 warn "smooth face '$info->{smooth}' not found for face '$face'";
2923 3326
2924 cf::anim::invalidate_all; # d'oh 3327 cf::anim::invalidate_all; # d'oh
2925 } 3328 }
2926 3329
2927 { 3330 {
2928 # TODO: for gcfclient pleasure, we should give resources
2929 # that gcfclient doesn't grok a >10000 face index.
2930 my $res = $facedata->{resource}; 3331 my $res = $facedata->{resource};
2931 3332
2932 my $soundconf = delete $res->{"res/sound.conf"};
2933
2934 while (my ($name, $info) = each %$res) { 3333 while (my ($name, $info) = each %$res) {
3334 if (defined $info->{type}) {
2935 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3335 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data;
2937 3336
2938 if ($info->{type} & 1) { 3337 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2939 # prepend meta info 3338 cf::face::set_type $idx, $info->{type};
2940
2941 my $meta = $enc->encode ({
2942 name => $name,
2943 %{ $info->{meta} || {} },
2944 });
2945
2946 $data = pack "(w/a*)*", $meta, $info->{data};
2947 } else { 3339 } else {
2948 $data = $info->{data}; 3340 $RESOURCE{$name} = $info;
2949 } 3341 }
2950 3342
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2952 cf::face::set_type $idx, $info->{type};
2953
2954 cf::cede_to_tick; 3343 cf::cede_to_tick;
2955 } 3344 }
2956
2957 if ($soundconf) {
2958 $soundconf = $enc->decode (delete $soundconf->{data});
2959
2960 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2961 my $sound = $soundconf->{compat}[$_]
2962 or next;
2963
2964 my $face = cf::face::find "sound/$sound->[1]";
2965 cf::sound::set $sound->[0] => $face;
2966 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2967 }
2968
2969 while (my ($k, $v) = each %{$soundconf->{event}}) {
2970 my $face = cf::face::find "sound/$v";
2971 cf::sound::set $k => $face;
2972 }
2973 }
2974 } 3345 }
3346
3347 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2975 3348
2976 1 3349 1
2977} 3350}
3351
3352cf::global->attach (on_resource_update => sub {
3353 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3354 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3355
3356 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3357 my $sound = $soundconf->{compat}[$_]
3358 or next;
3359
3360 my $face = cf::face::find "sound/$sound->[1]";
3361 cf::sound::set $sound->[0] => $face;
3362 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3363 }
3364
3365 while (my ($k, $v) = each %{$soundconf->{event}}) {
3366 my $face = cf::face::find "sound/$v";
3367 cf::sound::set $k => $face;
3368 }
3369 }
3370});
2978 3371
2979register_exticmd fx_want => sub { 3372register_exticmd fx_want => sub {
2980 my ($ns, $want) = @_; 3373 my ($ns, $want) = @_;
2981 3374
2982 while (my ($k, $v) = each %$want) { 3375 while (my ($k, $v) = each %$want) {
2983 $ns->fx_want ($k, $v); 3376 $ns->fx_want ($k, $v);
2984 } 3377 }
2985}; 3378};
3379
3380sub load_resource_file($) {
3381 my $guard = lock_acquire "load_resource_file";
3382
3383 my $status = load_resource_file_ $_[0];
3384 get_slot 0.1, 100;
3385 cf::arch::commit_load;
3386
3387 $status
3388}
2986 3389
2987sub reload_regions { 3390sub reload_regions {
2988 # HACK to clear player env face cache, we need some signal framework 3391 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?) 3392 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3004} 3407}
3005 3408
3006sub reload_archetypes { 3409sub reload_archetypes {
3007 load_resource_file "$DATADIR/archetypes" 3410 load_resource_file "$DATADIR/archetypes"
3008 or die "unable to load archetypes\n"; 3411 or die "unable to load archetypes\n";
3009 #d# NEED to laod twice to resolve forward references
3010 # this really needs to be done in an extra post-pass
3011 # (which needs to be synchronous, so solve it differently)
3012 load_resource_file "$DATADIR/archetypes"
3013 or die "unable to load archetypes\n";
3014} 3412}
3015 3413
3016sub reload_treasures { 3414sub reload_treasures {
3017 load_resource_file "$DATADIR/treasures" 3415 load_resource_file "$DATADIR/treasures"
3018 or die "unable to load treasurelists\n"; 3416 or die "unable to load treasurelists\n";
3019} 3417}
3020 3418
3021sub reload_resources { 3419sub reload_resources {
3022 warn "reloading resource files...\n"; 3420 warn "reloading resource files...\n";
3023 3421
3422 reload_facedata;
3423 reload_archetypes;
3024 reload_regions; 3424 reload_regions;
3025 reload_facedata;
3026 #reload_archetypes;#d#
3027 reload_archetypes;
3028 reload_treasures; 3425 reload_treasures;
3029 3426
3030 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
3031} 3428}
3032 3429
3033sub init {
3034 reload_resources;
3035}
3036
3037sub reload_config { 3430sub reload_config {
3431 warn "reloading config file...\n";
3432
3038 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
3039 or return; 3434 or return;
3040 3435
3041 local $/; 3436 local $/;
3042 *CFG = YAML::Syck::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
3043 3438
3044 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3045 3440
3046 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3047 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3051 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3052 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
3053 }; 3448 };
3054 warn $@ if $@; 3449 warn $@ if $@;
3055 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3453}
3454
3455sub pidfile() {
3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457 or die "$PIDFILE: $!";
3458 flock $fh, &Fcntl::LOCK_EX
3459 or die "$PIDFILE: flock: $!";
3460 $fh
3461}
3462
3463# make sure only one server instance is running at any one time
3464sub atomic {
3465 my $fh = pidfile;
3466
3467 my $pid = <$fh>;
3468 kill 9, $pid if $pid > 0;
3469
3470 seek $fh, 0, 0;
3471 print $fh $$;
3472}
3473
3474sub main_loop {
3475 warn "EV::loop starting\n";
3476 if (1) {
3477 EV::loop;
3478 }
3479 warn "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP;
3056} 3481}
3057 3482
3058sub main { 3483sub main {
3484 cf::init_globals; # initialise logging
3485
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497
3059 # we must not ever block the main coroutine 3498 # we must not ever block the main coroutine
3060 local $Coro::idle = sub { 3499 local $Coro::idle = sub {
3061 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3500 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3062 (async { 3501 (async {
3063 Event::one_event; 3502 $Coro::current->{desc} = "IDLE BUG HANDLER";
3503 EV::loop EV::LOOP_ONESHOT;
3064 })->prio (Coro::PRIO_MAX); 3504 })->prio (Coro::PRIO_MAX);
3065 }; 3505 };
3066 3506
3507 evthread_start IO::AIO::poll_fileno;
3508
3509 cf::sync_job {
3510 cf::load_settings;
3511 cf::load_materials;
3512
3513 reload_resources;
3067 reload_config; 3514 reload_config;
3068 db_init; 3515 db_init;
3516
3517 cf::init_uuid;
3518 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills;
3521
3522 cf::init_beforeplay;
3523
3524 atomic;
3525
3069 load_extensions; 3526 load_extensions;
3070 3527
3071 $TICK_WATCHER->start; 3528 utime time, time, $RUNTIMEFILE;
3072 Event::loop; 3529
3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533
3534 (pop @POST_INIT)->(0) while @POST_INIT;
3535 };
3536
3537 main_loop;
3073} 3538}
3074 3539
3075############################################################################# 3540#############################################################################
3076# initialisation and cleanup 3541# initialisation and cleanup
3077 3542
3078# install some emergency cleanup handlers 3543# install some emergency cleanup handlers
3079BEGIN { 3544BEGIN {
3545 our %SIGWATCHER = ();
3080 for my $signal (qw(INT HUP TERM)) { 3546 for my $signal (qw(INT HUP TERM)) {
3081 Event->signal ( 3547 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3082 reentrant => 0,
3083 data => WF_AUTOCANCEL,
3084 signal => $signal,
3085 prio => 0,
3086 cb => sub {
3087 cf::cleanup "SIG$signal"; 3548 cf::cleanup "SIG$signal";
3088 },
3089 ); 3549 };
3090 } 3550 }
3091} 3551}
3092 3552
3093sub write_runtime { 3553sub write_runtime_sync {
3094 my $runtime = "$LOCALDIR/runtime";
3095
3096 # first touch the runtime file to show we are still running: 3554 # first touch the runtime file to show we are still running:
3097 # the fsync below can take a very very long time. 3555 # the fsync below can take a very very long time.
3098 3556
3099 IO::AIO::aio_utime $runtime, undef, undef; 3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3100 3558
3101 my $guard = cf::lock_acquire "write_runtime"; 3559 my $guard = cf::lock_acquire "write_runtime";
3102 3560
3103 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3104 or return; 3562 or return;
3105 3563
3106 my $value = $cf::RUNTIME + 90 + 10; 3564 my $value = $cf::RUNTIME + 90 + 10;
3107 # 10 is the runtime save interval, for a monotonic clock 3565 # 10 is the runtime save interval, for a monotonic clock
3108 # 60 allows for the watchdog to kill the server. 3566 # 60 allows for the watchdog to kill the server.
3118 aio_utime $fh, undef, undef; 3576 aio_utime $fh, undef, undef;
3119 3577
3120 close $fh 3578 close $fh
3121 or return; 3579 or return;
3122 3580
3123 aio_rename "$runtime~", $runtime 3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3124 and return; 3582 and return;
3125 3583
3126 warn "runtime file written.\n"; 3584 warn "runtime file written.\n";
3127 3585
3128 1 3586 1
3587}
3588
3589our $uuid_lock;
3590our $uuid_skip;
3591
3592sub write_uuid_sync($) {
3593 $uuid_skip ||= $_[0];
3594
3595 return if $uuid_lock;
3596 local $uuid_lock = 1;
3597
3598 my $uuid = "$LOCALDIR/uuid";
3599
3600 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3601 or return;
3602
3603 my $value = uuid_seq uuid_cur;
3604
3605 unless ($value) {
3606 warn "cowardly refusing to write zero uuid value!\n";
3607 return;
3608 }
3609
3610 my $value = uuid_str $value + $uuid_skip;
3611 $uuid_skip = 0;
3612
3613 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3614 and return;
3615
3616 # always fsync - this file is important
3617 aio_fsync $fh
3618 and return;
3619
3620 close $fh
3621 or return;
3622
3623 aio_rename "$uuid~", $uuid
3624 and return;
3625
3626 warn "uuid file written ($value).\n";
3627
3628 1
3629
3630}
3631
3632sub write_uuid($$) {
3633 my ($skip, $sync) = @_;
3634
3635 $sync ? write_uuid_sync $skip
3636 : async { write_uuid_sync $skip };
3129} 3637}
3130 3638
3131sub emergency_save() { 3639sub emergency_save() {
3132 my $freeze_guard = cf::freeze_mainloop; 3640 my $freeze_guard = cf::freeze_mainloop;
3133 3641
3134 warn "enter emergency perl save\n"; 3642 warn "emergency_perl_save: enter\n";
3135 3643
3136 cf::sync_job { 3644 cf::sync_job {
3645 # this is a trade-off: we want to be very quick here, so
3646 # save all maps without fsync, and later call a global sync
3647 # (which in turn might be very very slow)
3648 local $USE_FSYNC = 0;
3649
3137 # use a peculiar iteration method to avoid tripping on perl 3650 # use a peculiar iteration method to avoid tripping on perl
3138 # refcount bugs in for. also avoids problems with players 3651 # refcount bugs in for. also avoids problems with players
3139 # and maps saved/destroyed asynchronously. 3652 # and maps saved/destroyed asynchronously.
3140 warn "begin emergency player save\n"; 3653 warn "emergency_perl_save: begin player save\n";
3141 for my $login (keys %cf::PLAYER) { 3654 for my $login (keys %cf::PLAYER) {
3142 my $pl = $cf::PLAYER{$login} or next; 3655 my $pl = $cf::PLAYER{$login} or next;
3143 $pl->valid or next; 3656 $pl->valid or next;
3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3144 $pl->save; 3658 $pl->save;
3145 } 3659 }
3146 warn "end emergency player save\n"; 3660 warn "emergency_perl_save: end player save\n";
3147 3661
3148 warn "begin emergency map save\n"; 3662 warn "emergency_perl_save: begin map save\n";
3149 for my $path (keys %cf::MAP) { 3663 for my $path (keys %cf::MAP) {
3150 my $map = $cf::MAP{$path} or next; 3664 my $map = $cf::MAP{$path} or next;
3151 $map->valid or next; 3665 $map->valid or next;
3152 $map->save; 3666 $map->save;
3153 } 3667 }
3154 warn "end emergency map save\n"; 3668 warn "emergency_perl_save: end map save\n";
3155 3669
3156 warn "begin emergency database checkpoint\n"; 3670 warn "emergency_perl_save: begin database checkpoint\n";
3157 BDB::db_env_txn_checkpoint $DB_ENV; 3671 BDB::db_env_txn_checkpoint $DB_ENV;
3158 warn "end emergency database checkpoint\n"; 3672 warn "emergency_perl_save: end database checkpoint\n";
3673
3674 warn "emergency_perl_save: begin write uuid\n";
3675 write_uuid_sync 1;
3676 warn "emergency_perl_save: end write uuid\n";
3159 }; 3677 };
3160 3678
3679 warn "emergency_perl_save: starting sync()\n";
3680 IO::AIO::aio_sync sub {
3681 warn "emergency_perl_save: finished sync()\n";
3682 };
3683
3161 warn "leave emergency perl save\n"; 3684 warn "emergency_perl_save: leave\n";
3162} 3685}
3163 3686
3164sub post_cleanup { 3687sub post_cleanup {
3165 my ($make_core) = @_; 3688 my ($make_core) = @_;
3166 3689
3167 warn Carp::longmess "post_cleanup backtrace" 3690 warn Carp::longmess "post_cleanup backtrace"
3168 if $make_core; 3691 if $make_core;
3692
3693 my $fh = pidfile;
3694 unlink $PIDFILE if <$fh> == $$;
3695}
3696
3697# a safer delete_package, copied from Symbol
3698sub clear_package($) {
3699 my $pkg = shift;
3700
3701 # expand to full symbol table name if needed
3702 unless ($pkg =~ /^main::.*::$/) {
3703 $pkg = "main$pkg" if $pkg =~ /^::/;
3704 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3705 $pkg .= '::' unless $pkg =~ /::$/;
3706 }
3707
3708 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3709 my $stem_symtab = *{$stem}{HASH};
3710
3711 defined $stem_symtab and exists $stem_symtab->{$leaf}
3712 or return;
3713
3714 # clear all symbols
3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716 for my $name (keys %$leaf_symtab) {
3717 _gv_clear *{"$pkg$name"};
3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719 }
3720 warn "cleared package $pkg\n";#d#
3169} 3721}
3170 3722
3171sub do_reload_perl() { 3723sub do_reload_perl() {
3172 # can/must only be called in main 3724 # can/must only be called in main
3173 if ($Coro::current != $Coro::main) { 3725 if ($Coro::current != $Coro::main) {
3174 warn "can only reload from main coroutine"; 3726 warn "can only reload from main coroutine";
3175 return; 3727 return;
3176 } 3728 }
3177 3729
3730 return if $RELOAD++;
3731
3732 my $t1 = EV::time;
3733
3734 while ($RELOAD) {
3178 warn "reloading..."; 3735 warn "reloading...";
3179 3736
3180 warn "entering sync_job"; 3737 warn "entering sync_job";
3181 3738
3182 cf::sync_job { 3739 cf::sync_job {
3183 cf::write_runtime; # external watchdog should not bark 3740 cf::write_runtime_sync; # external watchdog should not bark
3184 cf::emergency_save; 3741 cf::emergency_save;
3185 cf::write_runtime; # external watchdog should not bark 3742 cf::write_runtime_sync; # external watchdog should not bark
3186 3743
3187 warn "syncing database to disk"; 3744 warn "syncing database to disk";
3188 BDB::db_env_txn_checkpoint $DB_ENV; 3745 BDB::db_env_txn_checkpoint $DB_ENV;
3189 3746
3190 # if anything goes wrong in here, we should simply crash as we already saved 3747 # if anything goes wrong in here, we should simply crash as we already saved
3191 3748
3192 warn "cancelling all WF_AUTOCANCEL watchers";
3193 for (Event::all_watchers) {
3194 $_->cancel if $_->data & WF_AUTOCANCEL;
3195 }
3196
3197 warn "flushing outstanding aio requests"; 3749 warn "flushing outstanding aio requests";
3198 for (;;) {
3199 BDB::flush;
3200 IO::AIO::flush;
3201 Coro::cede;
3202 last unless IO::AIO::nreqs || BDB::nreqs; 3750 while (IO::AIO::nreqs || BDB::nreqs) {
3203 warn "iterate..."; 3751 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3204 }
3205
3206 ++$RELOAD;
3207
3208 warn "cancelling all extension coros";
3209 $_->cancel for values %EXT_CORO;
3210 %EXT_CORO = ();
3211
3212 warn "removing commands";
3213 %COMMAND = ();
3214
3215 warn "removing ext/exti commands";
3216 %EXTCMD = ();
3217 %EXTICMD = ();
3218
3219 warn "unloading/nuking all extensions";
3220 for my $pkg (@EXTS) {
3221 warn "... unloading $pkg";
3222
3223 if (my $cb = $pkg->can ("unload")) {
3224 eval {
3225 $cb->($pkg);
3226 1
3227 } or warn "$pkg unloaded, but with errors: $@";
3228 } 3752 }
3229 3753
3230 warn "... nuking $pkg"; 3754 warn "cancelling all extension coros";
3231 Symbol::delete_package $pkg; 3755 $_->cancel for values %EXT_CORO;
3232 } 3756 %EXT_CORO = ();
3233 3757
3234 warn "unloading all perl modules loaded from $LIBDIR"; 3758 warn "removing commands";
3235 while (my ($k, $v) = each %INC) { 3759 %COMMAND = ();
3236 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3237 3760
3761 warn "removing ext/exti commands";
3762 %EXTCMD = ();
3763 %EXTICMD = ();
3764
3765 warn "unloading/nuking all extensions";
3766 for my $pkg (@EXTS) {
3238 warn "... unloading $k"; 3767 warn "... unloading $pkg";
3239 delete $INC{$k};
3240 3768
3241 $k =~ s/\.pm$//;
3242 $k =~ s/\//::/g;
3243
3244 if (my $cb = $k->can ("unload_module")) { 3769 if (my $cb = $pkg->can ("unload")) {
3770 eval {
3245 $cb->(); 3771 $cb->($pkg);
3772 1
3773 } or warn "$pkg unloaded, but with errors: $@";
3774 }
3775
3776 warn "... clearing $pkg";
3777 clear_package $pkg;
3246 } 3778 }
3247 3779
3248 Symbol::delete_package $k; 3780 warn "unloading all perl modules loaded from $LIBDIR";
3781 while (my ($k, $v) = each %INC) {
3782 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3783
3784 warn "... unloading $k";
3785 delete $INC{$k};
3786
3787 $k =~ s/\.pm$//;
3788 $k =~ s/\//::/g;
3789
3790 if (my $cb = $k->can ("unload_module")) {
3791 $cb->();
3792 }
3793
3794 clear_package $k;
3249 } 3795 }
3250 3796
3251 warn "getting rid of safe::, as good as possible"; 3797 warn "getting rid of safe::, as good as possible";
3252 Symbol::delete_package "safe::$_" 3798 clear_package "safe::$_"
3253 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3254 3800
3255 warn "unloading cf.pm \"a bit\""; 3801 warn "unloading cf.pm \"a bit\"";
3256 delete $INC{"cf.pm"}; 3802 delete $INC{"cf.pm"};
3257 delete $INC{"cf/pod.pm"}; 3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3258 3804
3259 # don't, removes xs symbols, too, 3805 # don't, removes xs symbols, too,
3260 # and global variables created in xs 3806 # and global variables created in xs
3261 #Symbol::delete_package __PACKAGE__; 3807 #clear_package __PACKAGE__;
3262 3808
3263 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
3264 3810
3265 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
3266 require cf; 3812 require cf;
3267 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
3268 3814
3269 warn "loading config and database again"; 3815 warn "loading config and database again";
3270 cf::reload_config; 3816 cf::reload_config;
3271 3817
3272 warn "loading extensions"; 3818 warn "loading extensions";
3273 cf::load_extensions; 3819 cf::load_extensions;
3274 3820
3821 if ($REATTACH_ON_RELOAD) {
3275 warn "reattaching attachments to objects/players"; 3822 warn "reattaching attachments to objects/players";
3276 _global_reattach; # objects, sockets 3823 _global_reattach; # objects, sockets
3277 warn "reattaching attachments to maps"; 3824 warn "reattaching attachments to maps";
3278 reattach $_ for values %MAP; 3825 reattach $_ for values %MAP;
3279 warn "reattaching attachments to players"; 3826 warn "reattaching attachments to players";
3280 reattach $_ for values %PLAYER; 3827 reattach $_ for values %PLAYER;
3828 }
3281 3829
3830 warn "running post_init jobs";
3831 (pop @POST_INIT)->(1) while @POST_INIT;
3832
3282 warn "leaving sync_job"; 3833 warn "leaving sync_job";
3283 3834
3284 1 3835 1
3285 } or do { 3836 } or do {
3286 warn $@; 3837 warn $@;
3287 warn "error while reloading, exiting."; 3838 cf::cleanup "error while reloading, exiting.";
3288 exit 1;
3289 }; 3839 };
3290 3840
3291 warn "reloaded"; 3841 warn "reloaded";
3842 --$RELOAD;
3843 }
3844
3845 $t1 = EV::time - $t1;
3846 warn "reload completed in ${t1}s\n";
3292}; 3847};
3293 3848
3294our $RELOAD_WATCHER; # used only during reload 3849our $RELOAD_WATCHER; # used only during reload
3295 3850
3296sub reload_perl() { 3851sub reload_perl() {
3297 # doing reload synchronously and two reloads happen back-to-back, 3852 # doing reload synchronously and two reloads happen back-to-back,
3298 # coro crashes during coro_state_free->destroy here. 3853 # coro crashes during coro_state_free->destroy here.
3299 3854
3300 $RELOAD_WATCHER ||= Event->timer ( 3855 $RELOAD_WATCHER ||= cf::async {
3301 reentrant => 0, 3856 Coro::AIO::aio_wait cache_extensions;
3302 after => 0, 3857
3303 data => WF_AUTOCANCEL, 3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3304 cb => sub {
3305 do_reload_perl; 3859 do_reload_perl;
3306 undef $RELOAD_WATCHER; 3860 undef $RELOAD_WATCHER;
3307 }, 3861 };
3308 ); 3862 };
3309} 3863}
3310 3864
3311register_command "reload" => sub { 3865register_command "reload" => sub {
3312 my ($who, $arg) = @_; 3866 my ($who, $arg) = @_;
3313 3867
3314 if ($who->flag (FLAG_WIZ)) { 3868 if ($who->flag (FLAG_WIZ)) {
3315 $who->message ("reloading server."); 3869 $who->message ("reloading server.");
3870 async {
3871 $Coro::current->{desc} = "perl_reload";
3316 async { reload_perl }; 3872 reload_perl;
3873 };
3317 } 3874 }
3318}; 3875};
3319 3876
3320unshift @INC, $LIBDIR; 3877unshift @INC, $LIBDIR;
3321 3878
3323 3880
3324our @WAIT_FOR_TICK; 3881our @WAIT_FOR_TICK;
3325our @WAIT_FOR_TICK_BEGIN; 3882our @WAIT_FOR_TICK_BEGIN;
3326 3883
3327sub wait_for_tick { 3884sub wait_for_tick {
3328 return unless $TICK_WATCHER->is_active;
3329 return if $Coro::current == $Coro::main; 3885 return if tick_inhibit || $Coro::current == $Coro::main;
3330 3886
3331 my $signal = new Coro::Signal; 3887 my $signal = new Coro::Signal;
3332 push @WAIT_FOR_TICK, $signal; 3888 push @WAIT_FOR_TICK, $signal;
3333 $signal->wait; 3889 $signal->wait;
3334} 3890}
3335 3891
3336sub wait_for_tick_begin { 3892sub wait_for_tick_begin {
3337 return unless $TICK_WATCHER->is_active;
3338 return if $Coro::current == $Coro::main; 3893 return if tick_inhibit || $Coro::current == $Coro::main;
3339 3894
3340 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3341 push @WAIT_FOR_TICK_BEGIN, $signal; 3896 push @WAIT_FOR_TICK_BEGIN, $signal;
3342 $signal->wait; 3897 $signal->wait;
3343} 3898}
3344 3899
3345 my $min = 1e6;#d# 3900sub tick {
3346 my $avg = 10;
3347$TICK_WATCHER = Event->timer (
3348 reentrant => 0,
3349 parked => 1,
3350 prio => 0,
3351 at => $NEXT_TICK || $TICK,
3352 data => WF_AUTOCANCEL,
3353 cb => sub {
3354 if ($Coro::current != $Coro::main) { 3901 if ($Coro::current != $Coro::main) {
3355 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3902 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3356 unless ++$bug_warning > 10; 3903 unless ++$bug_warning > 10;
3357 return; 3904 return;
3358 } 3905 }
3359 3906
3360 $NOW = $tick_start = Event::time;
3361
3362 cf::server_tick; # one server iteration 3907 cf::server_tick; # one server iteration
3363 3908
3364 0 && sync_job {#d# 3909 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3365 for(1..10) { 3910 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3366 my $t = Event::time; 3911 Coro::async_pool {
3367 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3912 $Coro::current->{desc} = "runtime saver";
3368 or die; 3913 write_runtime_sync
3369 3914 or warn "ERROR: unable to write runtime file: $!";
3370 $map->width (50);
3371 $map->height (50);
3372 $map->alloc;
3373 $map->_load_objects ("/tmp/x.map", 1);
3374 my $t = Event::time - $t;
3375
3376 #next unless $t < 0.0013;#d#
3377 if ($t < $min) {
3378 $min = $t;
3379 }
3380 $avg = $avg * 0.99 + $t * 0.01;
3381 }
3382 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3383 exit 0;
3384 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3385 }; 3915 };
3916 }
3386 3917
3387 $RUNTIME += $TICK;
3388 $NEXT_TICK += $TICK;
3389
3390 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3391 $NEXT_RUNTIME_WRITE = $NOW + 10;
3392 Coro::async_pool {
3393 write_runtime
3394 or warn "ERROR: unable to write runtime file: $!";
3395 };
3396 }
3397
3398# my $AFTER = Event::time;
3399# warn $AFTER - $NOW;#d#
3400
3401 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3918 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3402 $sig->send; 3919 $sig->send;
3403 } 3920 }
3404 while (my $sig = shift @WAIT_FOR_TICK) { 3921 while (my $sig = shift @WAIT_FOR_TICK) {
3405 $sig->send; 3922 $sig->send;
3406 } 3923 }
3407 3924
3408 $NOW = Event::time; 3925 $LOAD = ($NOW - $TICK_START) / $TICK;
3409
3410 # if we are delayed by four ticks or more, skip them all
3411 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3412
3413 $TICK_WATCHER->at ($NEXT_TICK);
3414 $TICK_WATCHER->start;
3415
3416 $LOAD = ($NOW - $tick_start) / $TICK;
3417 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3926 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3418 3927
3419 _post_tick; 3928 if (0) {
3420 3929 if ($NEXT_TICK) {
3421 3930 my $jitter = $TICK_START - $NEXT_TICK;
3931 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3932 warn "jitter $JITTER\n";#d#
3933 }
3422 }, 3934 }
3423); 3935}
3424 3936
3425{ 3937{
3426 BDB::max_poll_time $TICK * 0.1; 3938 # configure BDB
3427 $BDB_POLL_WATCHER = Event->io ( 3939
3428 reentrant => 0,
3429 fd => BDB::poll_fileno,
3430 poll => 'r',
3431 prio => 0,
3432 data => WF_AUTOCANCEL,
3433 cb => \&BDB::poll_cb,
3434 );
3435 BDB::min_parallel 8; 3940 BDB::min_parallel 8;
3436 3941 BDB::max_poll_reqs $TICK * 0.1;
3437 BDB::set_sync_prepare { 3942 $AnyEvent::BDB::WATCHER->priority (1);
3438 my $status;
3439 my $current = $Coro::current;
3440 (
3441 sub {
3442 $status = $!;
3443 $current->ready; undef $current;
3444 },
3445 sub {
3446 Coro::schedule while defined $current;
3447 $! = $status;
3448 },
3449 )
3450 };
3451 3943
3452 unless ($DB_ENV) { 3944 unless ($DB_ENV) {
3453 $DB_ENV = BDB::db_env_create; 3945 $DB_ENV = BDB::db_env_create;
3946 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3947 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3948 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3949 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3950 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3454 3951
3455 cf::sync_job { 3952 cf::sync_job {
3456 eval { 3953 eval {
3457 BDB::db_env_open 3954 BDB::db_env_open
3458 $DB_ENV, 3955 $DB_ENV,
3460 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3957 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3461 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3958 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3462 0666; 3959 0666;
3463 3960
3464 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3961 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3465
3466 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3467 $DB_ENV->set_lk_detect;
3468 }; 3962 };
3469 3963
3470 cf::cleanup "db_env_open(db): $@" if $@; 3964 cf::cleanup "db_env_open(db): $@" if $@;
3471 }; 3965 };
3472 } 3966 }
3967
3968 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3969 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3970 };
3971 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3972 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3973 };
3974 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3975 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3976 };
3473} 3977}
3474 3978
3475{ 3979{
3980 # configure IO::AIO
3981
3476 IO::AIO::min_parallel 8; 3982 IO::AIO::min_parallel 8;
3477
3478 undef $Coro::AIO::WATCHER;
3479 IO::AIO::max_poll_time $TICK * 0.1; 3983 IO::AIO::max_poll_time $TICK * 0.1;
3480 $AIO_POLL_WATCHER = Event->io ( 3984 undef $AnyEvent::AIO::WATCHER;
3481 reentrant => 0,
3482 data => WF_AUTOCANCEL,
3483 fd => IO::AIO::poll_fileno,
3484 poll => 'r',
3485 prio => 6,
3486 cb => \&IO::AIO::poll_cb,
3487 );
3488} 3985}
3489 3986
3490my $_log_backtrace; 3987my $_log_backtrace;
3491 3988
3492sub _log_backtrace { 3989sub _log_backtrace {
3495 $msg =~ s/\n//; 3992 $msg =~ s/\n//;
3496 3993
3497 # limit the # of concurrent backtraces 3994 # limit the # of concurrent backtraces
3498 if ($_log_backtrace < 2) { 3995 if ($_log_backtrace < 2) {
3499 ++$_log_backtrace; 3996 ++$_log_backtrace;
3997 my $perl_bt = Carp::longmess $msg;
3500 async { 3998 async {
3999 $Coro::current->{desc} = "abt $msg";
4000
3501 my @bt = fork_call { 4001 my @bt = fork_call {
3502 @addr = map { sprintf "%x", $_ } @addr; 4002 @addr = map { sprintf "%x", $_ } @addr;
3503 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4003 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3504 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4004 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3505 or die "addr2line: $!"; 4005 or die "addr2line: $!";
3513 } 4013 }
3514 4014
3515 @funcs 4015 @funcs
3516 }; 4016 };
3517 4017
3518 LOG llevInfo, "[ABT] $msg\n"; 4018 LOG llevInfo, "[ABT] $perl_bt\n";
4019 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3519 LOG llevInfo, "[ABT] $_\n" for @bt; 4020 LOG llevInfo, "[ABT] $_\n" for @bt;
3520 --$_log_backtrace; 4021 --$_log_backtrace;
3521 }; 4022 };
3522 } else { 4023 } else {
3523 LOG llevInfo, "[ABT] $msg\n"; 4024 LOG llevInfo, "[ABT] $msg\n";
3524 LOG llevInfo, "[ABT] [suppressed]\n"; 4025 LOG llevInfo, "[ABT] [suppressed]\n";
3525 } 4026 }
3526} 4027}
3527 4028
3528# load additional modules 4029# load additional modules
3529use cf::pod; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3530 4032
3531END { cf::emergency_save } 4033END { cf::emergency_save }
3532 4034
35331 40351
3534 4036

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines