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.354 by root, Sun Sep 2 12:26:54 2007 UTC vs.
Revision 1.548 by root, Mon May 10 21:40:22 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.32 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 75
43$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
44 77$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 78
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54 85
55our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
75 118
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $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 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 121our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
83 123
124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 126our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 127our $DB_ENV;
128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
86 130
87our %CFG; 131our %CFG;
88 132
89our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 134our $RUNTIME;
135our $NOW;
91 136
92our %PLAYER; # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 138our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
95 140
96# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 143
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
102 153
103binmode STDOUT; 154binmode STDOUT;
104binmode STDERR; 155binmode STDERR;
105 156
106# read virtual server time, if available 157# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
111} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
112 165
113mkdir $_ 166mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 168
116our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
117 170
118sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
119 187
120############################################################################# 188#############################################################################
121 189
122=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
123 191
159 227
160The raw value load value from the last tick. 228The raw value load value from the last tick.
161 229
162=item %cf::CFG 230=item %cf::CFG
163 231
164Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 233from wherever your confdir points to.
166 234
167=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
168 236
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These 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 238returns directly I<after> the tick processing (and consequently, can only wake one thread
171per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
173=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
174 247
175This array contains the results of the last C<invoke ()> call. When 248This 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 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 250that call.
178 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
179=back 258=back
180 259
181=cut 260=cut
182 261
183BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
184 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
185 my $msg = join "", @_; 269 my $msg = join "", @_;
186 270
187 $msg .= "\n" 271 $msg .= "\n"
188 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
189 273
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 275
192 utf8::encode $msg;
193 LOG llevError, $msg; 276 LOG llevWarn, $msg;
194 }; 277};
195} 278
279$Coro::State::DIEHOOK = sub {
280 return unless $^S eq 0; # "eq", not "=="
281
282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
285 error "DIEHOOK called in main context, Coro bug?\n";#d#
286 return;#d#
287 }#d#
288
289 # kill coroutine otherwise
290 Coro::terminate
291};
196 292
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 303for my $pkg (qw(
208 cf::global cf::attachable 304 cf::global cf::attachable
209 cf::object cf::object::player 305 cf::object cf::object::player
210 cf::client cf::player 306 cf::client cf::player
211 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
212 cf::map cf::party cf::region 309 cf::party cf::region
213)) { 310)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 312}
217 313
218$Event::DIED = sub { 314$EV::DIED = sub {
219 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
220}; 316};
221 317
222############################################################################# 318#############################################################################
223 319
224=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 343 $d
248 } || "[unable to dump $_[0]: '$@']"; 344 } || "[unable to dump $_[0]: '$@']";
249} 345}
250 346
251=item $ref = cf::from_json $json 347=item $ref = cf::decode_json $json
252 348
253Converts a JSON string into the corresponding perl data structure. 349Converts a JSON string into the corresponding perl data structure.
254 350
255=item $json = cf::to_json $ref 351=item $json = cf::encode_json $ref
256 352
257Converts a perl data structure into its JSON representation. 353Converts a perl data structure into its JSON representation.
258 354
259=cut 355=cut
260 356
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 358
263sub to_json ($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
374=item cf::post_init { BLOCK }
375
376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
377but I<before> the server starts ticking again.
378
379The codeblock will have a single boolean argument to indicate whether this
380is a reload or not.
381
382=cut
383
384sub post_init(&) {
385 push @POST_INIT, shift;
386}
265 387
266=item cf::lock_wait $string 388=item cf::lock_wait $string
267 389
268Wait until the given lock is available. See cf::lock_acquire. 390Wait until the given lock is available. See cf::lock_acquire.
269 391
270=item my $lock = cf::lock_acquire $string 392=item my $lock = cf::lock_acquire $string
271 393
272Wait until the given lock is available and then acquires it and returns 394Wait 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, 395a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 396for example when the coroutine gets canceled), the lock is automatically
275returned. 397returned.
276 398
277Locks are *not* recursive, locking from the same coro twice results in a 399Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 400deadlocked coro.
284 406
285Return true if the lock is currently active, i.e. somebody has locked it. 407Return true if the lock is currently active, i.e. somebody has locked it.
286 408
287=cut 409=cut
288 410
289our %LOCK; 411our $LOCKS = new Coro::SemaphoreSet;
290 412
291sub lock_wait($) { 413sub lock_wait($) {
292 my ($key) = @_; 414 $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} 415}
300 416
301sub lock_acquire($) { 417sub lock_acquire($) {
302 my ($key) = @_; 418 $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} 419}
314 420
315sub lock_active($) { 421sub lock_active($) {
316 my ($key) = @_; 422 $LOCKS->count ($_[0]) < 1
317
318 ! ! $LOCK{$key}
319} 423}
320 424
321sub freeze_mainloop { 425sub freeze_mainloop {
322 return unless $TICK_WATCHER->is_active; 426 tick_inhibit_inc;
323 427
324 my $guard = Coro::guard { 428 &Guard::guard (\&tick_inhibit_dec);
325 $TICK_WATCHER->start; 429}
326 }; 430
327 $TICK_WATCHER->stop; 431=item cf::periodic $interval, $cb
328 $guard 432
433Like EV::periodic, but randomly selects a starting point so that the actions
434get spread over time.
435
436=cut
437
438sub periodic($$) {
439 my ($interval, $cb) = @_;
440
441 my $start = rand List::Util::min 180, $interval;
442
443 EV::periodic $start, $interval, 0, $cb
329} 444}
330 445
331=item cf::get_slot $time[, $priority[, $name]] 446=item cf::get_slot $time[, $priority[, $name]]
332 447
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 448Allocate $time seconds of blocking CPU time at priority C<$priority>:
341 456
342=cut 457=cut
343 458
344our @SLOT_QUEUE; 459our @SLOT_QUEUE;
345our $SLOT_QUEUE; 460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
346 462
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 464$SLOT_QUEUE = Coro::async {
465 $Coro::current->desc ("timeslot manager");
466
349 my $signal = new Coro::Signal; 467 my $signal = new Coro::Signal;
468 my $busy;
350 469
351 while () { 470 while () {
352 next_job: 471 next_job:
472
353 my $avail = cf::till_tick; 473 my $avail = cf::till_tick;
354 if ($avail > 0.01) { 474
355 for (0 .. $#SLOT_QUEUE) { 475 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) { 476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
357 my $job = splice @SLOT_QUEUE, $_, 1, (); 478 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send; 479 $job->[2]->send;
359 Coro::cede; 480 Coro::cede;
360 goto next_job; 481 goto next_job;
361 } 482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
362 } 484 }
363 } 485 }
364 486
365 if (@SLOT_QUEUE) { 487 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 488 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 489 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 490 $signal->wait;
369 } else { 491 } else {
492 $busy = 0;
370 Coro::schedule; 493 Coro::schedule;
371 } 494 }
372 } 495 }
373}; 496};
374 497
375sub get_slot($;$$) { 498sub get_slot($;$$) {
499 return if tick_inhibit || $Coro::current == $Coro::main;
500
376 my ($time, $pri, $name) = @_; 501 my ($time, $pri, $name) = @_;
377 502
378 $time = $TICK * .6 if $time > $TICK * .6; 503 $time = clamp $time, 0.01, $TICK * .6;
504
379 my $sig = new Coro::Signal; 505 my $sig = new Coro::Signal;
380 506
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready; 509 $SLOT_QUEUE->ready;
394 520
395BEGIN { *async = \&Coro::async_pool } 521BEGIN { *async = \&Coro::async_pool }
396 522
397=item cf::sync_job { BLOCK } 523=item cf::sync_job { BLOCK }
398 524
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 525The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 526is 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 527partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable. 528acceptable.
403 529
404If it must be done, put the blocking parts into C<sync_job>. This will run 530If 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 531the given BLOCK in another coroutine while waiting for the result. The
409=cut 535=cut
410 536
411sub sync_job(&) { 537sub sync_job(&) {
412 my ($job) = @_; 538 my ($job) = @_;
413 539
414 if ($Coro::current == $Coro::main) { 540 if (in_main) {
415 my $time = Event::time; 541 my $time = AE::time;
416 542
417 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
419 545
420 # TODO: use suspend/resume instead 546 #LOG llevError, Carp::longmess "sync job";#d#
421 # (but this is cancel-safe) 547
422 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
423 549
424 my $busy = 1; 550 my $busy = 1;
425 my @res; 551 my @res;
426 552
427 (async { 553 (async {
554 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 555 @res = eval { $job->() };
429 warn $@ if $@; 556 error $@ if $@;
430 undef $busy; 557 undef $busy;
431 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
432 559
433 while ($busy) { 560 while ($busy) {
434 Coro::cede or Event::one_event; 561 if (Coro::nready) {
562 Coro::cede_notself;
563 } else {
564 EV::loop EV::LOOP_ONESHOT;
435 } 565 }
566 }
436 567
437 $time = Event::time - $time; 568 my $time = AE::time - $time;
438 569
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 570 $TICK_START += $time; # do not account sync jobs to server load
443 571
444 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
445 } else { 573 } else {
446 # we are in another coroutine, how wonderful, everything just works 574 # we are in another coroutine, how wonderful, everything just works
447 575
467 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
468 596
469 $coro 597 $coro
470} 598}
471 599
472=item fork_call { }, $args 600=item fork_call { }, @args
473 601
474Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 605never block itself or use any form of event handling.
478 606
479=cut 607=cut
608
609sub post_fork {
610 reset_signals;
611}
480 612
481sub fork_call(&@) { 613sub fork_call(&@) {
482 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
483 615
484 # we seemingly have to make a local copy of the whole thing, 616 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
487 619
488 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
489 reset_signals; 621 cf::post_fork;
490 &$cb 622 &$cb
491 }, @args; 623 } @args;
492 624
493 wantarray ? @res : $res[-1] 625 wantarray ? @res : $res[-1]
626}
627
628sub objinfo {
629 (
630 "counter value" => cf::object::object_count,
631 "objects created" => cf::object::create_count,
632 "objects destroyed" => cf::object::destroy_count,
633 "freelist size" => cf::object::free_count,
634 "allocated objects" => cf::object::objects_size,
635 "active objects" => cf::object::actives_size,
636 )
637}
638
639=item $coin = coin_from_name $name
640
641=cut
642
643our %coin_alias = (
644 "silver" => "silvercoin",
645 "silvercoin" => "silvercoin",
646 "silvercoins" => "silvercoin",
647 "gold" => "goldcoin",
648 "goldcoin" => "goldcoin",
649 "goldcoins" => "goldcoin",
650 "platinum" => "platinacoin",
651 "platinumcoin" => "platinacoin",
652 "platinumcoins" => "platinacoin",
653 "platina" => "platinacoin",
654 "platinacoin" => "platinacoin",
655 "platinacoins" => "platinacoin",
656 "royalty" => "royalty",
657 "royalties" => "royalty",
658);
659
660sub coin_from_name($) {
661 $coin_alias{$_[0]}
662 ? cf::arch::find $coin_alias{$_[0]}
663 : undef
494} 664}
495 665
496=item $value = cf::db_get $family => $key 666=item $value = cf::db_get $family => $key
497 667
498Returns a single value from the environment database. 668Returns a single value from the environment database.
500=item cf::db_put $family => $key => $value 670=item cf::db_put $family => $key => $value
501 671
502Stores the given C<$value> in the family. It can currently store binary 672Stores 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). 673data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 674
675=item $db = cf::db_table "name"
676
677Create and/or open a new database table. The string must not be "db" and must be unique
678within each server.
679
505=cut 680=cut
681
682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
686 my ($name) = @_;
687 my $db = BDB::db_create $DB_ENV;
688
689 eval {
690 $db->set_flags (BDB::CHKSUM);
691
692 utf8::encode $name;
693 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
694 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
695 cf::cleanup "db_open(db): $!" if $!;
696 };
697 cf::cleanup "db_open(db): $@" if $@;
698
699 $db
700}
506 701
507our $DB; 702our $DB;
508 703
509sub db_init { 704sub db_init {
510 unless ($DB) { 705 $DB ||= db_table "db";
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
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 }
524} 706}
525 707
526sub db_get($$) { 708sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
528 710
529 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
530 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
531 715
532 $! ? () 716 $! ? ()
533 : $data 717 : $data
534 }
535} 718}
536 719
537sub db_put($$$) { 720sub db_put($$$) {
538 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
595 778
596 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data); 780 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
599 782
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
601 784
602 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
605 788
615 798
616=cut 799=cut
617 800
618sub datalog($@) { 801sub datalog($@) {
619 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
620 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
621} 804}
622 805
623=back 806=back
624 807
625=cut 808=cut
626 809
627############################################################################# 810#############################################################################
628 811
629=head2 ATTACHABLE OBJECTS 812=head2 ATTACHABLE OBJECTS
630 813
631Many objects in crossfire are so-called attachable objects. That means you can 814Many objects in deliantra are so-called attachable objects. That means you can
632attach callbacks/event handlers (a collection of which is called an "attachment") 815attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 816to it. All such attachable objects support the following methods.
634 817
635In the following description, CLASS can be any of C<global>, C<object> 818In 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 819C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 820Deliantra).
638 821
639=over 4 822=over 4
640 823
641=item $attachable->attach ($attachment, key => $value...) 824=item $attachable->attach ($attachment, key => $value...)
642 825
686=item cf::CLASS::attachment $name, ... 869=item cf::CLASS::attachment $name, ...
687 870
688Register an attachment by C<$name> through which attachable objects of the 871Register an attachment by C<$name> through which attachable objects of the
689given CLASS can refer to this attachment. 872given CLASS can refer to this attachment.
690 873
691Some classes such as crossfire maps and objects can specify attachments 874Some classes such as deliantra maps and objects can specify attachments
692that are attached at load/instantiate time, thus the need for a name. 875that are attached at load/instantiate time, thus the need for a name.
693 876
694These calls expect any number of the following handler/hook descriptions: 877These calls expect any number of the following handler/hook descriptions:
695 878
696=over 4 879=over 4
820 1003
821 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
822 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
823 1006
824 } elsif (ref $type) { 1007 } elsif (ref $type) {
825 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
826 1009
827 } else { 1010 } else {
828 shift @arg; 1011 shift @arg;
829 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
830 } 1013 }
831 } 1014 }
832} 1015}
833 1016
834sub _object_attach { 1017sub _object_attach {
844 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
845 } 1028 }
846 1029
847 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
848 } else { 1031 } else {
849 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
850 } 1033 }
851 1034
852 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
853} 1036}
854 1037
913 1096
914 for (@$callbacks) { 1097 for (@$callbacks) {
915 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
916 1099
917 if ($@) { 1100 if ($@) {
918 warn "$@";
919 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
920 override; 1102 override;
921 } 1103 }
922 1104
923 return 1 if $override; 1105 return 1 if $override;
924 } 1106 }
925 1107
926 0 1108 0
927} 1109}
928 1110
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1111=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1112
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1113=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1114
933Generate an object-specific event with the given arguments. 1115Generate an object-specific event with the given arguments.
934 1116
940 1122
941=cut 1123=cut
942 1124
943############################################################################# 1125#############################################################################
944# object support 1126# object support
945#
946 1127
1128sub _object_equal($$);
1129sub _object_equal($$) {
1130 my ($a, $b) = @_;
1131
1132 return 0 unless (ref $a) eq (ref $b);
1133
1134 if ("HASH" eq ref $a) {
1135 my @ka = keys %$a;
1136 my @kb = keys %$b;
1137
1138 return 0 if @ka != @kb;
1139
1140 for (0 .. $#ka) {
1141 return 0 unless $ka[$_] eq $kb[$_];
1142 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1143 }
1144
1145 } elsif ("ARRAY" eq ref $a) {
1146
1147 return 0 if @$a != @$b;
1148
1149 for (0 .. $#$a) {
1150 return 0 unless _object_equal $a->[$_], $b->[$_];
1151 }
1152
1153 } elsif ($a ne $b) {
1154 return 0;
1155 }
1156
1157 1
1158}
1159
1160our $SLOW_MERGES;#d#
947sub _can_merge { 1161sub _can_merge {
948 my ($ob1, $ob2) = @_; 1162 my ($ob1, $ob2) = @_;
949 1163
950 local $Storable::canonical = 1; 1164 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1165
954 $fob1 eq $fob2 1166 # we do the slow way here
1167 return _object_equal $ob1, $ob2
955} 1168}
956 1169
957sub reattach { 1170sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1171 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1172 my ($obj) = @_;
960 1173
1174 # no longer needed after getting rid of delete_package?
961 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1175 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
962 1176
963 my $registry = $obj->registry; 1177 my $registry = $obj->registry;
964 1178
965 @$registry = (); 1179 @$registry = ();
966 1180
971 for (@$attach) { 1185 for (@$attach) {
972 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
973 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
974 } 1188 }
975 } else { 1189 } else {
976 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
977 } 1191 }
978 } 1192 }
979} 1193}
980 1194
981cf::attachable->attach ( 1195cf::attachable->attach (
982 prio => -1000000, 1196 prio => -1000000,
983 on_instantiate => sub { 1197 on_instantiate => sub {
984 my ($obj, $data) = @_; 1198 my ($obj, $data) = @_;
985 1199
986 $data = from_json $data; 1200 $data = decode_json $data;
987 1201
988 for (@$data) { 1202 for (@$data) {
989 my ($name, $args) = @$_; 1203 my ($name, $args) = @$_;
990 1204
991 $obj->attach ($name, %{$args || {} }); 1205 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1221sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1009 1223
1010 sync_job { 1224 sync_job {
1011 if (length $$rdata) { 1225 if (length $$rdata) {
1226 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1014 1230
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1232 aio_chmod $fh, SAVE_MODE;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1234 if ($cf::USE_FSYNC) {
1235 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;
1236 aio_fsync $fh;
1237 }
1019 close $fh; 1238 aio_close $fh;
1020 1239
1021 if (@$objs) { 1240 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1241 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1242 aio_chmod $fh, SAVE_MODE;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1243 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1244 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1245 if ($cf::USE_FSYNC) {
1246 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;
1247 aio_fsync $fh;
1248 }
1027 close $fh; 1249 aio_close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1250 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1251 }
1030 } else { 1252 } else {
1031 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1032 } 1254 }
1033 1255
1034 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1257
1258 $filename =~ s%/[^/]+$%%;
1259 aio_pathsync $filename if $cf::USE_FSYNC;
1035 } else { 1260 } else {
1036 warn "FATAL: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1037 } 1262 }
1038 } else { 1263 } else {
1039 aio_unlink $filename; 1264 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1041 } 1266 }
1042 } 1267 };
1043} 1268}
1044 1269
1045sub object_freezer_as_string { 1270sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1271 my ($rdata, $objs) = @_;
1047 1272
1059 or return; 1284 or return;
1060 1285
1061 unless (aio_stat "$filename.pst") { 1286 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1287 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1288 or return;
1289
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1290 my $st = eval { Coro::Storable::thaw $av };
1291 $av = $st->{objs};
1065 } 1292 }
1066 1293
1294 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1298
1069 return ($data, $av); 1299 ($data, $av)
1070} 1300}
1071 1301
1072=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
1073 1303
1074=over 4 1304=over 4
1128 my ($name, $cb) = @_; 1358 my ($name, $cb) = @_;
1129 1359
1130 $EXTICMD{$name} = $cb; 1360 $EXTICMD{$name} = $cb;
1131} 1361}
1132 1362
1363use File::Glob ();
1364
1133cf::player->attach ( 1365cf::player->attach (
1134 on_command => sub { 1366 on_unknown_command => sub {
1135 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1136 1368
1137 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1138 or return; 1370 or return;
1139 1371
1162 1394
1163 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1164 if $reply; 1396 if $reply;
1165 1397
1166 } else { 1398 } else {
1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1168 } 1400 }
1169 1401
1170 cf::override; 1402 cf::override;
1171 }, 1403 },
1172); 1404);
1173 1405
1406# "readahead" all extensions
1407sub cache_extensions {
1408 my $grp = IO::AIO::aio_group;
1409
1410 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1411 for (grep /\.ext$/, @{$_[0]}) {
1412 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1413 }
1414 };
1415
1416 $grp
1417}
1418
1174sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1175 cf::sync_job { 1422 cf::sync_job {
1176 my %todo; 1423 my %todo;
1177 1424
1178 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1179 next unless -r $path; 1426 next unless -r $path;
1197 1444
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200 1447
1201 $ext{source} = 1448 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1203 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1204 . $source 1451 . $source
1205 . "\n};\n1"; 1452 . "\n};\n1";
1206 1453
1207 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1208 } 1455 }
1209 1456
1457 my $pass = 0;
1210 my %done; 1458 my %done;
1211 while (%todo) { 1459 while (%todo) {
1212 my $progress; 1460 my $progress;
1213 1461
1462 ++$pass;
1463
1464 ext:
1214 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1215 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1216 goto skip 1467 next ext
1217 unless exists $done{$_}; 1468 unless exists $done{$_};
1218 } 1469 }
1219 1470
1220 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1221 1472
1222 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1223 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1224 : "$v->{base}: extension inactive.\n";
1225 1477
1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1226 if (exists $v->{meta}{mandatory}) { 1479 if exists $v->{meta}{mandatory};
1227 warn $msg; 1480
1228 warn "mandatory extension failed to load, exiting.\n"; 1481 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1229 exit 1; 1482 delete $todo{$k};
1230 } 1483 } else {
1231 1484 $done{$k} = delete $todo{$k};
1232 warn $msg; 1485 push @EXTS, $v->{pkg};
1486 $progress = 1;
1487
1488 info "$v->{base}: extension inactive.\n"
1489 unless $active;
1233 } 1490 }
1234
1235 $done{$k} = delete $todo{$k};
1236 push @EXTS, $v->{pkg};
1237 $progress = 1;
1238 } 1491 }
1239 1492
1240 skip: 1493 unless ($progress) {
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1242 unless $progress; 1495
1496 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory};
1499 }
1500 }
1243 } 1501 }
1244 }; 1502 };
1245} 1503}
1246 1504
1247############################################################################# 1505#############################################################################
1248 1506
1249=back 1507=back
1250 1508
1251=head2 CORE EXTENSIONS 1509=head2 CORE EXTENSIONS
1252 1510
1253Functions and methods that extend core crossfire objects. 1511Functions and methods that extend core deliantra objects.
1254 1512
1255=cut 1513=cut
1256 1514
1257package cf::player; 1515package cf::player;
1258 1516
1259use Coro::AIO; 1517use Coro::AIO;
1260 1518
1261=head3 cf::player 1519=head3 cf::player
1262 1520
1263=over 4 1521=over 4
1522
1523=item cf::player::num_playing
1524
1525Returns the official number of playing players, as per the Crossfire metaserver rules.
1526
1527=cut
1528
1529sub num_playing {
1530 scalar grep
1531 $_->ob->map
1532 && !$_->hidden
1533 && !$_->ob->flag (cf::FLAG_WIZ),
1534 cf::player::list
1535}
1264 1536
1265=item cf::player::find $login 1537=item cf::player::find $login
1266 1538
1267Returns the given player object, loading it if necessary (might block). 1539Returns the given player object, loading it if necessary (might block).
1268 1540
1287 1559
1288sub exists($) { 1560sub exists($) {
1289 my ($login) = @_; 1561 my ($login) = @_;
1290 1562
1291 $cf::PLAYER{$login} 1563 $cf::PLAYER{$login}
1292 or cf::sync_job { !aio_stat path $login } 1564 or !aio_stat path $login
1293} 1565}
1294 1566
1295sub find($) { 1567sub find($) {
1296 return $cf::PLAYER{$_[0]} || do { 1568 return $cf::PLAYER{$_[0]} || do {
1297 my $login = $_[0]; 1569 my $login = $_[0];
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1576 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1577 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1578 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1579 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1580
1309 my $pl = load_pl path $login 1581 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1582 or return;
1583
1584 my $pl = cf::player::load_pl $f
1585 or return;
1586
1587 local $cf::PLAYER_LOADING{$login} = $pl;
1588 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1312 } 1590 }
1313 } 1591 }
1314} 1592}
1593
1594cf::player->attach (
1595 on_load => sub {
1596 my ($pl, $path) = @_;
1597
1598 # restore slots saved in save, below
1599 my $slots = delete $pl->{_slots};
1600
1601 $pl->ob->current_weapon ($slots->[0]);
1602 $pl->combat_ob ($slots->[1]);
1603 $pl->ranged_ob ($slots->[2]);
1604 },
1605);
1315 1606
1316sub save($) { 1607sub save($) {
1317 my ($pl) = @_; 1608 my ($pl) = @_;
1318 1609
1319 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1323 1614
1324 return if $pl->{deny_save}; 1615 return if $pl->{deny_save};
1325 1616
1326 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1327 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1619
1620 cf::get_slot 0.01;
1621
1622 # save slots, to be restored later
1623 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1328 1624
1329 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1330 cf::cede_to_tick; 1626 cf::cede_to_tick;
1331} 1627}
1332 1628
1364 my ($pl) = @_; 1660 my ($pl) = @_;
1365 1661
1366 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1367 1663
1368 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1369 $pl->password ("*"); # this should lock out the player until we nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1370 1666
1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1372 $pl->deactivate; 1668 $pl->deactivate;
1669
1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1671 ext::highscore::check ($pl->ob);
1672
1373 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1673 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1374 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1375 1675
1376 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1377 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1416 1716
1417 for my $login (@$dirs) { 1717 for my $login (@$dirs) {
1418 my $path = path $login; 1718 my $path = path $login;
1419 1719
1420 # a .pst is a dead give-away for a valid player 1720 # a .pst is a dead give-away for a valid player
1421 unless (-e "$path.pst") { 1721 # if no pst file found, open and chekc for blocked users
1722 if (aio_stat "$path.pst") {
1422 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1723 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1423 aio_read $fh, 0, 512, my $buf, 0 or next; 1724 aio_read $fh, 0, 512, my $buf, 0 or next;
1424 $buf !~ /^password -------------$/m or next; # official not-valid tag 1725 $buf !~ /^password -------------$/m or next; # official not-valid tag
1425 } 1726 }
1426 1727
1430 1731
1431 \@logins 1732 \@logins
1432} 1733}
1433 1734
1434=item $player->maps 1735=item $player->maps
1736
1737=item cf::player::maps $login
1435 1738
1436Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1437player. May block. 1740player. May block.
1438 1741
1439=cut 1742=cut
1457 } 1760 }
1458 1761
1459 \@paths 1762 \@paths
1460} 1763}
1461 1764
1462=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1765=item $protocol_xml = $player->expand_cfpod ($cfpod)
1463 1766
1464Expand crossfire pod fragments into protocol xml. 1767Expand deliantra pod fragments into protocol xml.
1465
1466=cut
1467
1468sub expand_cfpod {
1469 ((my $self), (local $_)) = @_;
1470
1471 # escape & and <
1472 s/&/&amp;/g;
1473 s/(?<![BIUGHT])</&lt;/g;
1474
1475 # this is buggy, it needs to properly take care of nested <'s
1476
1477 1 while
1478 # replace B<>, I<>, U<> etc.
1479 s/B<([^\>]*)>/<b>$1<\/b>/
1480 || s/I<([^\>]*)>/<i>$1<\/i>/
1481 || s/U<([^\>]*)>/<u>$1<\/u>/
1482 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1483 # replace G<male|female> tags
1484 || s{G<([^>|]*)\|([^>]*)>}{
1485 $self->gender ? $2 : $1
1486 }ge
1487 # replace H<hint text>
1488 || s{H<([^\>]*)>}
1489 {
1490 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1491 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1492 "")
1493 [$self->{hintmode}]
1494 }ge;
1495
1496 # create single paragraphs (very hackish)
1497 s/(?<=\S)\n(?=\w)/ /g;
1498
1499 # compress some whitespace
1500 s/\s+\n/\n/g; # ws line-ends
1501 s/\n\n+/\n/g; # double lines
1502 s/^\n+//; # beginning lines
1503 s/\n+$//; # ending lines
1504
1505 $_
1506}
1507
1508sub hintmode {
1509 $_[0]{hintmode} = $_[1] if @_ > 1;
1510 $_[0]{hintmode}
1511}
1512 1768
1513=item $player->ext_reply ($msgid, @msg) 1769=item $player->ext_reply ($msgid, @msg)
1514 1770
1515Sends an ext reply to the player. 1771Sends an ext reply to the player.
1516 1772
1548 1804
1549=cut 1805=cut
1550 1806
1551sub find_by_path($) { 1807sub find_by_path($) {
1552 my ($path) = @_; 1808 my ($path) = @_;
1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1553 1811
1554 my ($match, $specificity); 1812 my ($match, $specificity);
1555 1813
1556 for my $region (list) { 1814 for my $region (list) {
1557 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1583our $MAX_RESET = 3600; 1841our $MAX_RESET = 3600;
1584our $DEFAULT_RESET = 3000; 1842our $DEFAULT_RESET = 3000;
1585 1843
1586sub generate_random_map { 1844sub generate_random_map {
1587 my ($self, $rmp) = @_; 1845 my ($self, $rmp) = @_;
1846
1847 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1848
1588 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1589 $self->_create_random_map ( 1850 $self->_create_random_map (
1590 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1591 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1592 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1593 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1594 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1595 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1596 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1611 1872
1612sub register { 1873sub register {
1613 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1614 my $pkg = caller; 1875 my $pkg = caller;
1615 1876
1616 no strict;
1617 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1618 1878
1619 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1620} 1880}
1621 1881
1622# also paths starting with '/' 1882# also paths starting with '/'
1623$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1624 1884
1625sub thawer_merge { 1885sub thawer_merge {
1626 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1627 1887
1628 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
1633} 1893}
1634 1894
1635sub normalise { 1895sub normalise {
1636 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1637 1897
1638 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1639 1899
1640 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1641 1901
1642 # map plan: 1902 # map plan:
1643 # 1903 #
1682 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1683 return $self; 1943 return $self;
1684 } 1944 }
1685 } 1945 }
1686 1946
1687 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1688 () 1948 ()
1689} 1949}
1690 1950
1691sub init { 1951sub init {
1692 my ($self) = @_; 1952 my ($self) = @_;
1714 1974
1715# the temporary/swap location 1975# the temporary/swap location
1716sub save_path { 1976sub save_path {
1717 my ($self) = @_; 1977 my ($self) = @_;
1718 1978
1719 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1979 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1720 "$TMPDIR/$path.map" 1980 "$TMPDIR/$path.map"
1721} 1981}
1722 1982
1723# the unique path, undef == no special unique path 1983# the unique path, undef == no special unique path
1724sub uniq_path { 1984sub uniq_path {
1725 my ($self) = @_; 1985 my ($self) = @_;
1726 1986
1727 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1987 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1728 "$UNIQUEDIR/$path" 1988 "$UNIQUEDIR/$path"
1729}
1730
1731# and all this just because we cannot iterate over
1732# all maps in C++...
1733sub change_all_map_light {
1734 my ($change) = @_;
1735
1736 $_->change_map_light ($change)
1737 for grep $_->outdoor, values %cf::MAP;
1738} 1989}
1739 1990
1740sub decay_objects { 1991sub decay_objects {
1741 my ($self) = @_; 1992 my ($self) = @_;
1742 1993
1755 2006
1756sub load_header_from($) { 2007sub load_header_from($) {
1757 my ($self, $path) = @_; 2008 my ($self, $path) = @_;
1758 2009
1759 utf8::encode $path; 2010 utf8::encode $path;
1760 #aio_open $path, O_RDONLY, 0 2011 my $f = new_from_file cf::object::thawer $path
1761 # or return;
1762
1763 $self->_load_header ($path)
1764 or return; 2012 or return;
2013
2014 $self->_load_header ($f)
2015 or return;
2016
2017 local $MAP_LOADING{$self->{path}} = $self;
2018 $f->resolve_delayed_derefs;
1765 2019
1766 $self->{load_path} = $path; 2020 $self->{load_path} = $path;
1767 2021
1768 1 2022 1
1769} 2023}
1821 2075
1822sub find; 2076sub find;
1823sub find { 2077sub find {
1824 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
1825 2079
2080 cf::cede_to_tick;
2081
1826 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
1827 2083
2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1828 cf::lock_wait "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
1829 2086
1830 $cf::MAP{$path} || do { 2087 $cf::MAP{$path} || do {
1831 my $guard = cf::lock_acquire "map_find:$path";
1832 my $map = new_from_path cf::map $path 2088 my $map = new_from_path cf::map $path
1833 or return; 2089 or return;
1834 2090
1835 $map->{last_save} = $cf::RUNTIME; 2091 $map->{last_save} = $cf::RUNTIME;
1836 2092
1838 or return; 2094 or return;
1839 2095
1840 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2096 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1841 # doing this can freeze the server in a sync job, obviously 2097 # doing this can freeze the server in a sync job, obviously
1842 #$cf::WAIT_FOR_TICK->wait; 2098 #$cf::WAIT_FOR_TICK->wait;
2099 undef $guard2;
2100 undef $guard1;
1843 $map->reset; 2101 $map->reset;
1844 undef $guard;
1845 return find $path; 2102 return find $path;
1846 } 2103 }
1847 2104
1848 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
1849 } 2106 }
1850} 2107}
1851 2108
1852sub pre_load { } 2109sub pre_load { }
1853sub post_load { } 2110#sub post_load { } # XS
1854 2111
1855sub load { 2112sub load {
1856 my ($self) = @_; 2113 my ($self) = @_;
1857 2114
1858 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
1859 2116
1860 my $path = $self->{path}; 2117 my $path = $self->{path};
1861 2118
1862 { 2119 {
1863 my $guard1 = cf::lock_acquire "map_data:$path"; 2120 my $guard = cf::lock_acquire "map_data:$path";
1864 my $guard2 = cf::lock_acquire "map_load:$path";
1865 2121
2122 return unless $self->valid;
1866 return if $self->in_memory != cf::MAP_SWAPPED; 2123 return unless $self->in_memory == cf::MAP_SWAPPED;
1867 2124
1868 $self->in_memory (cf::MAP_LOADING); 2125 $self->in_memory (cf::MAP_LOADING);
1869 2126
1870 $self->alloc; 2127 $self->alloc;
1871 2128
1872 $self->pre_load; 2129 $self->pre_load;
1873 cf::cede_to_tick; 2130 cf::cede_to_tick;
1874 2131
2132 my $f = new_from_file cf::object::thawer $self->{load_path};
2133 $f->skip_block;
1875 $self->_load_objects ($self->{load_path}, 1) 2134 $self->_load_objects ($f)
1876 or return; 2135 or return;
1877 2136
1878 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2137 $self->post_load_original
1879 if delete $self->{load_original}; 2138 if delete $self->{load_original};
1880 2139
1881 if (my $uniq = $self->uniq_path) { 2140 if (my $uniq = $self->uniq_path) {
1882 utf8::encode $uniq; 2141 utf8::encode $uniq;
1883 if (aio_open $uniq, O_RDONLY, 0) { 2142 unless (aio_stat $uniq) {
2143 if (my $f = new_from_file cf::object::thawer $uniq) {
1884 $self->clear_unique_items; 2144 $self->clear_unique_items;
1885 $self->_load_objects ($uniq, 0); 2145 $self->_load_objects ($f);
2146 $f->resolve_delayed_derefs;
2147 }
1886 } 2148 }
1887 } 2149 }
2150
2151 $f->resolve_delayed_derefs;
1888 2152
1889 cf::cede_to_tick; 2153 cf::cede_to_tick;
1890 # now do the right thing for maps 2154 # now do the right thing for maps
1891 $self->link_multipart_objects; 2155 $self->link_multipart_objects;
1892 $self->difficulty ($self->estimate_difficulty) 2156 $self->difficulty ($self->estimate_difficulty)
1896 unless ($self->{deny_activate}) { 2160 unless ($self->{deny_activate}) {
1897 $self->decay_objects; 2161 $self->decay_objects;
1898 $self->fix_auto_apply; 2162 $self->fix_auto_apply;
1899 $self->update_buttons; 2163 $self->update_buttons;
1900 cf::cede_to_tick; 2164 cf::cede_to_tick;
1901 $self->set_darkness_map;
1902 cf::cede_to_tick;
1903 $self->activate; 2165 $self->activate;
1904 } 2166 }
1905 2167
1906 $self->{last_save} = $cf::RUNTIME; 2168 $self->{last_save} = $cf::RUNTIME;
1907 $self->last_access ($cf::RUNTIME); 2169 $self->last_access ($cf::RUNTIME);
1908 2170
1909 $self->in_memory (cf::MAP_IN_MEMORY); 2171 $self->in_memory (cf::MAP_ACTIVE);
1910 } 2172 }
1911 2173
1912 $self->post_load; 2174 $self->post_load;
1913} 2175}
1914 2176
2177# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath
1915sub customise_for { 2180sub customise_for {
1916 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
1917 2182
1918 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
1919 if $self->per_player; 2184 if $self->per_player;
1935 or next; 2200 or next;
1936 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
1937 or next; 2202 or next;
1938 $neigh->load; 2203 $neigh->load;
1939 2204
2205 # now find the diagonal neighbours
1940 push @neigh, 2206 push @neigh,
1941 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1942 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1943 } 2209 }
1944 2210
1951} 2217}
1952 2218
1953sub find_sync { 2219sub find_sync {
1954 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
1955 2221
1956 cf::sync_job { find $path, $origin } 2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main;
2224
2225 find $path, $origin
1957} 2226}
1958 2227
1959sub do_load_sync { 2228sub do_load_sync {
1960 my ($map) = @_; 2229 my ($map) = @_;
1961 2230
1962 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
1963 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
1964 2233
1965 cf::sync_job { $map->load }; 2234 $map->load;
1966} 2235}
1967 2236
1968our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
1969our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
1970 2239
1972 my ($path, $origin, $load) = @_; 2241 my ($path, $origin, $load) = @_;
1973 2242
1974 $path = normalise $path, $origin && $origin->{path}; 2243 $path = normalise $path, $origin && $origin->{path};
1975 2244
1976 if (my $map = $cf::MAP{$path}) { 2245 if (my $map = $cf::MAP{$path}) {
1977 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2246 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1978 } 2247 }
1979 2248
1980 $MAP_PREFETCH{$path} |= $load; 2249 $MAP_PREFETCH{$path} |= $load;
1981 2250
1982 $MAP_PREFETCHER ||= cf::async { 2251 $MAP_PREFETCHER ||= cf::async {
2252 $Coro::current->{desc} = "map prefetcher";
2253
1983 while (%MAP_PREFETCH) { 2254 while (%MAP_PREFETCH) {
1984 while (my ($k, $v) = each %MAP_PREFETCH) { 2255 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $k) { 2256 if (my $map = find $k) {
1986 $map->load if $v; 2257 $map->load if $v;
1987 } 2258 }
1994 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
1995 2266
1996 () 2267 ()
1997} 2268}
1998 2269
2270# common code, used by both ->save and ->swapout
1999sub save { 2271sub _save {
2000 my ($self) = @_; 2272 my ($self) = @_;
2001
2002 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2273
2004 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2005 2275
2006 return unless $self->dirty; 2276 return unless $self->dirty;
2007 2277
2013 return if $self->{deny_save}; 2283 return if $self->{deny_save};
2014 2284
2015 local $self->{last_access} = $self->last_access;#d# 2285 local $self->{last_access} = $self->last_access;#d#
2016 2286
2017 cf::async { 2287 cf::async {
2288 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2289 $_->contr->save for $self->players;
2019 }; 2290 };
2291
2292 cf::get_slot 0.02;
2020 2293
2021 if ($uniq) { 2294 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2295 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2023 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2296 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2024 } else { 2297 } else {
2025 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2298 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2026 } 2299 }
2027} 2300}
2028 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2029sub swap_out { 2310sub swap_out {
2030 my ($self) = @_; 2311 my ($self) = @_;
2031 2312
2032 # save first because save cedes
2033 $self->save;
2034
2035 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2314
2315 return if $self->in_memory != cf::MAP_ACTIVE;
2316 return if $self->{deny_save};
2037 return if $self->players; 2317 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save};
2040 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # then atomically save
2325 $self->_save;
2326
2327 # then free the map
2041 $self->clear; 2328 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2329}
2044 2330
2045sub reset_at { 2331sub reset_at {
2046 my ($self) = @_; 2332 my ($self) = @_;
2047 2333
2065 2351
2066 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2352 my $lock = cf::lock_acquire "map_data:$self->{path}";
2067 2353
2068 return if $self->players; 2354 return if $self->players;
2069 2355
2070 warn "resetting map ", $self->path; 2356 cf::trace "resetting map ", $self->path, "\n";
2071 2357
2072 $self->in_memory (cf::MAP_SWAPPED); 2358 $self->in_memory (cf::MAP_SWAPPED);
2073 2359
2074 # need to save uniques path 2360 # need to save uniques path
2075 unless ($self->{deny_save}) { 2361 unless ($self->{deny_save}) {
2079 if $uniq; 2365 if $uniq;
2080 } 2366 }
2081 2367
2082 delete $cf::MAP{$self->path}; 2368 delete $cf::MAP{$self->path};
2083 2369
2370 $self->deactivate;
2371 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2372 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2373
2088 $self->unlink_save; 2374 $self->unlink_save;
2089 $self->destroy; 2375 $self->destroy;
2090} 2376}
2091 2377
2099 2385
2100 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2101 2387
2102 $self->unlink_save; 2388 $self->unlink_save;
2103 2389
2104 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2105 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2106 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2107 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2108 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2109 2395
2158 2444
2159sub unique_maps() { 2445sub unique_maps() {
2160 [ 2446 [
2161 map { 2447 map {
2162 utf8::decode $_; 2448 utf8::decode $_;
2163 /\.map$/ 2449 s/\.map$//; # TODO future compatibility hack
2450 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2451 ? ()
2164 ? normalise $_ 2452 : normalise $_
2165 : ()
2166 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2167 ] 2454 ]
2168} 2455}
2169 2456
2170package cf; 2457=item cf::map::static_maps
2458
2459Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2460file in the shared directory excluding F</styles> and F</editor>). May
2461block.
2462
2463=cut
2464
2465sub static_maps() {
2466 my @dirs = "";
2467 my @maps;
2468
2469 while (@dirs) {
2470 my $dir = shift @dirs;
2471
2472 next if $dir eq "/styles" || $dir eq "/editor";
2473
2474 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2475 or return;
2476
2477 for (@$files) {
2478 s/\.map$// or next;
2479 utf8::decode $_;
2480 push @maps, "$dir/$_";
2481 }
2482
2483 push @dirs, map "$dir/$_", @$dirs;
2484 }
2485
2486 \@maps
2487}
2171 2488
2172=back 2489=back
2173 2490
2174=head3 cf::object 2491=head3 cf::object
2175 2492
2179 2496
2180=over 4 2497=over 4
2181 2498
2182=item $ob->inv_recursive 2499=item $ob->inv_recursive
2183 2500
2184Returns the inventory of the object _and_ their inventories, recursively. 2501Returns the inventory of the object I<and> their inventories, recursively,
2502but I<not> the object itself.
2185 2503
2186=cut 2504=cut
2187 2505
2188sub inv_recursive_; 2506sub inv_recursive_;
2189sub inv_recursive_ { 2507sub inv_recursive_ {
2192 2510
2193sub inv_recursive { 2511sub inv_recursive {
2194 inv_recursive_ inv $_[0] 2512 inv_recursive_ inv $_[0]
2195} 2513}
2196 2514
2515=item $ref = $ob->ref
2516
2517Creates and returns a persistent reference to an object that can be stored as a string.
2518
2519=item $ob = cf::object::deref ($refstring)
2520
2521returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2522even if the object actually exists. May block.
2523
2524=cut
2525
2526sub deref {
2527 my ($ref) = @_;
2528
2529 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2530 my ($uuid, $name) = ($1, $2);
2531 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2532 or return;
2533 $pl->ob->uuid eq $uuid
2534 or return;
2535
2536 $pl->ob
2537 } else {
2538 warn "$ref: cannot resolve object reference\n";
2539 undef
2540 }
2541}
2542
2197package cf; 2543package cf;
2198 2544
2199=back 2545=back
2200 2546
2201=head3 cf::object::player 2547=head3 cf::object::player
2207Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2553Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2208can be C<undef>. Does the right thing when the player is currently in a 2554can be C<undef>. Does the right thing when the player is currently in a
2209dialogue with the given NPC character. 2555dialogue with the given NPC character.
2210 2556
2211=cut 2557=cut
2558
2559our $SAY_CHANNEL = {
2560 id => "say",
2561 title => "Map",
2562 reply => "say ",
2563 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2564};
2565
2566our $CHAT_CHANNEL = {
2567 id => "chat",
2568 title => "Chat",
2569 reply => "chat ",
2570 tooltip => "Player chat and shouts, global to the server.",
2571};
2212 2572
2213# rough implementation of a future "reply" method that works 2573# rough implementation of a future "reply" method that works
2214# with dialog boxes. 2574# with dialog boxes.
2215#TODO: the first argument must go, split into a $npc->reply_to ( method 2575#TODO: the first argument must go, split into a $npc->reply_to ( method
2216sub cf::object::player::reply($$$;$) { 2576sub cf::object::player::reply($$$;$) {
2228 my $dialog = $pl->{npc_dialog}; 2588 my $dialog = $pl->{npc_dialog};
2229 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2589 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2230 2590
2231 } else { 2591 } else {
2232 $msg = $npc->name . " says: $msg" if $npc; 2592 $msg = $npc->name . " says: $msg" if $npc;
2233 $self->message ($msg, $flags); 2593 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2234 } 2594 }
2235 } 2595 }
2236} 2596}
2237 2597
2238=item $object->send_msg ($channel, $msg, $color, [extra...]) 2598=item $object->send_msg ($channel, $msg, $color, [extra...])
2263 2623
2264=item $player_object->enter_link 2624=item $player_object->enter_link
2265 2625
2266Freezes the player and moves him/her to a special map (C<{link}>). 2626Freezes the player and moves him/her to a special map (C<{link}>).
2267 2627
2268The player should be reasonably safe there for short amounts of time. You 2628The player should be reasonably safe there for short amounts of time (e.g.
2269I<MUST> call C<leave_link> as soon as possible, though. 2629for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2630though, as the player cannot control the character while it is on the link
2631map.
2270 2632
2271Will never block. 2633Will never block.
2272 2634
2273=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2274 2636
2294sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2295 my ($self) = @_; 2657 my ($self) = @_;
2296 2658
2297 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2298 2660
2661 ++$self->{_link_recursion};
2662
2299 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2300 2664
2301 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2302 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2303 2667
2304 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2305} 2669}
2306 2670
2307sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2308 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2309 2673
2326 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2327 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2328 2692
2329 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2332 2696
2333 $map->load; 2697 $map->load;
2334 $map->load_neighbours; 2698 $map->load_neighbours;
2335 2699
2336 return unless $self->contr->active; 2700 return unless $self->contr->active;
2337 $self->activate_recursive;
2338 2701
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2340 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2341} 2704 # entering was successful
2705 delete $self->{_link_recursion};
2706 # only activate afterwards, to support waiting in hooks
2707 $self->activate_recursive;
2708 }
2342 2709
2710}
2711
2343=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2712=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2344 2713
2345Moves the player to the given map-path and coordinates by first freezing 2714Moves the player to the given map-path and coordinates by first freezing
2346her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2347that has to return the map if sucecssful, and then unfreezes the player on 2716that has to return the map if sucecssful, and then unfreezes the player on
2348the new (success) or old (failed) map position. In either case, $done will 2717the new (success) or old (failed) map position. In either case, $done will
2349be called at the end of this process. 2718be called at the end of this process.
2350 2719
2720Note that $check will be called with a potentially non-loaded map, so if
2721it needs a loaded map it has to call C<< ->load >>.
2722
2351=cut 2723=cut
2352 2724
2353our $GOTOGEN; 2725our $GOTOGEN;
2354 2726
2355sub cf::object::player::goto { 2727sub cf::object::player::goto {
2356 my ($self, $path, $x, $y, $check, $done) = @_; 2728 my ($self, $path, $x, $y, $check, $done) = @_;
2357 2729
2730 if ($self->{_link_recursion} >= $MAX_LINKS) {
2731 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2732 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2733 ($path, $x, $y) = @$EMERGENCY_POSITION;
2734 }
2735
2358 # do generation counting so two concurrent goto's will be executed in-order 2736 # do generation counting so two concurrent goto's will be executed in-order
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360 2738
2361 $self->enter_link; 2739 $self->enter_link;
2362 2740
2363 (async { 2741 (async {
2742 $Coro::current->{desc} = "player::goto $path $x $y";
2743
2744 # *tag paths override both path and x|y
2745 if ($path =~ /^\*(.*)$/) {
2746 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2747 my $ob = $obs[rand @obs];
2748
2749 # see if we actually can go there
2750 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2751 $ob = $obs[rand @obs];
2752 } else {
2753 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2754 }
2755 # else put us there anyways for now #d#
2756
2757 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2758 } else {
2759 ($path, $x, $y) = (undef, undef, undef);
2760 }
2761 }
2762
2364 my $map = eval { 2763 my $map = eval {
2365 my $map = cf::map::find $path; 2764 my $map = defined $path ? cf::map::find $path : undef;
2366 2765
2367 if ($map) { 2766 if ($map) {
2368 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2370 } else { 2769 } else {
2371 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2770 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2372 } 2771 }
2373 2772
2374 $map 2773 $map
2375 }; 2774 };
2376 2775
2382 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2383 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2384 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2385 } 2784 }
2386 2785
2387 $done->() if $done; 2786 $done->($self) if $done;
2388 })->prio (1); 2787 })->prio (1);
2389} 2788}
2390 2789
2391=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2392 2791
2412} 2811}
2413 2812
2414sub prepare_random_map { 2813sub prepare_random_map {
2415 my ($exit) = @_; 2814 my ($exit) = @_;
2416 2815
2417 my $guard = cf::lock_acquire "exit_prepare:$exit";
2418
2419 # all this does is basically replace the /! path by 2816 # all this does is basically replace the /! path by
2420 # a new random map path (?random/...) with a seed 2817 # a new random map path (?random/...) with a seed
2421 # that depends on the exit object 2818 # that depends on the exit object
2422 2819
2423 my $rmp = parse_random_map_params $exit->msg; 2820 my $rmp = parse_random_map_params $exit->msg;
2425 if ($exit->map) { 2822 if ($exit->map) {
2426 $rmp->{region} = $exit->region->name; 2823 $rmp->{region} = $exit->region->name;
2427 $rmp->{origin_map} = $exit->map->path; 2824 $rmp->{origin_map} = $exit->map->path;
2428 $rmp->{origin_x} = $exit->x; 2825 $rmp->{origin_x} = $exit->x;
2429 $rmp->{origin_y} = $exit->y; 2826 $rmp->{origin_y} = $exit->y;
2827
2828 $exit->map->touch;
2430 } 2829 }
2431 2830
2432 $rmp->{random_seed} ||= $exit->random_seed; 2831 $rmp->{random_seed} ||= $exit->random_seed;
2433 2832
2434 my $data = cf::to_json $rmp; 2833 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2435 my $md5 = Digest::MD5::md5_hex $data; 2834 my $md5 = Digest::MD5::md5_hex $data;
2436 my $meta = "$RANDOMDIR/$md5.meta"; 2835 my $meta = "$RANDOMDIR/$md5.meta";
2437 2836
2438 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2837 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2439 aio_write $fh, 0, (length $data), $data, 0; 2838 aio_write $fh, 0, (length $data), $data, 0;
2440 undef $fh; 2839 undef $fh;
2441 aio_rename "$meta~", $meta; 2840 aio_rename "$meta~", $meta;
2442 2841
2842 my $slaying = "?random/$md5";
2843
2844 if ($exit->valid) {
2443 $exit->slaying ("?random/$md5"); 2845 $exit->slaying ("?random/$md5");
2444 $exit->msg (undef); 2846 $exit->msg (undef);
2847 }
2445 } 2848 }
2446} 2849}
2447 2850
2448sub cf::object::player::enter_exit { 2851sub cf::object::player::enter_exit {
2449 my ($self, $exit) = @_; 2852 my ($self, $exit) = @_;
2450 2853
2451 return unless $self->type == cf::PLAYER; 2854 return unless $self->type == cf::PLAYER;
2452 2855
2453 if ($exit->slaying eq "/!") {
2454 #TODO: this should de-fi-ni-te-ly not be a sync-job
2455 # the problem is that $exit might not survive long enough
2456 # so it needs to be done right now, right here
2457 cf::sync_job { prepare_random_map $exit };
2458 }
2459
2460 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2461 my $hp = $exit->stats->hp;
2462 my $sp = $exit->stats->sp;
2463
2464 $self->enter_link; 2856 $self->enter_link;
2465 2857
2466 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED);
2469
2470 (async { 2858 (async {
2471 $self->deactivate_recursive; # just to be sure 2859 $Coro::current->{desc} = "enter_exit";
2860
2472 unless (eval { 2861 unless (eval {
2862 $self->deactivate_recursive; # just to be sure
2863
2864 # random map handling
2865 {
2866 my $guard = cf::lock_acquire "exit_prepare:$exit";
2867
2868 prepare_random_map $exit
2869 if $exit->slaying eq "/!";
2870 }
2871
2872 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2873 my $x = $exit->stats->hp;
2874 my $y = $exit->stats->sp;
2875
2473 $self->goto ($slaying, $hp, $sp); 2876 $self->goto ($map, $x, $y);
2474 2877
2878 # if exit is damned, update players death & WoR home-position
2879 $self->contr->savebed ($map, $x, $y)
2880 if $exit->flag (cf::FLAG_DAMNED);
2881
2475 1; 2882 1
2476 }) { 2883 }) {
2477 $self->message ("Something went wrong deep within the crossfire server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2478 . "I'll try to bring you back to the map you were before. " 2885 . "I'll try to bring you back to the map you were before. "
2479 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2480 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2481 2888
2482 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2483 $self->leave_link; 2890 $self->leave_link;
2484 } 2891 }
2485 })->prio (1); 2892 })->prio (1);
2486} 2893}
2487 2894
2499sub cf::client::send_drawinfo { 2906sub cf::client::send_drawinfo {
2500 my ($self, $text, $flags) = @_; 2907 my ($self, $text, $flags) = @_;
2501 2908
2502 utf8::encode $text; 2909 utf8::encode $text;
2503 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2910 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2911}
2912
2913=item $client->send_big_packet ($pkt)
2914
2915Like C<send_packet>, but tries to compress large packets, and fragments
2916them as required.
2917
2918=cut
2919
2920our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2921
2922sub cf::client::send_big_packet {
2923 my ($self, $pkt) = @_;
2924
2925 # try lzf for large packets
2926 $pkt = "lzf " . Compress::LZF::compress $pkt
2927 if 1024 <= length $pkt and $self->{can_lzf};
2928
2929 # split very large packets
2930 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2931 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2932 $pkt = "frag";
2933 }
2934
2935 $self->send_packet ($pkt);
2504} 2936}
2505 2937
2506=item $client->send_msg ($channel, $msg, $color, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2507 2939
2508Send a drawinfo or msg packet to the client, formatting the msg for the 2940Send a drawinfo or msg packet to the client, formatting the msg for the
2510the message, with C<log> being the default. If C<$color> is negative, suppress 2942the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet. 2943the message unless the client supports the msg packet.
2512 2944
2513=cut 2945=cut
2514 2946
2947# non-persistent channels (usually the info channel)
2515our %CHANNEL = ( 2948our %CHANNEL = (
2949 "c/motd" => {
2950 id => "infobox",
2951 title => "MOTD",
2952 reply => undef,
2953 tooltip => "The message of the day",
2954 },
2516 "c/identify" => { 2955 "c/identify" => {
2517 id => "identify", 2956 id => "infobox",
2518 title => "Identify", 2957 title => "Identify",
2519 reply => undef, 2958 reply => undef,
2520 tooltip => "Items recently identified", 2959 tooltip => "Items recently identified",
2521 }, 2960 },
2522 "c/examine" => { 2961 "c/examine" => {
2523 id => "examine", 2962 id => "infobox",
2524 title => "Examine", 2963 title => "Examine",
2525 reply => undef, 2964 reply => undef,
2526 tooltip => "Signs and other items you examined", 2965 tooltip => "Signs and other items you examined",
2527 }, 2966 },
2967 "c/shopinfo" => {
2968 id => "infobox",
2969 title => "Shop Info",
2970 reply => undef,
2971 tooltip => "What your bargaining skill tells you about the shop",
2972 },
2973 "c/book" => {
2974 id => "infobox",
2975 title => "Book",
2976 reply => undef,
2977 tooltip => "The contents of a note or book",
2978 },
2979 "c/lookat" => {
2980 id => "infobox",
2981 title => "Look",
2982 reply => undef,
2983 tooltip => "What you saw there",
2984 },
2985 "c/who" => {
2986 id => "infobox",
2987 title => "Players",
2988 reply => undef,
2989 tooltip => "Shows players who are currently online",
2990 },
2991 "c/body" => {
2992 id => "infobox",
2993 title => "Body Parts",
2994 reply => undef,
2995 tooltip => "Shows which body parts you posess and are available",
2996 },
2997 "c/statistics" => {
2998 id => "infobox",
2999 title => "Statistics",
3000 reply => undef,
3001 tooltip => "Shows your primary statistics",
3002 },
3003 "c/skills" => {
3004 id => "infobox",
3005 title => "Skills",
3006 reply => undef,
3007 tooltip => "Shows your experience per skill and item power",
3008 },
3009 "c/shopitems" => {
3010 id => "infobox",
3011 title => "Shop Items",
3012 reply => undef,
3013 tooltip => "Shows the items currently for sale in this shop",
3014 },
3015 "c/resistances" => {
3016 id => "infobox",
3017 title => "Resistances",
3018 reply => undef,
3019 tooltip => "Shows your resistances",
3020 },
3021 "c/pets" => {
3022 id => "infobox",
3023 title => "Pets",
3024 reply => undef,
3025 tooltip => "Shows information abotu your pets/a specific pet",
3026 },
3027 "c/perceiveself" => {
3028 id => "infobox",
3029 title => "Perceive Self",
3030 reply => undef,
3031 tooltip => "You gained detailed knowledge about yourself",
3032 },
3033 "c/uptime" => {
3034 id => "infobox",
3035 title => "Uptime",
3036 reply => undef,
3037 tooltip => "How long the server has been running since last restart",
3038 },
3039 "c/mapinfo" => {
3040 id => "infobox",
3041 title => "Map Info",
3042 reply => undef,
3043 tooltip => "Information related to the maps",
3044 },
3045 "c/party" => {
3046 id => "party",
3047 title => "Party",
3048 reply => "gsay ",
3049 tooltip => "Messages and chat related to your party",
3050 },
3051 "c/death" => {
3052 id => "death",
3053 title => "Death",
3054 reply => undef,
3055 tooltip => "Reason for and more info about your most recent death",
3056 },
3057 "c/say" => $SAY_CHANNEL,
3058 "c/chat" => $CHAT_CHANNEL,
2528); 3059);
2529 3060
2530sub cf::client::send_msg { 3061sub cf::client::send_msg {
2531 my ($self, $channel, $msg, $color, @extra) = @_; 3062 my ($self, $channel, $msg, $color, @extra) = @_;
2532 3063
2533 $msg = $self->pl->expand_cfpod ($msg); 3064 $msg = $self->pl->expand_cfpod ($msg)
3065 unless $color & cf::NDI_VERBATIM;
2534 3066
2535 $color &= cf::NDI_CLIENT_MASK; # just in case... 3067 $color &= cf::NDI_CLIENT_MASK; # just in case...
2536 3068
2537 # check predefined channels, for the benefit of C 3069 # check predefined channels, for the benefit of C
2538 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3070 if ($CHANNEL{$channel}) {
3071 $channel = $CHANNEL{$channel};
2539 3072
3073 $self->ext_msg (channel_info => $channel);
3074 $channel = $channel->{id};
3075
2540 if (ref $channel) { 3076 } elsif (ref $channel) {
2541 # send meta info to client, if not yet sent 3077 # send meta info to client, if not yet sent
2542 unless (exists $self->{channel}{$channel->{id}}) { 3078 unless (exists $self->{channel}{$channel->{id}}) {
2543 $self->{channel}{$channel->{id}} = $channel; 3079 $self->{channel}{$channel->{id}} = $channel;
2544 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2545 if $self->can_msg;
2546 } 3081 }
2547 3082
2548 $channel = $channel->{id}; 3083 $channel = $channel->{id};
2549 } 3084 }
2550 3085
2551 return unless @extra || length $msg; 3086 return unless @extra || length $msg;
2552 3087
2553 if ($self->can_msg) {
2554 # default colour, mask it out 3088 # default colour, mask it out
2555 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3089 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2556 if $color & cf::NDI_DEF; 3090 if $color & cf::NDI_DEF;
2557 3091
2558 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3092 my $pkt = "msg "
3093 . $self->{json_coder}->encode (
2559 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2560 } else { 3095 );
2561 if ($color >= 0) {
2562 # replace some tags by gcfclient-compatible ones
2563 for ($msg) {
2564 1 while
2565 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2566 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2567 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2568 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2569 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2570 }
2571 3096
2572 $color &= cf::NDI_COLOR_MASK; 3097 $self->send_big_packet ($pkt);
2573
2574 utf8::encode $msg;
2575
2576 if (0 && $msg =~ /\[/) {
2577 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg")
2582 }
2583 }
2584 }
2585} 3098}
2586 3099
2587=item $client->ext_msg ($type, @msg) 3100=item $client->ext_msg ($type, @msg)
2588 3101
2589Sends an ext event to the client. 3102Sends an ext event to the client.
2592 3105
2593sub cf::client::ext_msg($$@) { 3106sub cf::client::ext_msg($$@) {
2594 my ($self, $type, @msg) = @_; 3107 my ($self, $type, @msg) = @_;
2595 3108
2596 if ($self->extcmd == 2) { 3109 if ($self->extcmd == 2) {
2597 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2598 } elsif ($self->extcmd == 1) { # TODO: remove 3111 } elsif ($self->extcmd == 1) { # TODO: remove
2599 push @msg, msgtype => "event_$type"; 3112 push @msg, msgtype => "event_$type";
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2601 } 3114 }
2602} 3115}
2603 3116
2604=item $client->ext_reply ($msgid, @msg) 3117=item $client->ext_reply ($msgid, @msg)
2605 3118
2609 3122
2610sub cf::client::ext_reply($$@) { 3123sub cf::client::ext_reply($$@) {
2611 my ($self, $id, @msg) = @_; 3124 my ($self, $id, @msg) = @_;
2612 3125
2613 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2614 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2615 } elsif ($self->extcmd == 1) { 3128 } elsif ($self->extcmd == 1) {
2616 #TODO: version 1, remove 3129 #TODO: version 1, remove
2617 unshift @msg, msgtype => "reply", msgid => $id; 3130 unshift @msg, msgtype => "reply", msgid => $id;
2618 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2619 } 3132 }
2620} 3133}
2621 3134
2622=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2623 3136
2694 3207
2695 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
2696 if $reply; 3209 if $reply;
2697 3210
2698 } else { 3211 } else {
2699 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3212 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2700 } 3213 }
2701 3214
2702 cf::override; 3215 cf::override;
2703 }, 3216 },
2704); 3217);
2724 3237
2725 $coro 3238 $coro
2726} 3239}
2727 3240
2728cf::client->attach ( 3241cf::client->attach (
2729 on_destroy => sub { 3242 on_client_destroy => sub {
2730 my ($ns) = @_; 3243 my ($ns) = @_;
2731 3244
2732 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2733 }, 3246 },
2734); 3247);
2750our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
2751 3264
2752$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
2753 3266
2754$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
2755 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
2756 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
2757 sort time 3270 sort time
2758)); 3271));
2759 3272
2760# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
2762=pod 3275=pod
2763 3276
2764The following functions and methods are available within a safe environment: 3277The following functions and methods are available within a safe environment:
2765 3278
2766 cf::object 3279 cf::object
2767 contr pay_amount pay_player map x y force_find force_add 3280 contr pay_amount pay_player map x y force_find force_add destroy
2768 insert remove name archname title slaying race decrease_ob_nr 3281 insert remove name archname title slaying race decrease split
3282 value
2769 3283
2770 cf::object::player 3284 cf::object::player
2771 player 3285 player
2772 3286
2773 cf::player 3287 cf::player
2778 3292
2779=cut 3293=cut
2780 3294
2781for ( 3295for (
2782 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3296 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2783 insert remove inv name archname title slaying race 3297 insert remove inv nrof name archname title slaying race
2784 decrease_ob_nr)], 3298 decrease split destroy change_exp value msg lore send_msg)],
2785 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
2786 ["cf::player" => qw(peaceful)], 3300 ["cf::player" => qw(peaceful send_msg)],
2787 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
2788) { 3302) {
2789 no strict 'refs';
2790 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
2791 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2792 for @funs; 3305 for @funs;
2793} 3306}
2794 3307
2809 3322
2810 my $qcode = $code; 3323 my $qcode = $code;
2811 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2812 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
2813 3326
3327 %vars = (_dummy => 0) unless %vars;
3328
3329 my @res;
2814 local $_; 3330 local $_;
2815 local @safe::cf::_safe_eval_args = values %vars;
2816 3331
2817 my $eval = 3332 my $eval =
2818 "do {\n" 3333 "do {\n"
2819 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2820 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
2821 . $code 3336 . $code
2822 . "\n}" 3337 . "\n}"
2823 ; 3338 ;
2824 3339
3340 if ($CFG{safe_eval}) {
2825 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
2826 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2827 sub_generation_inc; 3344 sub_generation_inc;
3345 } else {
3346 local @cf::_safe_eval_args = values %vars;
3347 @res = wantarray ? eval eval : scalar eval $eval;
3348 }
2828 3349
2829 if ($@) { 3350 if ($@) {
2830 warn "$@"; 3351 warn "$@",
2831 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
2832 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
2833 } 3354 }
2834 3355
2835 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
2836} 3357}
2837 3358
2851=cut 3372=cut
2852 3373
2853sub register_script_function { 3374sub register_script_function {
2854 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
2855 3376
2856 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
2857 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
2858} 3379}
2859 3380
2860=back 3381=back
2861 3382
2862=cut 3383=cut
2871 # for this (global event?) 3392 # for this (global event?)
2872 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
2873 3394
2874 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2875 3396
2876 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
2877 3398
2878 my $facedata;
2879 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
2880 or die "$path: $!"; 3400 or die "$path: $!";
2881 3401
2882 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
2883 3403
2884 $facedata->{version} == 2 3404 $facedata->{version} == 2
2885 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
2886 3406
2887 # patch in the exptable 3407 # patch in the exptable
3408 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2888 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
2889 type => FT_RSRC, 3410 type => FT_RSRC,
2890 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3411 data => $exp_table,
3412 hash => (Digest::MD5::md5 $exp_table),
2891 }; 3413 };
2892 cf::cede_to_tick; 3414 cf::cede_to_tick;
2893 3415
2894 { 3416 {
2895 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
2896 3418
2897 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
2898 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3421
2899 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
2900 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
2901 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2902 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2903 3426
2904 cf::cede_to_tick; 3427 cf::cede_to_tick;
2905 } 3428 }
2906 3429
2907 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
2908 next unless $info->{smooth}; 3431 next unless $info->{smooth};
3432
2909 my $idx = cf::face::find $face 3433 my $idx = cf::face::find $face
2910 or next; 3434 or next;
3435
2911 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
2912 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
2913 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2914 } else { 3439 } else {
2915 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
2916 } 3441 }
2917 3442
2918 cf::cede_to_tick; 3443 cf::cede_to_tick;
2919 } 3444 }
2920 } 3445 }
2929 3454
2930 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
2931 } 3456 }
2932 3457
2933 { 3458 {
2934 # TODO: for gcfclient pleasure, we should give resources
2935 # that gcfclient doesn't grok a >10000 face index.
2936 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
2937 3460
2938 my $soundconf = delete $res->{"res/sound.conf"};
2939
2940 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3462 if (defined $info->{type}) {
2941 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2942 my $data;
2943 3464
2944 if ($info->{type} & 1) { 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2945 # prepend meta info 3466 cf::face::set_type $idx, $info->{type};
2946
2947 my $meta = $enc->encode ({
2948 name => $name,
2949 %{ $info->{meta} || {} },
2950 });
2951
2952 $data = pack "(w/a*)*", $meta, $info->{data};
2953 } else { 3467 } else {
2954 $data = $info->{data}; 3468 $RESOURCE{$name} = $info; # unused
2955 } 3469 }
2956 3470
2957 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2958 cf::face::set_type $idx, $info->{type};
2959
2960 cf::cede_to_tick; 3471 cf::cede_to_tick;
2961 } 3472 }
2962
2963 if ($soundconf) {
2964 $soundconf = $enc->decode (delete $soundconf->{data});
2965
2966 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2967 my $sound = $soundconf->{compat}[$_]
2968 or next;
2969
2970 my $face = cf::face::find "sound/$sound->[1]";
2971 cf::sound::set $sound->[0] => $face;
2972 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2973 }
2974
2975 while (my ($k, $v) = each %{$soundconf->{event}}) {
2976 my $face = cf::face::find "sound/$v";
2977 cf::sound::set $k => $face;
2978 }
2979 }
2980 } 3473 }
3474
3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2981 3476
2982 1 3477 1
2983} 3478}
2984 3479
2985register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
2987 3482
2988 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
2989 $ns->fx_want ($k, $v); 3484 $ns->fx_want ($k, $v);
2990 } 3485 }
2991}; 3486};
3487
3488sub load_resource_file($) {
3489 my $guard = lock_acquire "load_resource_file";
3490
3491 my $status = load_resource_file_ $_[0];
3492 get_slot 0.1, 100;
3493 cf::arch::commit_load;
3494
3495 $status
3496}
2992 3497
2993sub reload_regions { 3498sub reload_regions {
2994 # HACK to clear player env face cache, we need some signal framework 3499 # HACK to clear player env face cache, we need some signal framework
2995 # for this (global event?) 3500 # for this (global event?)
2996 %ext::player_env::MUSIC_FACE_CACHE = (); 3501 %ext::player_env::MUSIC_FACE_CACHE = ();
3010} 3515}
3011 3516
3012sub reload_archetypes { 3517sub reload_archetypes {
3013 load_resource_file "$DATADIR/archetypes" 3518 load_resource_file "$DATADIR/archetypes"
3014 or die "unable to load archetypes\n"; 3519 or die "unable to load archetypes\n";
3015 #d# NEED to laod twice to resolve forward references
3016 # this really needs to be done in an extra post-pass
3017 # (which needs to be synchronous, so solve it differently)
3018 load_resource_file "$DATADIR/archetypes"
3019 or die "unable to load archetypes\n";
3020} 3520}
3021 3521
3022sub reload_treasures { 3522sub reload_treasures {
3023 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3024 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3025} 3525}
3026 3526
3527sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n";
3529
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3534
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_]
3537 or next;
3538
3539 my $face = cf::face::find "sound/$sound->[1]";
3540 cf::sound::set $sound->[0] => $face;
3541 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3542 }
3543
3544 while (my ($k, $v) = each %{$soundconf->{event}}) {
3545 my $face = cf::face::find "sound/$v";
3546 cf::sound::set $k => $face;
3547 }
3548}
3549
3027sub reload_resources { 3550sub reload_resources {
3028 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3029 3552
3553 reload_exp_table;
3554 reload_materials;
3555 reload_facedata;
3556 reload_sound;
3557 reload_archetypes;
3030 reload_regions; 3558 reload_regions;
3031 reload_facedata;
3032 #reload_archetypes;#d#
3033 reload_archetypes;
3034 reload_treasures; 3559 reload_treasures;
3035 3560
3036 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3037}
3038
3039sub init {
3040 reload_resources;
3041} 3562}
3042 3563
3043sub reload_config { 3564sub reload_config {
3044 open my $fh, "<:utf8", "$CONFDIR/config" 3565 trace "reloading config file...\n";
3045 or return;
3046 3566
3047 local $/; 3567 0 < aio_load "$CONFDIR/config", my $config
3048 *CFG = YAML::Syck::Load <$fh>; 3568 or die "$CONFDIR/config: $!";
3049 3569
3570 utf8::decode $config;
3571 *CFG = yaml_load $config;
3572
3050 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3051 3574
3052 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3053 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3054 3577
3055 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
3059 }; 3582 };
3060 warn $@ if $@; 3583 warn $@ if $@;
3061 } 3584 }
3062} 3585}
3063 3586
3587sub pidfile() {
3588 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3589 or die "$PIDFILE: $!";
3590 flock $fh, &Fcntl::LOCK_EX
3591 or die "$PIDFILE: flock: $!";
3592 $fh
3593}
3594
3595# make sure only one server instance is running at any one time
3596sub atomic {
3597 my $fh = pidfile;
3598
3599 my $pid = <$fh>;
3600 kill 9, $pid if $pid > 0;
3601
3602 seek $fh, 0, 0;
3603 print $fh $$;
3604}
3605
3606sub main_loop {
3607 trace "EV::loop starting\n";
3608 if (1) {
3609 EV::loop;
3610 }
3611 trace "EV::loop returned\n";
3612 goto &main_loop unless $REALLY_UNLOOP;
3613}
3614
3064sub main { 3615sub main {
3616 cf::init_globals; # initialise logging
3617
3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622
3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3624
3065 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3066 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
3067 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3627 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3068 (async { 3628 (async {
3069 Event::one_event; 3629 $Coro::current->{desc} = "IDLE BUG HANDLER";
3630 EV::loop EV::LOOP_ONESHOT;
3070 })->prio (Coro::PRIO_MAX); 3631 })->prio (Coro::PRIO_MAX);
3071 }; 3632 };
3072 3633
3634 evthread_start IO::AIO::poll_fileno;
3635
3636 cf::sync_job {
3637 cf::incloader::init ();
3638
3639 cf::init_anim;
3640 cf::init_attackmess;
3641 cf::init_dynamic;
3642
3643 cf::load_settings;
3644
3645 reload_resources;
3073 reload_config; 3646 reload_config;
3074 db_init; 3647 db_init;
3648
3649 cf::init_uuid;
3650 cf::init_signals;
3651 cf::init_skills;
3652
3653 cf::init_beforeplay;
3654
3655 atomic;
3656
3075 load_extensions; 3657 load_extensions;
3076 3658
3077 $TICK_WATCHER->start; 3659 utime time, time, $RUNTIMEFILE;
3078 Event::loop; 3660
3661 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX ();
3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3664
3665 (pop @POST_INIT)->(0) while @POST_INIT;
3666 };
3667
3668 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n";
3670
3671 my $free_main; $free_main = EV::idle sub {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :)
3674 };
3675
3676 goto &main_loop;
3079} 3677}
3080 3678
3081############################################################################# 3679#############################################################################
3082# initialisation and cleanup 3680# initialisation and cleanup
3083 3681
3084# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3085BEGIN { 3683BEGIN {
3684 our %SIGWATCHER = ();
3086 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3087 Event->signal ( 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3088 reentrant => 0,
3089 data => WF_AUTOCANCEL,
3090 signal => $signal,
3091 prio => 0,
3092 cb => sub {
3093 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3094 },
3095 ); 3688 };
3096 } 3689 }
3097} 3690}
3098 3691
3099sub write_runtime { 3692sub write_runtime_sync {
3100 my $runtime = "$LOCALDIR/runtime"; 3693 my $t0 = AE::time;
3101 3694
3102 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3103 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3104 3697
3105 IO::AIO::aio_utime $runtime, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3106 3699
3107 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3108 3701
3109 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3110 or return; 3703 or return;
3111 3704
3112 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3113 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3114 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
3124 aio_utime $fh, undef, undef; 3717 aio_utime $fh, undef, undef;
3125 3718
3126 close $fh 3719 close $fh
3127 or return; 3720 or return;
3128 3721
3129 aio_rename "$runtime~", $runtime 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3130 and return; 3723 and return;
3131 3724
3132 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3133 3726
3134 1 3727 1
3728}
3729
3730our $uuid_lock;
3731our $uuid_skip;
3732
3733sub write_uuid_sync($) {
3734 $uuid_skip ||= $_[0];
3735
3736 return if $uuid_lock;
3737 local $uuid_lock = 1;
3738
3739 my $uuid = "$LOCALDIR/uuid";
3740
3741 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3742 or return;
3743
3744 my $value = uuid_seq uuid_cur;
3745
3746 unless ($value) {
3747 info "cowardly refusing to write zero uuid value!\n";
3748 return;
3749 }
3750
3751 my $value = uuid_str $value + $uuid_skip;
3752 $uuid_skip = 0;
3753
3754 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3755 and return;
3756
3757 # always fsync - this file is important
3758 aio_fsync $fh
3759 and return;
3760
3761 close $fh
3762 or return;
3763
3764 aio_rename "$uuid~", $uuid
3765 and return;
3766
3767 trace "uuid file written ($value).\n";
3768
3769 1
3770
3771}
3772
3773sub write_uuid($$) {
3774 my ($skip, $sync) = @_;
3775
3776 $sync ? write_uuid_sync $skip
3777 : async { write_uuid_sync $skip };
3135} 3778}
3136 3779
3137sub emergency_save() { 3780sub emergency_save() {
3138 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3139 3782
3140 warn "enter emergency perl save\n"; 3783 info "emergency_perl_save: enter\n";
3784
3785 # this is a trade-off: we want to be very quick here, so
3786 # save all maps without fsync, and later call a global sync
3787 # (which in turn might be very very slow)
3788 local $USE_FSYNC = 0;
3141 3789
3142 cf::sync_job { 3790 cf::sync_job {
3791 cf::write_runtime_sync; # external watchdog should not bark
3792
3143 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3144 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3145 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3146 warn "begin emergency player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3147 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3148 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3149 $pl->valid or next; 3799 $pl->valid or next;
3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3150 $pl->save; 3801 $pl->save;
3151 } 3802 }
3152 warn "end emergency player save\n"; 3803 info "emergency_perl_save: end player save\n";
3153 3804
3154 warn "begin emergency map save\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin map save\n";
3155 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3156 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3157 $map->valid or next; 3810 $map->valid or next;
3158 $map->save; 3811 $map->save;
3159 } 3812 }
3160 warn "end emergency map save\n"; 3813 info "emergency_perl_save: end map save\n";
3161 3814
3162 warn "begin emergency database checkpoint\n"; 3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 info "emergency_perl_save: begin database checkpoint\n";
3163 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3164 warn "end emergency database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3820
3821 info "emergency_perl_save: begin write uuid\n";
3822 write_uuid_sync 1;
3823 info "emergency_perl_save: end write uuid\n";
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: syncing database to disk";
3828 BDB::db_env_txn_checkpoint $DB_ENV;
3829
3830 info "emergency_perl_save: starting sync\n";
3831 IO::AIO::aio_sync sub {
3832 info "emergency_perl_save: finished sync\n";
3833 };
3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3840 }
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3165 }; 3843 };
3166 3844
3167 warn "leave emergency perl save\n"; 3845 info "emergency_perl_save: leave\n";
3168} 3846}
3169 3847
3170sub post_cleanup { 3848sub post_cleanup {
3171 my ($make_core) = @_; 3849 my ($make_core) = @_;
3172 3850
3851 IO::AIO::flush;
3852
3173 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3174 if $make_core; 3854 if $make_core;
3855
3856 my $fh = pidfile;
3857 unlink $PIDFILE if <$fh> == $$;
3858}
3859
3860# a safer delete_package, copied from Symbol
3861sub clear_package($) {
3862 my $pkg = shift;
3863
3864 # expand to full symbol table name if needed
3865 unless ($pkg =~ /^main::.*::$/) {
3866 $pkg = "main$pkg" if $pkg =~ /^::/;
3867 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3868 $pkg .= '::' unless $pkg =~ /::$/;
3869 }
3870
3871 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3872 my $stem_symtab = *{$stem}{HASH};
3873
3874 defined $stem_symtab and exists $stem_symtab->{$leaf}
3875 or return;
3876
3877 # clear all symbols
3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3879 for my $name (keys %$leaf_symtab) {
3880 _gv_clear *{"$pkg$name"};
3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3882 }
3175} 3883}
3176 3884
3177sub do_reload_perl() { 3885sub do_reload_perl() {
3178 # can/must only be called in main 3886 # can/must only be called in main
3179 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3180 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3181 return; 3889 return;
3182 } 3890 }
3183 3891
3892 return if $RELOAD++;
3893
3894 my $t1 = AE::time;
3895
3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3184 warn "reloading..."; 3898 info "reloading...";
3185 3899
3186 warn "entering sync_job"; 3900 trace "entering sync_job";
3187 3901
3188 cf::sync_job { 3902 cf::sync_job {
3189 cf::write_runtime; # external watchdog should not bark
3190 cf::emergency_save; 3903 #cf::emergency_save;
3191 cf::write_runtime; # external watchdog should not bark
3192 3904
3193 warn "syncing database to disk";
3194 BDB::db_env_txn_checkpoint $DB_ENV;
3195
3196 # if anything goes wrong in here, we should simply crash as we already saved
3197
3198 warn "cancelling all WF_AUTOCANCEL watchers";
3199 for (Event::all_watchers) {
3200 $_->cancel if $_->data & WF_AUTOCANCEL;
3201 }
3202
3203 warn "flushing outstanding aio requests";
3204 for (;;) {
3205 BDB::flush;
3206 IO::AIO::flush;
3207 Coro::cede;
3208 last unless IO::AIO::nreqs || BDB::nreqs;
3209 warn "iterate...";
3210 }
3211
3212 ++$RELOAD;
3213
3214 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3215 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3216 %EXT_CORO = (); 3907 %EXT_CORO = ();
3217 3908
3218 warn "removing commands"; 3909 trace "removing commands";
3219 %COMMAND = (); 3910 %COMMAND = ();
3220 3911
3221 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3222 %EXTCMD = (); 3913 %EXTCMD = ();
3223 %EXTICMD = (); 3914 %EXTICMD = ();
3224 3915
3225 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3226 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3227 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3228 3919
3229 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3230 eval { 3921 eval {
3231 $cb->($pkg); 3922 $cb->($pkg);
3232 1 3923 1
3233 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3925 }
3926
3927 trace "... clearing $pkg";
3928 clear_package $pkg;
3234 } 3929 }
3235 3930
3236 warn "... nuking $pkg";
3237 Symbol::delete_package $pkg;
3238 }
3239
3240 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3241 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3242 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3243 3934
3244 warn "... unloading $k"; 3935 trace "... unloading $k";
3245 delete $INC{$k}; 3936 delete $INC{$k};
3246 3937
3247 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3248 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3249 3940
3250 if (my $cb = $k->can ("unload_module")) { 3941 if (my $cb = $k->can ("unload_module")) {
3251 $cb->(); 3942 $cb->();
3943 }
3944
3945 clear_package $k;
3252 } 3946 }
3253 3947
3254 Symbol::delete_package $k;
3255 }
3256
3257 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3258 Symbol::delete_package "safe::$_" 3949 clear_package "safe::$_"
3259 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3260 3951
3261 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3262 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3263 delete $INC{"cf/pod.pm"}; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3264 3955
3265 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3266 # and global variables created in xs 3957 # and global variables created in xs
3267 #Symbol::delete_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3268 3959
3269 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3270 3961
3271 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3272 require cf; 3963 require cf;
3273 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3964 cf::_connect_to_perl_1;
3274 3965
3275 warn "loading config and database again"; 3966 trace "loading config and database again";
3276 cf::reload_config; 3967 cf::reload_config;
3277 3968
3278 warn "loading extensions"; 3969 trace "loading extensions";
3279 cf::load_extensions; 3970 cf::load_extensions;
3280 3971
3972 if ($REATTACH_ON_RELOAD) {
3281 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3282 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3283 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3284 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3285 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3286 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3979 }
3287 3980
3981 trace "running post_init jobs";
3982 (pop @POST_INIT)->(1) while @POST_INIT;
3983
3288 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3289 3985
3290 1 3986 1
3291 } or do { 3987 } or do {
3292 warn $@; 3988 error $@;
3293 warn "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3294 exit 1; 3990 };
3991
3992 info "reloaded";
3993 --$RELOAD;
3295 }; 3994 }
3296 3995
3297 warn "reloaded"; 3996 $t1 = AE::time - $t1;
3997 info "reload completed in ${t1}s\n";
3298}; 3998};
3299 3999
3300our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3301 4001
3302sub reload_perl() { 4002sub reload_perl() {
3303 # doing reload synchronously and two reloads happen back-to-back, 4003 # doing reload synchronously and two reloads happen back-to-back,
3304 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3305 4005
3306 $RELOAD_WATCHER ||= Event->timer ( 4006 $RELOAD_WATCHER ||= cf::async {
3307 reentrant => 0, 4007 Coro::AIO::aio_wait cache_extensions;
3308 after => 0, 4008
3309 data => WF_AUTOCANCEL, 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3310 cb => sub {
3311 do_reload_perl; 4010 do_reload_perl;
3312 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
3313 }, 4012 };
3314 ); 4013 };
3315} 4014}
3316 4015
3317register_command "reload" => sub { 4016register_command "reload" => sub {
3318 my ($who, $arg) = @_; 4017 my ($who, $arg) = @_;
3319 4018
3320 if ($who->flag (FLAG_WIZ)) { 4019 if ($who->flag (FLAG_WIZ)) {
3321 $who->message ("reloading server."); 4020 $who->message ("reloading server.");
4021 async {
4022 $Coro::current->{desc} = "perl_reload";
3322 async { reload_perl }; 4023 reload_perl;
4024 };
3323 } 4025 }
3324}; 4026};
3325 4027
3326unshift @INC, $LIBDIR; 4028#############################################################################
3327 4029
3328my $bug_warning = 0; 4030my $bug_warning = 0;
3329 4031
3330our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3331our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3332 4034
3333sub wait_for_tick { 4035sub wait_for_tick() {
3334 return unless $TICK_WATCHER->is_active;
3335 return if $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3336 4037
3337 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3338 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3339 $signal->wait; 4040 $signal->wait;
3340} 4041}
3341 4042
3342sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3343 return unless $TICK_WATCHER->is_active;
3344 return if $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3345 4045
3346 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3347 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3348 $signal->wait; 4048 $signal->wait;
3349} 4049}
3350 4050
3351 my $min = 1e6;#d# 4051sub tick {
3352 my $avg = 10;
3353$TICK_WATCHER = Event->timer (
3354 reentrant => 0,
3355 parked => 1,
3356 prio => 0,
3357 at => $NEXT_TICK || $TICK,
3358 data => WF_AUTOCANCEL,
3359 cb => sub {
3360 if ($Coro::current != $Coro::main) { 4052 if ($Coro::current != $Coro::main) {
3361 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4053 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3362 unless ++$bug_warning > 10; 4054 unless ++$bug_warning > 10;
3363 return; 4055 return;
3364 } 4056 }
3365 4057
3366 $NOW = $tick_start = Event::time;
3367
3368 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3369 4059
3370 0 && sync_job {#d# 4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3371 for(1..10) {
3372 my $t = Event::time;
3373 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3374 or die;
3375 4061
3376 $map->width (50); 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3377 $map->height (50); 4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3378 $map->alloc; 4064 Coro::async_pool {
3379 $map->_load_objects ("/tmp/x.map", 1); 4065 $Coro::current->{desc} = "runtime saver";
3380 my $t = Event::time - $t; 4066 write_runtime_sync
3381 4067 or error "ERROR: unable to write runtime file: $!";
3382 #next unless $t < 0.0013;#d#
3383 if ($t < $min) {
3384 $min = $t;
3385 }
3386 $avg = $avg * 0.99 + $t * 0.01;
3387 }
3388 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3389 exit 0;
3390 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3391 }; 4068 };
4069 }
3392 4070
3393 $RUNTIME += $TICK;
3394 $NEXT_TICK += $TICK;
3395
3396 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3397 $NEXT_RUNTIME_WRITE = $NOW + 10;
3398 Coro::async_pool {
3399 write_runtime
3400 or warn "ERROR: unable to write runtime file: $!";
3401 };
3402 }
3403
3404# my $AFTER = Event::time;
3405# warn $AFTER - $NOW;#d#
3406
3407 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3408 $sig->send; 4072 $sig->send;
3409 } 4073 }
3410 while (my $sig = shift @WAIT_FOR_TICK) { 4074 while (my $sig = shift @WAIT_FOR_TICK) {
3411 $sig->send; 4075 $sig->send;
3412 } 4076 }
3413 4077
3414 $NOW = Event::time; 4078 $LOAD = ($NOW - $TICK_START) / $TICK;
3415
3416 # if we are delayed by four ticks or more, skip them all
3417 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3418
3419 $TICK_WATCHER->at ($NEXT_TICK);
3420 $TICK_WATCHER->start;
3421
3422 $LOAD = ($NOW - $tick_start) / $TICK;
3423 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4079 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3424 4080
3425 _post_tick; 4081 if (0) {
3426 4082 if ($NEXT_TICK) {
3427 4083 my $jitter = $TICK_START - $NEXT_TICK;
4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4085 debug "jitter $JITTER\n";#d#
4086 }
3428 }, 4087 }
3429); 4088}
3430 4089
3431{ 4090{
3432 BDB::max_poll_time $TICK * 0.1; 4091 # configure BDB
3433 $BDB_POLL_WATCHER = Event->io ( 4092
3434 reentrant => 0,
3435 fd => BDB::poll_fileno,
3436 poll => 'r',
3437 prio => 0,
3438 data => WF_AUTOCANCEL,
3439 cb => \&BDB::poll_cb,
3440 );
3441 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3442 4094 BDB::max_poll_reqs $TICK * 0.1;
3443 BDB::set_sync_prepare { 4095 $AnyEvent::BDB::WATCHER->priority (1);
3444 my $status;
3445 my $current = $Coro::current;
3446 (
3447 sub {
3448 $status = $!;
3449 $current->ready; undef $current;
3450 },
3451 sub {
3452 Coro::schedule while defined $current;
3453 $! = $status;
3454 },
3455 )
3456 };
3457 4096
3458 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3459 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;
4099 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4100 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4101 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4102 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4103 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3460 4104
3461 cf::sync_job { 4105 cf::sync_job {
3462 eval { 4106 eval {
3463 BDB::db_env_open 4107 BDB::db_env_open
3464 $DB_ENV, 4108 $DB_ENV,
3466 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4110 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3467 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4111 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3468 0666; 4112 0666;
3469 4113
3470 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4114 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3471
3472 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3473 $DB_ENV->set_lk_detect;
3474 }; 4115 };
3475 4116
3476 cf::cleanup "db_env_open(db): $@" if $@; 4117 cf::cleanup "db_env_open(db): $@" if $@;
3477 }; 4118 };
3478 } 4119 }
4120
4121 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4122 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4123 };
4124 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4125 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4126 };
4127 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4128 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4129 };
3479} 4130}
3480 4131
3481{ 4132{
4133 # configure IO::AIO
4134
3482 IO::AIO::min_parallel 8; 4135 IO::AIO::min_parallel 8;
3483
3484 undef $Coro::AIO::WATCHER;
3485 IO::AIO::max_poll_time $TICK * 0.1; 4136 IO::AIO::max_poll_time $TICK * 0.1;
3486 $AIO_POLL_WATCHER = Event->io ( 4137 undef $AnyEvent::AIO::WATCHER;
3487 reentrant => 0,
3488 data => WF_AUTOCANCEL,
3489 fd => IO::AIO::poll_fileno,
3490 poll => 'r',
3491 prio => 6,
3492 cb => \&IO::AIO::poll_cb,
3493 );
3494} 4138}
3495 4139
3496my $_log_backtrace; 4140my $_log_backtrace;
3497 4141
3498sub _log_backtrace { 4142sub _log_backtrace {
3501 $msg =~ s/\n//; 4145 $msg =~ s/\n//;
3502 4146
3503 # limit the # of concurrent backtraces 4147 # limit the # of concurrent backtraces
3504 if ($_log_backtrace < 2) { 4148 if ($_log_backtrace < 2) {
3505 ++$_log_backtrace; 4149 ++$_log_backtrace;
4150 my $perl_bt = Carp::longmess $msg;
3506 async { 4151 async {
4152 $Coro::current->{desc} = "abt $msg";
4153
3507 my @bt = fork_call { 4154 my @bt = fork_call {
3508 @addr = map { sprintf "%x", $_ } @addr; 4155 @addr = map { sprintf "%x", $_ } @addr;
3509 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4156 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3510 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4157 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3511 or die "addr2line: $!"; 4158 or die "addr2line: $!";
3519 } 4166 }
3520 4167
3521 @funcs 4168 @funcs
3522 }; 4169 };
3523 4170
3524 LOG llevInfo, "[ABT] $msg\n"; 4171 LOG llevInfo, "[ABT] $perl_bt\n";
4172 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3525 LOG llevInfo, "[ABT] $_\n" for @bt; 4173 LOG llevInfo, "[ABT] $_\n" for @bt;
3526 --$_log_backtrace; 4174 --$_log_backtrace;
3527 }; 4175 };
3528 } else { 4176 } else {
3529 LOG llevInfo, "[ABT] $msg\n"; 4177 LOG llevInfo, "[ABT] $msg\n";
3530 LOG llevInfo, "[ABT] [suppressed]\n"; 4178 LOG llevInfo, "[ABT] [suppressed]\n";
3531 } 4179 }
3532} 4180}
3533 4181
3534# load additional modules 4182# load additional modules
3535use cf::pod; 4183require "cf/$_.pm" for @EXTRA_MODULES;
4184cf::_connect_to_perl_2;
3536 4185
3537END { cf::emergency_save } 4186END { cf::emergency_save }
3538 4187
35391 41881
3540 4189

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines