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

Diff Legend

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