ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.352 by root, Sun Sep 2 04:57:14 2007 UTC vs.
Revision 1.494 by root, Mon Oct 26 05:18:00 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/(?<![BIUGHT])</&lt;/g;
1469
1470 # this is buggy, it needs to properly take care of nested <'s
1471
1472 1 while
1473 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1478 # replace G<male|female> tags
1479 || s{G<([^>|]*)\|([^>]*)>}{
1480 $self->gender ? $2 : $1
1481 }ge
1482 # replace H<hint text>
1483 || s{H<([^\>]*)>}
1484 {
1485 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "")
1488 [$self->{hintmode}]
1489 }ge;
1490
1491 # create single paragraphs (very hackish)
1492 s/(?<=\S)\n(?=\w)/ /g;
1493
1494 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines
1499
1500 $_
1501}
1502
1503sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode}
1506}
1507 1677
1508=item $player->ext_reply ($msgid, @msg) 1678=item $player->ext_reply ($msgid, @msg)
1509 1679
1510Sends an ext reply to the player. 1680Sends an ext reply to the player.
1511 1681
1578our $MAX_RESET = 3600; 1748our $MAX_RESET = 3600;
1579our $DEFAULT_RESET = 3000; 1749our $DEFAULT_RESET = 3000;
1580 1750
1581sub generate_random_map { 1751sub generate_random_map {
1582 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
1583 # mit "rum" bekleckern, nicht 1756 # mit "rum" bekleckern, nicht
1584 $self->_create_random_map ( 1757 $self->_create_random_map (
1585 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1586 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1587 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1709 1882
1710# the temporary/swap location 1883# the temporary/swap location
1711sub save_path { 1884sub save_path {
1712 my ($self) = @_; 1885 my ($self) = @_;
1713 1886
1714 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1887 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1715 "$TMPDIR/$path.map" 1888 "$TMPDIR/$path.map"
1716} 1889}
1717 1890
1718# the unique path, undef == no special unique path 1891# the unique path, undef == no special unique path
1719sub uniq_path { 1892sub uniq_path {
1720 my ($self) = @_; 1893 my ($self) = @_;
1721 1894
1722 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1723 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1724}
1725
1726# and all this just because we cannot iterate over
1727# all maps in C++...
1728sub change_all_map_light {
1729 my ($change) = @_;
1730
1731 $_->change_map_light ($change)
1732 for grep $_->outdoor, values %cf::MAP;
1733} 1897}
1734 1898
1735sub decay_objects { 1899sub decay_objects {
1736 my ($self) = @_; 1900 my ($self) = @_;
1737 1901
1750 1914
1751sub load_header_from($) { 1915sub load_header_from($) {
1752 my ($self, $path) = @_; 1916 my ($self, $path) = @_;
1753 1917
1754 utf8::encode $path; 1918 utf8::encode $path;
1755 #aio_open $path, O_RDONLY, 0 1919 my $f = new_from_file cf::object::thawer $path
1756 # or return;
1757
1758 $self->_load_header ($path)
1759 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;
1760 1927
1761 $self->{load_path} = $path; 1928 $self->{load_path} = $path;
1762 1929
1763 1 1930 1
1764} 1931}
1818sub find { 1985sub find {
1819 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
1820 1987
1821 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
1822 1989
1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1823 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
1824 1992
1825 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
1826 my $guard = cf::lock_acquire "map_find:$path";
1827 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
1828 or return; 1995 or return;
1829 1996
1830 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
1831 1998
1833 or return; 2000 or return;
1834 2001
1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2002 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1836 # doing this can freeze the server in a sync job, obviously 2003 # doing this can freeze the server in a sync job, obviously
1837 #$cf::WAIT_FOR_TICK->wait; 2004 #$cf::WAIT_FOR_TICK->wait;
2005 undef $guard2;
2006 undef $guard1;
1838 $map->reset; 2007 $map->reset;
1839 undef $guard;
1840 return find $path; 2008 return find $path;
1841 } 2009 }
1842 2010
1843 $cf::MAP{$path} = $map 2011 $cf::MAP{$path} = $map
1844 } 2012 }
1853 local $self->{deny_reset} = 1; # loading can take a long time 2021 local $self->{deny_reset} = 1; # loading can take a long time
1854 2022
1855 my $path = $self->{path}; 2023 my $path = $self->{path};
1856 2024
1857 { 2025 {
1858 my $guard1 = cf::lock_acquire "map_data:$path"; 2026 my $guard = cf::lock_acquire "map_data:$path";
1859 my $guard2 = cf::lock_acquire "map_load:$path";
1860 2027
2028 return unless $self->valid;
1861 return if $self->in_memory != cf::MAP_SWAPPED; 2029 return unless $self->in_memory == cf::MAP_SWAPPED;
1862 2030
1863 $self->in_memory (cf::MAP_LOADING); 2031 $self->in_memory (cf::MAP_LOADING);
1864 2032
1865 $self->alloc; 2033 $self->alloc;
1866 2034
1867 $self->pre_load; 2035 $self->pre_load;
1868 cf::cede_to_tick; 2036 cf::cede_to_tick;
1869 2037
2038 my $f = new_from_file cf::object::thawer $self->{load_path};
2039 $f->skip_block;
1870 $self->_load_objects ($self->{load_path}, 1) 2040 $self->_load_objects ($f)
1871 or return; 2041 or return;
1872 2042
1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2043 $self->post_load_original
1874 if delete $self->{load_original}; 2044 if delete $self->{load_original};
1875 2045
1876 if (my $uniq = $self->uniq_path) { 2046 if (my $uniq = $self->uniq_path) {
1877 utf8::encode $uniq; 2047 utf8::encode $uniq;
1878 if (aio_open $uniq, O_RDONLY, 0) { 2048 unless (aio_stat $uniq) {
2049 if (my $f = new_from_file cf::object::thawer $uniq) {
1879 $self->clear_unique_items; 2050 $self->clear_unique_items;
1880 $self->_load_objects ($uniq, 0); 2051 $self->_load_objects ($f);
2052 $f->resolve_delayed_derefs;
2053 }
1881 } 2054 }
1882 } 2055 }
2056
2057 $f->resolve_delayed_derefs;
1883 2058
1884 cf::cede_to_tick; 2059 cf::cede_to_tick;
1885 # now do the right thing for maps 2060 # now do the right thing for maps
1886 $self->link_multipart_objects; 2061 $self->link_multipart_objects;
1887 $self->difficulty ($self->estimate_difficulty) 2062 $self->difficulty ($self->estimate_difficulty)
1891 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
1892 $self->decay_objects; 2067 $self->decay_objects;
1893 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
1894 $self->update_buttons; 2069 $self->update_buttons;
1895 cf::cede_to_tick; 2070 cf::cede_to_tick;
1896 $self->set_darkness_map;
1897 cf::cede_to_tick;
1898 $self->activate; 2071 $self->activate;
1899 } 2072 }
1900 2073
1901 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
1903 2076
1904 $self->in_memory (cf::MAP_IN_MEMORY); 2077 $self->in_memory (cf::MAP_ACTIVE);
1905 } 2078 }
1906 2079
1907 $self->post_load; 2080 $self->post_load;
1908} 2081}
1909 2082
1967 my ($path, $origin, $load) = @_; 2140 my ($path, $origin, $load) = @_;
1968 2141
1969 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
1970 2143
1971 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1973 } 2146 }
1974 2147
1975 $MAP_PREFETCH{$path} |= $load; 2148 $MAP_PREFETCH{$path} |= $load;
1976 2149
1977 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher";
2152
1978 while (%MAP_PREFETCH) { 2153 while (%MAP_PREFETCH) {
1979 while (my ($k, $v) = each %MAP_PREFETCH) { 2154 while (my ($k, $v) = each %MAP_PREFETCH) {
1980 if (my $map = find $k) { 2155 if (my $map = find $k) {
1981 $map->load if $v; 2156 $map->load if $v;
1982 } 2157 }
2008 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2009 2184
2010 local $self->{last_access} = $self->last_access;#d# 2185 local $self->{last_access} = $self->last_access;#d#
2011 2186
2012 cf::async { 2187 cf::async {
2188 $Coro::current->{desc} = "map player save";
2013 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
2014 }; 2190 };
2191
2192 cf::get_slot 0.02;
2015 2193
2016 if ($uniq) { 2194 if ($uniq) {
2017 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2018 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2196 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2019 } else { 2197 } else {
2028 $self->save; 2206 $self->save;
2029 2207
2030 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2208 my $lock = cf::lock_acquire "map_data:$self->{path}";
2031 2209
2032 return if $self->players; 2210 return if $self->players;
2033 return if $self->in_memory != cf::MAP_IN_MEMORY; 2211 return if $self->in_memory != cf::MAP_ACTIVE;
2034 return if $self->{deny_save}; 2212 return if $self->{deny_save};
2035 2213
2214 $self->in_memory (cf::MAP_SWAPPED);
2215
2216 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP;
2036 $self->clear; 2218 $self->clear;
2037 $self->in_memory (cf::MAP_SWAPPED);
2038} 2219}
2039 2220
2040sub reset_at { 2221sub reset_at {
2041 my ($self) = @_; 2222 my ($self) = @_;
2042 2223
2060 2241
2061 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2062 2243
2063 return if $self->players; 2244 return if $self->players;
2064 2245
2065 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2066 2247
2067 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2068 2249
2069 # need to save uniques path 2250 # need to save uniques path
2070 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
2074 if $uniq; 2255 if $uniq;
2075 } 2256 }
2076 2257
2077 delete $cf::MAP{$self->path}; 2258 delete $cf::MAP{$self->path};
2078 2259
2260 $self->deactivate;
2261 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2262 $self->clear;
2080
2081 $_->clear_links_to ($self) for values %cf::MAP;
2082 2263
2083 $self->unlink_save; 2264 $self->unlink_save;
2084 $self->destroy; 2265 $self->destroy;
2085} 2266}
2086 2267
2153 2334
2154sub unique_maps() { 2335sub unique_maps() {
2155 [ 2336 [
2156 map { 2337 map {
2157 utf8::decode $_; 2338 utf8::decode $_;
2158 /\.map$/ 2339 s/\.map$//; # TODO future compatibility hack
2340 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2341 ? ()
2159 ? normalise $_ 2342 : normalise $_
2160 : ()
2161 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2162 ] 2344 ]
2163} 2345}
2164 2346
2165package 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}
2166 2378
2167=back 2379=back
2168 2380
2169=head3 cf::object 2381=head3 cf::object
2170 2382
2174 2386
2175=over 4 2387=over 4
2176 2388
2177=item $ob->inv_recursive 2389=item $ob->inv_recursive
2178 2390
2179Returns 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.
2180 2393
2181=cut 2394=cut
2182 2395
2183sub inv_recursive_; 2396sub inv_recursive_;
2184sub inv_recursive_ { 2397sub inv_recursive_ {
2187 2400
2188sub inv_recursive { 2401sub inv_recursive {
2189 inv_recursive_ inv $_[0] 2402 inv_recursive_ inv $_[0]
2190} 2403}
2191 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
2192package cf; 2433package cf;
2193 2434
2194=back 2435=back
2195 2436
2196=head3 cf::object::player 2437=head3 cf::object::player
2202Sends 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>
2203can 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
2204dialogue with the given NPC character. 2445dialogue with the given NPC character.
2205 2446
2206=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};
2207 2462
2208# rough implementation of a future "reply" method that works 2463# rough implementation of a future "reply" method that works
2209# with dialog boxes. 2464# with dialog boxes.
2210#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
2211sub cf::object::player::reply($$$;$) { 2466sub cf::object::player::reply($$$;$) {
2223 my $dialog = $pl->{npc_dialog}; 2478 my $dialog = $pl->{npc_dialog};
2224 $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));
2225 2480
2226 } else { 2481 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2482 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2483 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2229 } 2484 }
2230 } 2485 }
2231} 2486}
2232 2487
2233=item $object->send_msg ($channel, $msg, $color, [extra...]) 2488=item $object->send_msg ($channel, $msg, $color, [extra...])
2258 2513
2259=item $player_object->enter_link 2514=item $player_object->enter_link
2260 2515
2261Freezes 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}>).
2262 2517
2263The 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.
2264I<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.
2265 2522
2266Will never block. 2523Will never block.
2267 2524
2268=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2269 2526
2321 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2322 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2323 2580
2324 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2325 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2326 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2327 2584
2328 $map->load; 2585 $map->load;
2329 $map->load_neighbours; 2586 $map->load_neighbours;
2330 2587
2331 return unless $self->contr->active; 2588 return unless $self->contr->active;
2332 $self->activate_recursive;
2333 2589
2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2335 $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;
2336} 2595}
2337 2596
2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2339 2598
2340Moves 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
2341her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2342that 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
2343the 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
2344be called at the end of this process. 2603be called at the end of this process.
2345 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
2346=cut 2608=cut
2347 2609
2348our $GOTOGEN; 2610our $GOTOGEN;
2349 2611
2350sub cf::object::player::goto { 2612sub cf::object::player::goto {
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2355 2617
2356 $self->enter_link; 2618 $self->enter_link;
2357 2619
2358 (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
2359 my $map = eval { 2642 my $map = eval {
2360 my $map = cf::map::find $path; 2643 my $map = defined $path ? cf::map::find $path : undef;
2361 2644
2362 if ($map) { 2645 if ($map) {
2363 $map = $map->customise_for ($self); 2646 $map = $map->customise_for ($self);
2364 $map = $check->($map) if $check && $map; 2647 $map = $check->($map) if $check && $map;
2365 } else { 2648 } else {
2366 $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);
2367 } 2650 }
2368 2651
2369 $map 2652 $map
2370 }; 2653 };
2371 2654
2407} 2690}
2408 2691
2409sub prepare_random_map { 2692sub prepare_random_map {
2410 my ($exit) = @_; 2693 my ($exit) = @_;
2411 2694
2412 my $guard = cf::lock_acquire "exit_prepare:$exit";
2413
2414 # all this does is basically replace the /! path by 2695 # all this does is basically replace the /! path by
2415 # a new random map path (?random/...) with a seed 2696 # a new random map path (?random/...) with a seed
2416 # that depends on the exit object 2697 # that depends on the exit object
2417 2698
2418 my $rmp = parse_random_map_params $exit->msg; 2699 my $rmp = parse_random_map_params $exit->msg;
2420 if ($exit->map) { 2701 if ($exit->map) {
2421 $rmp->{region} = $exit->region->name; 2702 $rmp->{region} = $exit->region->name;
2422 $rmp->{origin_map} = $exit->map->path; 2703 $rmp->{origin_map} = $exit->map->path;
2423 $rmp->{origin_x} = $exit->x; 2704 $rmp->{origin_x} = $exit->x;
2424 $rmp->{origin_y} = $exit->y; 2705 $rmp->{origin_y} = $exit->y;
2706
2707 $exit->map->touch;
2425 } 2708 }
2426 2709
2427 $rmp->{random_seed} ||= $exit->random_seed; 2710 $rmp->{random_seed} ||= $exit->random_seed;
2428 2711
2429 my $data = cf::to_json $rmp; 2712 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2430 my $md5 = Digest::MD5::md5_hex $data; 2713 my $md5 = Digest::MD5::md5_hex $data;
2431 my $meta = "$RANDOMDIR/$md5.meta"; 2714 my $meta = "$RANDOMDIR/$md5.meta";
2432 2715
2433 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2716 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2434 aio_write $fh, 0, (length $data), $data, 0; 2717 aio_write $fh, 0, (length $data), $data, 0;
2435 undef $fh; 2718 undef $fh;
2436 aio_rename "$meta~", $meta; 2719 aio_rename "$meta~", $meta;
2437 2720
2721 my $slaying = "?random/$md5";
2722
2723 if ($exit->valid) {
2438 $exit->slaying ("?random/$md5"); 2724 $exit->slaying ("?random/$md5");
2439 $exit->msg (undef); 2725 $exit->msg (undef);
2726 }
2440 } 2727 }
2441} 2728}
2442 2729
2443sub cf::object::player::enter_exit { 2730sub cf::object::player::enter_exit {
2444 my ($self, $exit) = @_; 2731 my ($self, $exit) = @_;
2445 2732
2446 return unless $self->type == cf::PLAYER; 2733 return unless $self->type == cf::PLAYER;
2447 2734
2448 if ($exit->slaying eq "/!") {
2449 #TODO: this should de-fi-ni-te-ly not be a sync-job
2450 # the problem is that $exit might not survive long enough
2451 # so it needs to be done right now, right here
2452 cf::sync_job { prepare_random_map $exit };
2453 }
2454
2455 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2456 my $hp = $exit->stats->hp;
2457 my $sp = $exit->stats->sp;
2458
2459 $self->enter_link; 2735 $self->enter_link;
2460 2736
2461 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED);
2464
2465 (async { 2737 (async {
2466 $self->deactivate_recursive; # just to be sure 2738 $Coro::current->{desc} = "enter_exit";
2739
2467 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
2468 $self->goto ($slaying, $hp, $sp); 2755 $self->goto ($map, $x, $y);
2469 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
2470 1; 2761 1
2471 }) { 2762 }) {
2472 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2473 . "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. "
2474 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2475 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2476 2767
2477 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
2494sub cf::client::send_drawinfo { 2785sub cf::client::send_drawinfo {
2495 my ($self, $text, $flags) = @_; 2786 my ($self, $text, $flags) = @_;
2496 2787
2497 utf8::encode $text; 2788 utf8::encode $text;
2498 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2790}
2791
2792=item $client->send_big_packet ($pkt)
2793
2794Like C<send_packet>, but tries to compress large packets, and fragments
2795them as required.
2796
2797=cut
2798
2799our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2800
2801sub cf::client::send_big_packet {
2802 my ($self, $pkt) = @_;
2803
2804 # try lzf for large packets
2805 $pkt = "lzf " . Compress::LZF::compress $pkt
2806 if 1024 <= length $pkt and $self->{can_lzf};
2807
2808 # split very large packets
2809 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2810 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2811 $pkt = "frag";
2812 }
2813
2814 $self->send_packet ($pkt);
2499} 2815}
2500 2816
2501=item $client->send_msg ($channel, $msg, $color, [extra...]) 2817=item $client->send_msg ($channel, $msg, $color, [extra...])
2502 2818
2503Send a drawinfo or msg packet to the client, formatting the msg for the 2819Send a drawinfo or msg packet to the client, formatting the msg for the
2505the message, with C<log> being the default. If C<$color> is negative, suppress 2821the message, with C<log> being the default. If C<$color> is negative, suppress
2506the message unless the client supports the msg packet. 2822the message unless the client supports the msg packet.
2507 2823
2508=cut 2824=cut
2509 2825
2826# non-persistent channels (usually the info channel)
2510our %CHANNEL = ( 2827our %CHANNEL = (
2828 "c/motd" => {
2829 id => "infobox",
2830 title => "MOTD",
2831 reply => undef,
2832 tooltip => "The message of the day",
2833 },
2511 "c/identify" => { 2834 "c/identify" => {
2512 id => "identify", 2835 id => "infobox",
2513 title => "Identify", 2836 title => "Identify",
2514 reply => undef, 2837 reply => undef,
2515 tooltip => "Items recently identified", 2838 tooltip => "Items recently identified",
2516 }, 2839 },
2517 "c/examine" => { 2840 "c/examine" => {
2518 id => "examine", 2841 id => "infobox",
2519 title => "Examine", 2842 title => "Examine",
2520 reply => undef, 2843 reply => undef,
2521 tooltip => "Signs and other items you examined", 2844 tooltip => "Signs and other items you examined",
2522 }, 2845 },
2846 "c/shopinfo" => {
2847 id => "infobox",
2848 title => "Shop Info",
2849 reply => undef,
2850 tooltip => "What your bargaining skill tells you about the shop",
2851 },
2852 "c/book" => {
2853 id => "infobox",
2854 title => "Book",
2855 reply => undef,
2856 tooltip => "The contents of a note or book",
2857 },
2858 "c/lookat" => {
2859 id => "infobox",
2860 title => "Look",
2861 reply => undef,
2862 tooltip => "What you saw there",
2863 },
2864 "c/who" => {
2865 id => "infobox",
2866 title => "Players",
2867 reply => undef,
2868 tooltip => "Shows players who are currently online",
2869 },
2870 "c/body" => {
2871 id => "infobox",
2872 title => "Body Parts",
2873 reply => undef,
2874 tooltip => "Shows which body parts you posess and are available",
2875 },
2876 "c/statistics" => {
2877 id => "infobox",
2878 title => "Statistics",
2879 reply => undef,
2880 tooltip => "Shows your primary statistics",
2881 },
2882 "c/skills" => {
2883 id => "infobox",
2884 title => "Skills",
2885 reply => undef,
2886 tooltip => "Shows your experience per skill and item power",
2887 },
2888 "c/shopitems" => {
2889 id => "infobox",
2890 title => "Shop Items",
2891 reply => undef,
2892 tooltip => "Shows the items currently for sale in this shop",
2893 },
2894 "c/resistances" => {
2895 id => "infobox",
2896 title => "Resistances",
2897 reply => undef,
2898 tooltip => "Shows your resistances",
2899 },
2900 "c/pets" => {
2901 id => "infobox",
2902 title => "Pets",
2903 reply => undef,
2904 tooltip => "Shows information abotu your pets/a specific pet",
2905 },
2906 "c/perceiveself" => {
2907 id => "infobox",
2908 title => "Perceive Self",
2909 reply => undef,
2910 tooltip => "You gained detailed knowledge about yourself",
2911 },
2912 "c/uptime" => {
2913 id => "infobox",
2914 title => "Uptime",
2915 reply => undef,
2916 tooltip => "How long the server has been running since last restart",
2917 },
2918 "c/mapinfo" => {
2919 id => "infobox",
2920 title => "Map Info",
2921 reply => undef,
2922 tooltip => "Information related to the maps",
2923 },
2924 "c/party" => {
2925 id => "party",
2926 title => "Party",
2927 reply => "gsay ",
2928 tooltip => "Messages and chat related to your party",
2929 },
2930 "c/death" => {
2931 id => "death",
2932 title => "Death",
2933 reply => undef,
2934 tooltip => "Reason for and more info about your most recent death",
2935 },
2936 "c/say" => $SAY_CHANNEL,
2937 "c/chat" => $CHAT_CHANNEL,
2523); 2938);
2524 2939
2525sub cf::client::send_msg { 2940sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_; 2941 my ($self, $channel, $msg, $color, @extra) = @_;
2527 2942
2528 $msg = $self->pl->expand_cfpod ($msg); 2943 $msg = $self->pl->expand_cfpod ($msg)
2944 unless $color & cf::NDI_VERBATIM;
2529 2945
2530 $color &= cf::NDI_CLIENT_MASK; # just in case... 2946 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531 2947
2532 # check predefined channels, for the benefit of C 2948 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2949 if ($CHANNEL{$channel}) {
2950 $channel = $CHANNEL{$channel};
2534 2951
2952 $self->ext_msg (channel_info => $channel);
2953 $channel = $channel->{id};
2954
2535 if (ref $channel) { 2955 } elsif (ref $channel) {
2536 # send meta info to client, if not yet sent 2956 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) { 2957 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel; 2958 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel); 2959 $self->ext_msg (channel_info => $channel);
2540 } 2960 }
2542 $channel = $channel->{id}; 2962 $channel = $channel->{id};
2543 } 2963 }
2544 2964
2545 return unless @extra || length $msg; 2965 return unless @extra || length $msg;
2546 2966
2547 if ($self->can_msg) {
2548 # default colour, mask it out 2967 # default colour, mask it out
2549 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2968 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2550 if $color & cf::NDI_DEF; 2969 if $color & cf::NDI_DEF;
2551 2970
2552 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2971 my $pkt = "msg "
2972 . $self->{json_coder}->encode (
2553 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2973 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2554 } else { 2974 );
2555 if ($color >= 0) {
2556 # replace some tags by gcfclient-compatible ones
2557 for ($msg) {
2558 1 while
2559 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2560 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2561 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2562 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2563 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2564 }
2565 2975
2566 $color &= cf::NDI_COLOR_MASK; 2976 $self->send_big_packet ($pkt);
2567
2568 utf8::encode $msg;
2569
2570 if (0 && $msg =~ /\[/) {
2571 # COMMAND/INFO
2572 $self->send_packet ("drawextinfo $color 10 8 $msg")
2573 } else {
2574 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2575 $self->send_packet ("drawinfo $color $msg")
2576 }
2577 }
2578 }
2579} 2977}
2580 2978
2581=item $client->ext_msg ($type, @msg) 2979=item $client->ext_msg ($type, @msg)
2582 2980
2583Sends an ext event to the client. 2981Sends an ext event to the client.
2586 2984
2587sub cf::client::ext_msg($$@) { 2985sub cf::client::ext_msg($$@) {
2588 my ($self, $type, @msg) = @_; 2986 my ($self, $type, @msg) = @_;
2589 2987
2590 if ($self->extcmd == 2) { 2988 if ($self->extcmd == 2) {
2591 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2592 } elsif ($self->extcmd == 1) { # TODO: remove 2990 } elsif ($self->extcmd == 1) { # TODO: remove
2593 push @msg, msgtype => "event_$type"; 2991 push @msg, msgtype => "event_$type";
2594 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2595 } 2993 }
2596} 2994}
2597 2995
2598=item $client->ext_reply ($msgid, @msg) 2996=item $client->ext_reply ($msgid, @msg)
2599 2997
2603 3001
2604sub cf::client::ext_reply($$@) { 3002sub cf::client::ext_reply($$@) {
2605 my ($self, $id, @msg) = @_; 3003 my ($self, $id, @msg) = @_;
2606 3004
2607 if ($self->extcmd == 2) { 3005 if ($self->extcmd == 2) {
2608 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2609 } elsif ($self->extcmd == 1) { 3007 } elsif ($self->extcmd == 1) {
2610 #TODO: version 1, remove 3008 #TODO: version 1, remove
2611 unshift @msg, msgtype => "reply", msgid => $id; 3009 unshift @msg, msgtype => "reply", msgid => $id;
2612 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2613 } 3011 }
2614} 3012}
2615 3013
2616=item $success = $client->query ($flags, "text", \&cb) 3014=item $success = $client->query ($flags, "text", \&cb)
2617 3015
2756=pod 3154=pod
2757 3155
2758The following functions and methods are available within a safe environment: 3156The following functions and methods are available within a safe environment:
2759 3157
2760 cf::object 3158 cf::object
2761 contr pay_amount pay_player map x y force_find force_add 3159 contr pay_amount pay_player map x y force_find force_add destroy
2762 insert remove name archname title slaying race decrease_ob_nr 3160 insert remove name archname title slaying race decrease split
3161 value
2763 3162
2764 cf::object::player 3163 cf::object::player
2765 player 3164 player
2766 3165
2767 cf::player 3166 cf::player
2772 3171
2773=cut 3172=cut
2774 3173
2775for ( 3174for (
2776 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3175 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2777 insert remove inv name archname title slaying race 3176 insert remove inv nrof name archname title slaying race
2778 decrease_ob_nr)], 3177 decrease split destroy change_exp value msg lore send_msg)],
2779 ["cf::object::player" => qw(player)], 3178 ["cf::object::player" => qw(player)],
2780 ["cf::player" => qw(peaceful)], 3179 ["cf::player" => qw(peaceful send_msg)],
2781 ["cf::map" => qw(trigger)], 3180 ["cf::map" => qw(trigger)],
2782) { 3181) {
2783 no strict 'refs'; 3182 no strict 'refs';
2784 my ($pkg, @funs) = @$_; 3183 my ($pkg, @funs) = @$_;
2785 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2802 my ($code, %vars) = @_; 3201 my ($code, %vars) = @_;
2803 3202
2804 my $qcode = $code; 3203 my $qcode = $code;
2805 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2806 $qcode =~ s/\n/\\n/g; 3205 $qcode =~ s/\n/\\n/g;
3206
3207 %vars = (_dummy => 0) unless %vars;
2807 3208
2808 local $_; 3209 local $_;
2809 local @safe::cf::_safe_eval_args = values %vars; 3210 local @safe::cf::_safe_eval_args = values %vars;
2810 3211
2811 my $eval = 3212 my $eval =
2888 { 3289 {
2889 my $faces = $facedata->{faceinfo}; 3290 my $faces = $facedata->{faceinfo};
2890 3291
2891 while (my ($face, $info) = each %$faces) { 3292 while (my ($face, $info) = each %$faces) {
2892 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3293 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294
2893 cf::face::set_visibility $idx, $info->{visibility}; 3295 cf::face::set_visibility $idx, $info->{visibility};
2894 cf::face::set_magicmap $idx, $info->{magicmap}; 3296 cf::face::set_magicmap $idx, $info->{magicmap};
2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2897 3299
2898 cf::cede_to_tick; 3300 cf::cede_to_tick;
2899 } 3301 }
2900 3302
2901 while (my ($face, $info) = each %$faces) { 3303 while (my ($face, $info) = each %$faces) {
2902 next unless $info->{smooth}; 3304 next unless $info->{smooth};
3305
2903 my $idx = cf::face::find $face 3306 my $idx = cf::face::find $face
2904 or next; 3307 or next;
3308
2905 if (my $smooth = cf::face::find $info->{smooth}) { 3309 if (my $smooth = cf::face::find $info->{smooth}) {
2906 cf::face::set_smooth $idx, $smooth; 3310 cf::face::set_smooth $idx, $smooth;
2907 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2908 } else { 3312 } else {
2909 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3313 warn "smooth face '$info->{smooth}' not found for face '$face'";
2927 { 3331 {
2928 # TODO: for gcfclient pleasure, we should give resources 3332 # TODO: for gcfclient pleasure, we should give resources
2929 # that gcfclient doesn't grok a >10000 face index. 3333 # that gcfclient doesn't grok a >10000 face index.
2930 my $res = $facedata->{resource}; 3334 my $res = $facedata->{resource};
2931 3335
2932 my $soundconf = delete $res->{"res/sound.conf"};
2933
2934 while (my ($name, $info) = each %$res) { 3336 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) {
2935 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3338 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data; 3339 my $data;
2937 3340
2938 if ($info->{type} & 1) { 3341 if ($info->{type} & 1) {
2939 # prepend meta info 3342 # prepend meta info
2940 3343
2941 my $meta = $enc->encode ({ 3344 my $meta = $enc->encode ({
2942 name => $name, 3345 name => $name,
2943 %{ $info->{meta} || {} }, 3346 %{ $info->{meta} || {} },
2944 }); 3347 });
2945 3348
2946 $data = pack "(w/a*)*", $meta, $info->{data}; 3349 $data = pack "(w/a*)*", $meta, $info->{data};
3350 } else {
3351 $data = $info->{data};
3352 }
3353
3354 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3355 cf::face::set_type $idx, $info->{type};
2947 } else { 3356 } else {
2948 $data = $info->{data}; 3357 $RESOURCE{$name} = $info;
2949 } 3358 }
2950 3359
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2952 cf::face::set_type $idx, $info->{type};
2953
2954 cf::cede_to_tick; 3360 cf::cede_to_tick;
2955 } 3361 }
2956
2957 if ($soundconf) {
2958 $soundconf = $enc->decode (delete $soundconf->{data});
2959
2960 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2961 my $sound = $soundconf->{compat}[$_]
2962 or next;
2963
2964 my $face = cf::face::find "sound/$sound->[1]";
2965 cf::sound::set $sound->[0] => $face;
2966 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2967 }
2968
2969 while (my ($k, $v) = each %{$soundconf->{event}}) {
2970 my $face = cf::face::find "sound/$v";
2971 cf::sound::set $k => $face;
2972 }
2973 }
2974 } 3362 }
3363
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2975 3365
2976 1 3366 1
2977} 3367}
3368
3369cf::global->attach (on_resource_update => sub {
3370 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3371 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3372
3373 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3374 my $sound = $soundconf->{compat}[$_]
3375 or next;
3376
3377 my $face = cf::face::find "sound/$sound->[1]";
3378 cf::sound::set $sound->[0] => $face;
3379 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3380 }
3381
3382 while (my ($k, $v) = each %{$soundconf->{event}}) {
3383 my $face = cf::face::find "sound/$v";
3384 cf::sound::set $k => $face;
3385 }
3386 }
3387});
2978 3388
2979register_exticmd fx_want => sub { 3389register_exticmd fx_want => sub {
2980 my ($ns, $want) = @_; 3390 my ($ns, $want) = @_;
2981 3391
2982 while (my ($k, $v) = each %$want) { 3392 while (my ($k, $v) = each %$want) {
2983 $ns->fx_want ($k, $v); 3393 $ns->fx_want ($k, $v);
2984 } 3394 }
2985}; 3395};
3396
3397sub load_resource_file($) {
3398 my $guard = lock_acquire "load_resource_file";
3399
3400 my $status = load_resource_file_ $_[0];
3401 get_slot 0.1, 100;
3402 cf::arch::commit_load;
3403
3404 $status
3405}
2986 3406
2987sub reload_regions { 3407sub reload_regions {
2988 # HACK to clear player env face cache, we need some signal framework 3408 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?) 3409 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3004} 3424}
3005 3425
3006sub reload_archetypes { 3426sub reload_archetypes {
3007 load_resource_file "$DATADIR/archetypes" 3427 load_resource_file "$DATADIR/archetypes"
3008 or die "unable to load archetypes\n"; 3428 or die "unable to load archetypes\n";
3009 #d# NEED to laod twice to resolve forward references
3010 # this really needs to be done in an extra post-pass
3011 # (which needs to be synchronous, so solve it differently)
3012 load_resource_file "$DATADIR/archetypes"
3013 or die "unable to load archetypes\n";
3014} 3429}
3015 3430
3016sub reload_treasures { 3431sub reload_treasures {
3017 load_resource_file "$DATADIR/treasures" 3432 load_resource_file "$DATADIR/treasures"
3018 or die "unable to load treasurelists\n"; 3433 or die "unable to load treasurelists\n";
3019} 3434}
3020 3435
3021sub reload_resources { 3436sub reload_resources {
3022 warn "reloading resource files...\n"; 3437 warn "reloading resource files...\n";
3023 3438
3439 reload_facedata;
3440 reload_archetypes;
3024 reload_regions; 3441 reload_regions;
3025 reload_facedata;
3026 #reload_archetypes;#d#
3027 reload_archetypes;
3028 reload_treasures; 3442 reload_treasures;
3029 3443
3030 warn "finished reloading resource files\n"; 3444 warn "finished reloading resource files\n";
3031} 3445}
3032 3446
3033sub init {
3034 reload_resources;
3035}
3036
3037sub reload_config { 3447sub reload_config {
3448 warn "reloading config file...\n";
3449
3038 open my $fh, "<:utf8", "$CONFDIR/config" 3450 open my $fh, "<:utf8", "$CONFDIR/config"
3039 or return; 3451 or return;
3040 3452
3041 local $/; 3453 local $/;
3042 *CFG = YAML::Syck::Load <$fh>; 3454 *CFG = YAML::XS::Load scalar <$fh>;
3043 3455
3044 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3045 3457
3046 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3047 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3051 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3052 and die "WARNING: m(un)lockall failed: $!\n"; 3464 and die "WARNING: m(un)lockall failed: $!\n";
3053 }; 3465 };
3054 warn $@ if $@; 3466 warn $@ if $@;
3055 } 3467 }
3468
3469 warn "finished reloading resource files\n";
3470}
3471
3472sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!";
3475 flock $fh, &Fcntl::LOCK_EX
3476 or die "$PIDFILE: flock: $!";
3477 $fh
3478}
3479
3480# make sure only one server instance is running at any one time
3481sub atomic {
3482 my $fh = pidfile;
3483
3484 my $pid = <$fh>;
3485 kill 9, $pid if $pid > 0;
3486
3487 seek $fh, 0, 0;
3488 print $fh $$;
3489}
3490
3491sub main_loop {
3492 warn "EV::loop starting\n";
3493 if (1) {
3494 EV::loop;
3495 }
3496 warn "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP;
3056} 3498}
3057 3499
3058sub main { 3500sub main {
3501 cf::init_globals; # initialise logging
3502
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514
3059 # we must not ever block the main coroutine 3515 # we must not ever block the main coroutine
3060 local $Coro::idle = sub { 3516 local $Coro::idle = sub {
3061 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3517 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3062 (async { 3518 (async {
3063 Event::one_event; 3519 $Coro::current->{desc} = "IDLE BUG HANDLER";
3520 EV::loop EV::LOOP_ONESHOT;
3064 })->prio (Coro::PRIO_MAX); 3521 })->prio (Coro::PRIO_MAX);
3065 }; 3522 };
3066 3523
3524 evthread_start IO::AIO::poll_fileno;
3525
3526 cf::sync_job {
3527 reload_resources;
3067 reload_config; 3528 reload_config;
3068 db_init; 3529 db_init;
3530
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid;
3534 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills;
3537
3538 cf::init_beforeplay;
3539
3540 atomic;
3541
3069 load_extensions; 3542 load_extensions;
3070 3543
3071 $TICK_WATCHER->start; 3544 utime time, time, $RUNTIMEFILE;
3072 Event::loop; 3545
3546 # no (long-running) fork's whatsoever before this point(!)
3547 use POSIX ();
3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549
3550 (pop @POST_INIT)->(0) while @POST_INIT;
3551 };
3552
3553 main_loop;
3073} 3554}
3074 3555
3075############################################################################# 3556#############################################################################
3076# initialisation and cleanup 3557# initialisation and cleanup
3077 3558
3078# install some emergency cleanup handlers 3559# install some emergency cleanup handlers
3079BEGIN { 3560BEGIN {
3561 our %SIGWATCHER = ();
3080 for my $signal (qw(INT HUP TERM)) { 3562 for my $signal (qw(INT HUP TERM)) {
3081 Event->signal ( 3563 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3082 reentrant => 0,
3083 data => WF_AUTOCANCEL,
3084 signal => $signal,
3085 prio => 0,
3086 cb => sub {
3087 cf::cleanup "SIG$signal"; 3564 cf::cleanup "SIG$signal";
3088 },
3089 ); 3565 };
3090 } 3566 }
3091} 3567}
3092 3568
3093sub write_runtime { 3569sub write_runtime_sync {
3094 my $runtime = "$LOCALDIR/runtime";
3095
3096 # first touch the runtime file to show we are still running: 3570 # first touch the runtime file to show we are still running:
3097 # the fsync below can take a very very long time. 3571 # the fsync below can take a very very long time.
3098 3572
3099 IO::AIO::aio_utime $runtime, undef, undef; 3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3100 3574
3101 my $guard = cf::lock_acquire "write_runtime"; 3575 my $guard = cf::lock_acquire "write_runtime";
3102 3576
3103 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3104 or return; 3578 or return;
3105 3579
3106 my $value = $cf::RUNTIME + 90 + 10; 3580 my $value = $cf::RUNTIME + 90 + 10;
3107 # 10 is the runtime save interval, for a monotonic clock 3581 # 10 is the runtime save interval, for a monotonic clock
3108 # 60 allows for the watchdog to kill the server. 3582 # 60 allows for the watchdog to kill the server.
3118 aio_utime $fh, undef, undef; 3592 aio_utime $fh, undef, undef;
3119 3593
3120 close $fh 3594 close $fh
3121 or return; 3595 or return;
3122 3596
3123 aio_rename "$runtime~", $runtime 3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3124 and return; 3598 and return;
3125 3599
3126 warn "runtime file written.\n"; 3600 warn "runtime file written.\n";
3127 3601
3128 1 3602 1
3603}
3604
3605our $uuid_lock;
3606our $uuid_skip;
3607
3608sub write_uuid_sync($) {
3609 $uuid_skip ||= $_[0];
3610
3611 return if $uuid_lock;
3612 local $uuid_lock = 1;
3613
3614 my $uuid = "$LOCALDIR/uuid";
3615
3616 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3617 or return;
3618
3619 my $value = uuid_seq uuid_cur;
3620
3621 unless ($value) {
3622 warn "cowardly refusing to write zero uuid value!\n";
3623 return;
3624 }
3625
3626 my $value = uuid_str $value + $uuid_skip;
3627 $uuid_skip = 0;
3628
3629 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3630 and return;
3631
3632 # always fsync - this file is important
3633 aio_fsync $fh
3634 and return;
3635
3636 close $fh
3637 or return;
3638
3639 aio_rename "$uuid~", $uuid
3640 and return;
3641
3642 warn "uuid file written ($value).\n";
3643
3644 1
3645
3646}
3647
3648sub write_uuid($$) {
3649 my ($skip, $sync) = @_;
3650
3651 $sync ? write_uuid_sync $skip
3652 : async { write_uuid_sync $skip };
3129} 3653}
3130 3654
3131sub emergency_save() { 3655sub emergency_save() {
3132 my $freeze_guard = cf::freeze_mainloop; 3656 my $freeze_guard = cf::freeze_mainloop;
3133 3657
3134 warn "enter emergency perl save\n"; 3658 warn "emergency_perl_save: enter\n";
3135 3659
3136 cf::sync_job { 3660 cf::sync_job {
3661 # this is a trade-off: we want to be very quick here, so
3662 # save all maps without fsync, and later call a global sync
3663 # (which in turn might be very very slow)
3664 local $USE_FSYNC = 0;
3665
3137 # use a peculiar iteration method to avoid tripping on perl 3666 # use a peculiar iteration method to avoid tripping on perl
3138 # refcount bugs in for. also avoids problems with players 3667 # refcount bugs in for. also avoids problems with players
3139 # and maps saved/destroyed asynchronously. 3668 # and maps saved/destroyed asynchronously.
3140 warn "begin emergency player save\n"; 3669 warn "emergency_perl_save: begin player save\n";
3141 for my $login (keys %cf::PLAYER) { 3670 for my $login (keys %cf::PLAYER) {
3142 my $pl = $cf::PLAYER{$login} or next; 3671 my $pl = $cf::PLAYER{$login} or next;
3143 $pl->valid or next; 3672 $pl->valid or next;
3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3144 $pl->save; 3674 $pl->save;
3145 } 3675 }
3146 warn "end emergency player save\n"; 3676 warn "emergency_perl_save: end player save\n";
3147 3677
3148 warn "begin emergency map save\n"; 3678 warn "emergency_perl_save: begin map save\n";
3149 for my $path (keys %cf::MAP) { 3679 for my $path (keys %cf::MAP) {
3150 my $map = $cf::MAP{$path} or next; 3680 my $map = $cf::MAP{$path} or next;
3151 $map->valid or next; 3681 $map->valid or next;
3152 $map->save; 3682 $map->save;
3153 } 3683 }
3154 warn "end emergency map save\n"; 3684 warn "emergency_perl_save: end map save\n";
3155 3685
3156 warn "begin emergency database checkpoint\n"; 3686 warn "emergency_perl_save: begin database checkpoint\n";
3157 BDB::db_env_txn_checkpoint $DB_ENV; 3687 BDB::db_env_txn_checkpoint $DB_ENV;
3158 warn "end emergency database checkpoint\n"; 3688 warn "emergency_perl_save: end database checkpoint\n";
3689
3690 warn "emergency_perl_save: begin write uuid\n";
3691 write_uuid_sync 1;
3692 warn "emergency_perl_save: end write uuid\n";
3159 }; 3693 };
3160 3694
3695 warn "emergency_perl_save: starting sync()\n";
3696 IO::AIO::aio_sync sub {
3697 warn "emergency_perl_save: finished sync()\n";
3698 };
3699
3161 warn "leave emergency perl save\n"; 3700 warn "emergency_perl_save: leave\n";
3162} 3701}
3163 3702
3164sub post_cleanup { 3703sub post_cleanup {
3165 my ($make_core) = @_; 3704 my ($make_core) = @_;
3166 3705
3167 warn Carp::longmess "post_cleanup backtrace" 3706 warn Carp::longmess "post_cleanup backtrace"
3168 if $make_core; 3707 if $make_core;
3708
3709 my $fh = pidfile;
3710 unlink $PIDFILE if <$fh> == $$;
3711}
3712
3713# a safer delete_package, copied from Symbol
3714sub clear_package($) {
3715 my $pkg = shift;
3716
3717 # expand to full symbol table name if needed
3718 unless ($pkg =~ /^main::.*::$/) {
3719 $pkg = "main$pkg" if $pkg =~ /^::/;
3720 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3721 $pkg .= '::' unless $pkg =~ /::$/;
3722 }
3723
3724 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3725 my $stem_symtab = *{$stem}{HASH};
3726
3727 defined $stem_symtab and exists $stem_symtab->{$leaf}
3728 or return;
3729
3730 # clear all symbols
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 }
3736 warn "cleared package $pkg\n";#d#
3169} 3737}
3170 3738
3171sub do_reload_perl() { 3739sub do_reload_perl() {
3172 # can/must only be called in main 3740 # can/must only be called in main
3173 if ($Coro::current != $Coro::main) { 3741 if ($Coro::current != $Coro::main) {
3174 warn "can only reload from main coroutine"; 3742 warn "can only reload from main coroutine";
3175 return; 3743 return;
3176 } 3744 }
3177 3745
3746 return if $RELOAD++;
3747
3748 my $t1 = EV::time;
3749
3750 while ($RELOAD) {
3178 warn "reloading..."; 3751 warn "reloading...";
3179 3752
3180 warn "entering sync_job"; 3753 warn "entering sync_job";
3181 3754
3182 cf::sync_job { 3755 cf::sync_job {
3183 cf::write_runtime; # external watchdog should not bark 3756 cf::write_runtime_sync; # external watchdog should not bark
3184 cf::emergency_save; 3757 cf::emergency_save;
3185 cf::write_runtime; # external watchdog should not bark 3758 cf::write_runtime_sync; # external watchdog should not bark
3186 3759
3187 warn "syncing database to disk"; 3760 warn "syncing database to disk";
3188 BDB::db_env_txn_checkpoint $DB_ENV; 3761 BDB::db_env_txn_checkpoint $DB_ENV;
3189 3762
3190 # if anything goes wrong in here, we should simply crash as we already saved 3763 # if anything goes wrong in here, we should simply crash as we already saved
3191 3764
3192 warn "cancelling all WF_AUTOCANCEL watchers";
3193 for (Event::all_watchers) {
3194 $_->cancel if $_->data & WF_AUTOCANCEL;
3195 }
3196
3197 warn "flushing outstanding aio requests"; 3765 warn "flushing outstanding aio requests";
3198 for (;;) {
3199 BDB::flush;
3200 IO::AIO::flush;
3201 Coro::cede;
3202 last unless IO::AIO::nreqs || BDB::nreqs; 3766 while (IO::AIO::nreqs || BDB::nreqs) {
3203 warn "iterate..."; 3767 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3204 }
3205
3206 ++$RELOAD;
3207
3208 warn "cancelling all extension coros";
3209 $_->cancel for values %EXT_CORO;
3210 %EXT_CORO = ();
3211
3212 warn "removing commands";
3213 %COMMAND = ();
3214
3215 warn "removing ext/exti commands";
3216 %EXTCMD = ();
3217 %EXTICMD = ();
3218
3219 warn "unloading/nuking all extensions";
3220 for my $pkg (@EXTS) {
3221 warn "... unloading $pkg";
3222
3223 if (my $cb = $pkg->can ("unload")) {
3224 eval {
3225 $cb->($pkg);
3226 1
3227 } or warn "$pkg unloaded, but with errors: $@";
3228 } 3768 }
3229 3769
3230 warn "... nuking $pkg"; 3770 warn "cancelling all extension coros";
3231 Symbol::delete_package $pkg; 3771 $_->cancel for values %EXT_CORO;
3232 } 3772 %EXT_CORO = ();
3233 3773
3234 warn "unloading all perl modules loaded from $LIBDIR"; 3774 warn "removing commands";
3235 while (my ($k, $v) = each %INC) { 3775 %COMMAND = ();
3236 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3237 3776
3777 warn "removing ext/exti commands";
3778 %EXTCMD = ();
3779 %EXTICMD = ();
3780
3781 warn "unloading/nuking all extensions";
3782 for my $pkg (@EXTS) {
3238 warn "... unloading $k"; 3783 warn "... unloading $pkg";
3239 delete $INC{$k};
3240 3784
3241 $k =~ s/\.pm$//;
3242 $k =~ s/\//::/g;
3243
3244 if (my $cb = $k->can ("unload_module")) { 3785 if (my $cb = $pkg->can ("unload")) {
3786 eval {
3245 $cb->(); 3787 $cb->($pkg);
3788 1
3789 } or warn "$pkg unloaded, but with errors: $@";
3790 }
3791
3792 warn "... clearing $pkg";
3793 clear_package $pkg;
3246 } 3794 }
3247 3795
3248 Symbol::delete_package $k; 3796 warn "unloading all perl modules loaded from $LIBDIR";
3797 while (my ($k, $v) = each %INC) {
3798 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3799
3800 warn "... unloading $k";
3801 delete $INC{$k};
3802
3803 $k =~ s/\.pm$//;
3804 $k =~ s/\//::/g;
3805
3806 if (my $cb = $k->can ("unload_module")) {
3807 $cb->();
3808 }
3809
3810 clear_package $k;
3249 } 3811 }
3250 3812
3251 warn "getting rid of safe::, as good as possible"; 3813 warn "getting rid of safe::, as good as possible";
3252 Symbol::delete_package "safe::$_" 3814 clear_package "safe::$_"
3253 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3254 3816
3255 warn "unloading cf.pm \"a bit\""; 3817 warn "unloading cf.pm \"a bit\"";
3256 delete $INC{"cf.pm"}; 3818 delete $INC{"cf.pm"};
3257 delete $INC{"cf/pod.pm"}; 3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3258 3820
3259 # don't, removes xs symbols, too, 3821 # don't, removes xs symbols, too,
3260 # and global variables created in xs 3822 # and global variables created in xs
3261 #Symbol::delete_package __PACKAGE__; 3823 #clear_package __PACKAGE__;
3262 3824
3263 warn "unload completed, starting to reload now"; 3825 warn "unload completed, starting to reload now";
3264 3826
3265 warn "reloading cf.pm"; 3827 warn "reloading cf.pm";
3266 require cf; 3828 require cf;
3267 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3829 cf::_connect_to_perl_1;
3268 3830
3269 warn "loading config and database again"; 3831 warn "loading config and database again";
3270 cf::reload_config; 3832 cf::reload_config;
3271 3833
3272 warn "loading extensions"; 3834 warn "loading extensions";
3273 cf::load_extensions; 3835 cf::load_extensions;
3274 3836
3837 if ($REATTACH_ON_RELOAD) {
3275 warn "reattaching attachments to objects/players"; 3838 warn "reattaching attachments to objects/players";
3276 _global_reattach; # objects, sockets 3839 _global_reattach; # objects, sockets
3277 warn "reattaching attachments to maps"; 3840 warn "reattaching attachments to maps";
3278 reattach $_ for values %MAP; 3841 reattach $_ for values %MAP;
3279 warn "reattaching attachments to players"; 3842 warn "reattaching attachments to players";
3280 reattach $_ for values %PLAYER; 3843 reattach $_ for values %PLAYER;
3844 }
3281 3845
3846 warn "running post_init jobs";
3847 (pop @POST_INIT)->(1) while @POST_INIT;
3848
3282 warn "leaving sync_job"; 3849 warn "leaving sync_job";
3283 3850
3284 1 3851 1
3285 } or do { 3852 } or do {
3286 warn $@; 3853 warn $@;
3287 warn "error while reloading, exiting."; 3854 cf::cleanup "error while reloading, exiting.";
3288 exit 1;
3289 }; 3855 };
3290 3856
3291 warn "reloaded"; 3857 warn "reloaded";
3858 --$RELOAD;
3859 }
3860
3861 $t1 = EV::time - $t1;
3862 warn "reload completed in ${t1}s\n";
3292}; 3863};
3293 3864
3294our $RELOAD_WATCHER; # used only during reload 3865our $RELOAD_WATCHER; # used only during reload
3295 3866
3296sub reload_perl() { 3867sub reload_perl() {
3297 # doing reload synchronously and two reloads happen back-to-back, 3868 # doing reload synchronously and two reloads happen back-to-back,
3298 # coro crashes during coro_state_free->destroy here. 3869 # coro crashes during coro_state_free->destroy here.
3299 3870
3300 $RELOAD_WATCHER ||= Event->timer ( 3871 $RELOAD_WATCHER ||= cf::async {
3301 reentrant => 0, 3872 Coro::AIO::aio_wait cache_extensions;
3302 after => 0, 3873
3303 data => WF_AUTOCANCEL, 3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3304 cb => sub {
3305 do_reload_perl; 3875 do_reload_perl;
3306 undef $RELOAD_WATCHER; 3876 undef $RELOAD_WATCHER;
3307 }, 3877 };
3308 ); 3878 };
3309} 3879}
3310 3880
3311register_command "reload" => sub { 3881register_command "reload" => sub {
3312 my ($who, $arg) = @_; 3882 my ($who, $arg) = @_;
3313 3883
3314 if ($who->flag (FLAG_WIZ)) { 3884 if ($who->flag (FLAG_WIZ)) {
3315 $who->message ("reloading server."); 3885 $who->message ("reloading server.");
3886 async {
3887 $Coro::current->{desc} = "perl_reload";
3316 async { reload_perl }; 3888 reload_perl;
3889 };
3317 } 3890 }
3318}; 3891};
3319 3892
3320unshift @INC, $LIBDIR; 3893unshift @INC, $LIBDIR;
3321 3894
3323 3896
3324our @WAIT_FOR_TICK; 3897our @WAIT_FOR_TICK;
3325our @WAIT_FOR_TICK_BEGIN; 3898our @WAIT_FOR_TICK_BEGIN;
3326 3899
3327sub wait_for_tick { 3900sub wait_for_tick {
3328 return unless $TICK_WATCHER->is_active;
3329 return if $Coro::current == $Coro::main; 3901 return if tick_inhibit || $Coro::current == $Coro::main;
3330 3902
3331 my $signal = new Coro::Signal; 3903 my $signal = new Coro::Signal;
3332 push @WAIT_FOR_TICK, $signal; 3904 push @WAIT_FOR_TICK, $signal;
3333 $signal->wait; 3905 $signal->wait;
3334} 3906}
3335 3907
3336sub wait_for_tick_begin { 3908sub wait_for_tick_begin {
3337 return unless $TICK_WATCHER->is_active;
3338 return if $Coro::current == $Coro::main; 3909 return if tick_inhibit || $Coro::current == $Coro::main;
3339 3910
3340 my $signal = new Coro::Signal; 3911 my $signal = new Coro::Signal;
3341 push @WAIT_FOR_TICK_BEGIN, $signal; 3912 push @WAIT_FOR_TICK_BEGIN, $signal;
3342 $signal->wait; 3913 $signal->wait;
3343} 3914}
3344 3915
3345 my $min = 1e6;#d# 3916sub tick {
3346 my $avg = 10;
3347$TICK_WATCHER = Event->timer (
3348 reentrant => 0,
3349 parked => 1,
3350 prio => 0,
3351 at => $NEXT_TICK || $TICK,
3352 data => WF_AUTOCANCEL,
3353 cb => sub {
3354 if ($Coro::current != $Coro::main) { 3917 if ($Coro::current != $Coro::main) {
3355 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3918 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3356 unless ++$bug_warning > 10; 3919 unless ++$bug_warning > 10;
3357 return; 3920 return;
3358 } 3921 }
3359 3922
3360 $NOW = $tick_start = Event::time;
3361
3362 cf::server_tick; # one server iteration 3923 cf::server_tick; # one server iteration
3363 3924
3364 0 && sync_job {#d# 3925 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3365 for(1..10) { 3926 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3366 my $t = Event::time; 3927 Coro::async_pool {
3367 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3928 $Coro::current->{desc} = "runtime saver";
3368 or die; 3929 write_runtime_sync
3369 3930 or warn "ERROR: unable to write runtime file: $!";
3370 $map->width (50);
3371 $map->height (50);
3372 $map->alloc;
3373 $map->_load_objects ("/tmp/x.map", 1);
3374 my $t = Event::time - $t;
3375
3376 #next unless $t < 0.0013;#d#
3377 if ($t < $min) {
3378 $min = $t;
3379 }
3380 $avg = $avg * 0.99 + $t * 0.01;
3381 }
3382 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3383 exit 0;
3384 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3385 }; 3931 };
3932 }
3386 3933
3387 $RUNTIME += $TICK;
3388 $NEXT_TICK += $TICK;
3389
3390 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3391 $NEXT_RUNTIME_WRITE = $NOW + 10;
3392 Coro::async_pool {
3393 write_runtime
3394 or warn "ERROR: unable to write runtime file: $!";
3395 };
3396 }
3397
3398# my $AFTER = Event::time;
3399# warn $AFTER - $NOW;#d#
3400
3401 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3934 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3402 $sig->send; 3935 $sig->send;
3403 } 3936 }
3404 while (my $sig = shift @WAIT_FOR_TICK) { 3937 while (my $sig = shift @WAIT_FOR_TICK) {
3405 $sig->send; 3938 $sig->send;
3406 } 3939 }
3407 3940
3408 $NOW = Event::time; 3941 $LOAD = ($NOW - $TICK_START) / $TICK;
3409
3410 # if we are delayed by four ticks or more, skip them all
3411 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3412
3413 $TICK_WATCHER->at ($NEXT_TICK);
3414 $TICK_WATCHER->start;
3415
3416 $LOAD = ($NOW - $tick_start) / $TICK;
3417 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3942 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3418 3943
3419 _post_tick; 3944 if (0) {
3420 3945 if ($NEXT_TICK) {
3421 3946 my $jitter = $TICK_START - $NEXT_TICK;
3947 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3948 warn "jitter $JITTER\n";#d#
3949 }
3422 }, 3950 }
3423); 3951}
3424 3952
3425{ 3953{
3426 BDB::max_poll_time $TICK * 0.1; 3954 # configure BDB
3427 $BDB_POLL_WATCHER = Event->io ( 3955
3428 reentrant => 0,
3429 fd => BDB::poll_fileno,
3430 poll => 'r',
3431 prio => 0,
3432 data => WF_AUTOCANCEL,
3433 cb => \&BDB::poll_cb,
3434 );
3435 BDB::min_parallel 8; 3956 BDB::min_parallel 8;
3436 3957 BDB::max_poll_reqs $TICK * 0.1;
3437 BDB::set_sync_prepare { 3958 $AnyEvent::BDB::WATCHER->priority (1);
3438 my $status;
3439 my $current = $Coro::current;
3440 (
3441 sub {
3442 $status = $!;
3443 $current->ready; undef $current;
3444 },
3445 sub {
3446 Coro::schedule while defined $current;
3447 $! = $status;
3448 },
3449 )
3450 };
3451 3959
3452 unless ($DB_ENV) { 3960 unless ($DB_ENV) {
3453 $DB_ENV = BDB::db_env_create; 3961 $DB_ENV = BDB::db_env_create;
3962 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3963 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3964 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3965 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3966 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3454 3967
3455 cf::sync_job { 3968 cf::sync_job {
3456 eval { 3969 eval {
3457 BDB::db_env_open 3970 BDB::db_env_open
3458 $DB_ENV, 3971 $DB_ENV,
3460 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3973 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3461 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3974 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3462 0666; 3975 0666;
3463 3976
3464 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3977 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3465
3466 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3467 $DB_ENV->set_lk_detect;
3468 }; 3978 };
3469 3979
3470 cf::cleanup "db_env_open(db): $@" if $@; 3980 cf::cleanup "db_env_open(db): $@" if $@;
3471 }; 3981 };
3472 } 3982 }
3983
3984 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3985 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3986 };
3987 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3988 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3989 };
3990 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3991 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3992 };
3473} 3993}
3474 3994
3475{ 3995{
3996 # configure IO::AIO
3997
3476 IO::AIO::min_parallel 8; 3998 IO::AIO::min_parallel 8;
3477
3478 undef $Coro::AIO::WATCHER;
3479 IO::AIO::max_poll_time $TICK * 0.1; 3999 IO::AIO::max_poll_time $TICK * 0.1;
3480 $AIO_POLL_WATCHER = Event->io ( 4000 undef $AnyEvent::AIO::WATCHER;
3481 reentrant => 0,
3482 data => WF_AUTOCANCEL,
3483 fd => IO::AIO::poll_fileno,
3484 poll => 'r',
3485 prio => 6,
3486 cb => \&IO::AIO::poll_cb,
3487 );
3488} 4001}
3489 4002
3490my $_log_backtrace; 4003my $_log_backtrace;
3491 4004
3492sub _log_backtrace { 4005sub _log_backtrace {
3495 $msg =~ s/\n//; 4008 $msg =~ s/\n//;
3496 4009
3497 # limit the # of concurrent backtraces 4010 # limit the # of concurrent backtraces
3498 if ($_log_backtrace < 2) { 4011 if ($_log_backtrace < 2) {
3499 ++$_log_backtrace; 4012 ++$_log_backtrace;
4013 my $perl_bt = Carp::longmess $msg;
3500 async { 4014 async {
4015 $Coro::current->{desc} = "abt $msg";
4016
3501 my @bt = fork_call { 4017 my @bt = fork_call {
3502 @addr = map { sprintf "%x", $_ } @addr; 4018 @addr = map { sprintf "%x", $_ } @addr;
3503 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4019 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3504 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4020 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3505 or die "addr2line: $!"; 4021 or die "addr2line: $!";
3513 } 4029 }
3514 4030
3515 @funcs 4031 @funcs
3516 }; 4032 };
3517 4033
3518 LOG llevInfo, "[ABT] $msg\n"; 4034 LOG llevInfo, "[ABT] $perl_bt\n";
4035 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3519 LOG llevInfo, "[ABT] $_\n" for @bt; 4036 LOG llevInfo, "[ABT] $_\n" for @bt;
3520 --$_log_backtrace; 4037 --$_log_backtrace;
3521 }; 4038 };
3522 } else { 4039 } else {
3523 LOG llevInfo, "[ABT] $msg\n"; 4040 LOG llevInfo, "[ABT] $msg\n";
3524 LOG llevInfo, "[ABT] [suppressed]\n"; 4041 LOG llevInfo, "[ABT] [suppressed]\n";
3525 } 4042 }
3526} 4043}
3527 4044
3528# load additional modules 4045# load additional modules
3529use cf::pod; 4046require "cf/$_.pm" for @EXTRA_MODULES;
4047cf::_connect_to_perl_2;
3530 4048
3531END { cf::emergency_save } 4049END { cf::emergency_save }
3532 4050
35331 40511
3534 4052

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines