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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines