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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines