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.311 by root, Fri Jul 20 16:11:10 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
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5;
29use Fcntl; 56use Fcntl;
30use YAML::Syck (); 57use YAML::XS ();
31use IO::AIO 2.32 (); 58use IO::AIO ();
32use Time::HiRes; 59use Time::HiRes;
33use Compress::LZF; 60use Compress::LZF;
34use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
35 64
36# configure various modules to our taste 65# configure various modules to our taste
37# 66#
38$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
39Coro::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";
40Compress::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
41 75
42$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
43 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 78
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 80
51our %COMMAND = (); 81our %COMMAND = ();
52our %COMMAND_TIME = (); 82our %COMMAND_TIME = ();
55our %EXTCMD = (); 85our %EXTCMD = ();
56our %EXTICMD = (); 86our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 87our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 88our %EXT_MAP = (); # pluggable maps
59 89
60our $RELOAD; # number of reloads so far 90our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 91our @EVENT;
92our @REFLECT; # set by XS
93our %REFLECT; # set by us
62 94
63our $CONFDIR = confdir; 95our $CONFDIR = confdir;
64our $DATADIR = datadir; 96our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 97our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 98our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 99our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 100our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 101our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 102our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 103our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 104our $RANDOMDIR = "$LOCALDIR/random";
73our $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;
74 116
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 117our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 118our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 119our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 120our $USE_FSYNC = 1; # use fsync to write maps - default on
82 121
122our $BDB_DEADLOCK_WATCHER;
123our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 124our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 125our $DB_ENV;
126
127our @EXTRA_MODULES = qw(pod match mapscript);
85 128
86our %CFG; 129our %CFG;
87 130
88our $UPTIME; $UPTIME ||= time; 131our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 132our $RUNTIME;
133our $NOW;
90 134
91our %PLAYER; # all users 135our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 136our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 137our $LINK_MAP; # the special {link} map, which is always available
94 138
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 140our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 141
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 142our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 143our $LOADAVG; # same thing, but with alpha-smoothing
144our $JITTER; # average jitter
100our $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 :)
101 151
102binmode STDOUT; 152binmode STDOUT;
103binmode STDERR; 153binmode STDERR;
104 154
105# read virtual server time, if available 155# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 156unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 157 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 158 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 159 $RUNTIME = <$fh> + 0.;
110} 160}
161
162eval "sub TICK() { $TICK } 1" or die;
111 163
112mkdir $_ 164mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 165 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 166
115our $EMERGENCY_POSITION; 167our $EMERGENCY_POSITION;
116 168
117sub 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::"} };
118 185
119############################################################################# 186#############################################################################
120 187
121=head2 GLOBAL VARIABLES 188=head2 GLOBAL VARIABLES
122 189
158 225
159The raw value load value from the last tick. 226The raw value load value from the last tick.
160 227
161=item %cf::CFG 228=item %cf::CFG
162 229
163Configuration for the server, loaded from C</etc/crossfire/config>, or 230Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 231from wherever your confdir points to.
165 232
166=item cf::wait_for_tick, cf::wait_for_tick_begin 233=item cf::wait_for_tick, cf::wait_for_tick_begin
167 234
168These 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
169returns 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
170per 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.
171 238
172=item @cf::INVOKE_RESULTS 239=item @cf::INVOKE_RESULTS
173 240
174This array contains the results of the last C<invoke ()> call. When 241This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 242C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call. 243that call.
177 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
178=back 251=back
179 252
180=cut 253=cut
181 254
182BEGIN { 255sub error(@) { LOG llevError, join "", @_ }
183 *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 {
184 my $msg = join "", @_; 262 my $msg = join "", @_;
185 263
186 $msg .= "\n" 264 $msg .= "\n"
187 unless $msg =~ /\n$/; 265 unless $msg =~ /\n$/;
188 266
189 $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;
190 268
191 utf8::encode $msg;
192 LOG llevError, $msg; 269 LOG llevWarn, $msg;
193 }; 270};
194} 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};
195 285
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 286@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 287@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 288@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 289@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 296for my $pkg (qw(
207 cf::global cf::attachable 297 cf::global cf::attachable
208 cf::object cf::object::player 298 cf::object cf::object::player
209 cf::client cf::player 299 cf::client cf::player
210 cf::arch cf::living 300 cf::arch cf::living
301 cf::map cf::mapspace
211 cf::map cf::party cf::region 302 cf::party cf::region
212)) { 303)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 304 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 305}
216 306
217$Event::DIED = sub { 307$EV::DIED = sub {
218 warn "error in event callback: @_"; 308 Carp::cluck "error in event callback: @_";
219}; 309};
220 310
221############################################################################# 311#############################################################################
222 312
223=head2 UTILITY FUNCTIONS 313=head2 UTILITY FUNCTIONS
245 $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;
246 $d 336 $d
247 } || "[unable to dump $_[0]: '$@']"; 337 } || "[unable to dump $_[0]: '$@']";
248} 338}
249 339
250=item $ref = cf::from_json $json 340=item $ref = cf::decode_json $json
251 341
252Converts a JSON string into the corresponding perl data structure. 342Converts a JSON string into the corresponding perl data structure.
253 343
254=item $json = cf::to_json $ref 344=item $json = cf::encode_json $ref
255 345
256Converts a perl data structure into its JSON representation. 346Converts a perl data structure into its JSON representation.
257 347
258=cut 348=cut
259 349
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 350our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 351
262sub to_json ($) { $json_coder->encode ($_[0]) } 352sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[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}
264 368
265=item cf::lock_wait $string 369=item cf::lock_wait $string
266 370
267Wait until the given lock is available. See cf::lock_acquire. 371Wait until the given lock is available. See cf::lock_acquire.
268 372
269=item my $lock = cf::lock_acquire $string 373=item my $lock = cf::lock_acquire $string
270 374
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 377for example when the coroutine gets canceled), the lock is automatically
274returned. 378returned.
275 379
380Locks are *not* recursive, locking from the same coro twice results in a
381deadlocked coro.
382
276Lock 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
277uses map_find and cf::map::load uses map_load). 384uses map_find and cf::map::load uses map_load).
278 385
279=item $locked = cf::lock_active $string 386=item $locked = cf::lock_active $string
280 387
281Return 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.
282 389
283=cut 390=cut
284 391
285our %LOCK; 392our $LOCKS = new Coro::SemaphoreSet;
286 393
287sub lock_wait($) { 394sub lock_wait($) {
288 my ($key) = @_; 395 $LOCKS->wait ($_[0]);
289
290 # wait for lock, if any
291 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule;
294 }
295} 396}
296 397
297sub lock_acquire($) { 398sub lock_acquire($) {
298 my ($key) = @_; 399 $LOCKS->guard ($_[0])
299
300 # wait, to be sure we are not locked
301 lock_wait $key;
302
303 $LOCK{$key} = [];
304
305 Coro::guard {
306 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} };
308 }
309} 400}
310 401
311sub lock_active($) { 402sub lock_active($) {
312 my ($key) = @_; 403 $LOCKS->count ($_[0]) < 1
313
314 ! ! $LOCK{$key}
315} 404}
316 405
317sub freeze_mainloop { 406sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 407 tick_inhibit_inc;
319 408
320 my $guard = Coro::guard { 409 &Guard::guard (\&tick_inhibit_dec);
321 $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 }
322 }; 476 }
323 $TICK_WATCHER->stop; 477};
324 $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;
325} 492}
326 493
327=item cf::async { BLOCK } 494=item cf::async { BLOCK }
328 495
329Currently the same as Coro::async_pool, meaning you cannot use 496Currently the same as Coro::async_pool, meaning you cannot use
334 501
335BEGIN { *async = \&Coro::async_pool } 502BEGIN { *async = \&Coro::async_pool }
336 503
337=item cf::sync_job { BLOCK } 504=item cf::sync_job { BLOCK }
338 505
339The design of Crossfire TRT requires that the main coroutine ($Coro::main) 506The design of Deliantra requires that the main coroutine ($Coro::main)
340is always able to handle events or runnable, as Crossfire TRT is only 507is always able to handle events or runnable, as Deliantra is only
341partly 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
342acceptable. 509acceptable.
343 510
344If 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
345the given BLOCK in another coroutine while waiting for the result. The 512the given BLOCK in another coroutine while waiting for the result. The
349=cut 516=cut
350 517
351sub sync_job(&) { 518sub sync_job(&) {
352 my ($job) = @_; 519 my ($job) = @_;
353 520
354 if ($Coro::current == $Coro::main) { 521 if (in_main) {
355 my $time = Event::time; 522 my $time = AE::time;
356 523
357 # this is the main coro, too bad, we have to block 524 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 525 # till the operation succeeds, freezing the server :/
359 526
360 # TODO: use suspend/resume instead 527 #LOG llevError, Carp::longmess "sync job";#d#
361 # (but this is cancel-safe) 528
362 my $freeze_guard = freeze_mainloop; 529 my $freeze_guard = freeze_mainloop;
363 530
364 my $busy = 1; 531 my $busy = 1;
365 my @res; 532 my @res;
366 533
367 (async { 534 (async {
535 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 536 @res = eval { $job->() };
369 warn $@ if $@; 537 error $@ if $@;
370 undef $busy; 538 undef $busy;
371 })->prio (Coro::PRIO_MAX); 539 })->prio (Coro::PRIO_MAX);
372 540
373 while ($busy) { 541 while ($busy) {
374 Coro::cede or Event::one_event; 542 if (Coro::nready) {
543 Coro::cede_notself;
544 } else {
545 EV::loop EV::LOOP_ONESHOT;
375 } 546 }
547 }
376 548
377 $time = Event::time - $time; 549 my $time = AE::time - $time;
378 550
379 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381
382 $tick_start += $time; # do not account sync jobs to server load 551 $TICK_START += $time; # do not account sync jobs to server load
383 552
384 wantarray ? @res : $res[0] 553 wantarray ? @res : $res[0]
385 } else { 554 } else {
386 # we are in another coroutine, how wonderful, everything just works 555 # we are in another coroutine, how wonderful, everything just works
387 556
412=item fork_call { }, $args 581=item fork_call { }, $args
413 582
414Executes the given code block with the given arguments in a seperate 583Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with 584process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may 585Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 586never block itself or use any form of event handling.
418 587
419=cut 588=cut
420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429 589
430sub fork_call(&@) { 590sub fork_call(&@) {
431 my ($cb, @args) = @_; 591 my ($cb, @args) = @_;
432 592
433# 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,
434# or die "socketpair: $!"; 594 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 595 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 596
438 if (my $pid = fork) { 597 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 598 reset_signals;
452 local $SIG{__WARN__}; 599 &$cb
453 local $SIG{__DIE__}; 600 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 601
460 eval { 602 wantarray ? @res : $res[-1]
461 close $fh1; 603}
462 604
463 my @res = eval { $cb->(@args) }; 605sub objinfo {
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 } 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
472} 641}
473 642
474=item $value = cf::db_get $family => $key 643=item $value = cf::db_get $family => $key
475 644
476Returns a single value from the environment database. 645Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 647=item cf::db_put $family => $key => $value
479 648
480Stores 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
481data 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).
482 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
483=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}
484 678
485our $DB; 679our $DB;
486 680
487sub db_init { 681sub db_init {
488 unless ($DB) { 682 $DB ||= db_table "db";
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job {
492 eval {
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 }
502} 683}
503 684
504sub db_get($$) { 685sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 686 my $key = "$_[0]/$_[1]";
506 687
507 cf::sync_job { 688 cf::error "db_get called from main context"
689 if $Coro::current == $Coro::main;
690
508 BDB::db_get $DB, undef, $key, my $data; 691 BDB::db_get $DB, undef, $key, my $data;
509 692
510 $! ? () 693 $! ? ()
511 : $data 694 : $data
512 }
513} 695}
514 696
515sub db_put($$$) { 697sub db_put($$$) {
516 BDB::dbreq_pri 4; 698 BDB::dbreq_pri 4;
517 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 699 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
556 if (1) { 738 if (1) {
557 $md5 = 739 $md5 =
558 join "\x00", 740 join "\x00",
559 $processversion, 741 $processversion,
560 map { 742 map {
561 Coro::cede; 743 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 744 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 745 } 0.. $#$src;
564 746
565 747
566 my $dbmd5 = db_get cache => "$id/md5"; 748 my $dbmd5 = db_get cache => "$id/md5";
573 755
574 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
575 my $data = $process->(\@data); 757 my $data = $process->(\@data);
576 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
577 759
578 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
579 761
580 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
581 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
582 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
583 765
593 775
594=cut 776=cut
595 777
596sub datalog($@) { 778sub datalog($@) {
597 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
598 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
599} 781}
600 782
601=back 783=back
602 784
603=cut 785=cut
604 786
605############################################################################# 787#############################################################################
606 788
607=head2 ATTACHABLE OBJECTS 789=head2 ATTACHABLE OBJECTS
608 790
609Many 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
610attach callbacks/event handlers (a collection of which is called an "attachment") 792attach callbacks/event handlers (a collection of which is called an "attachment")
611to it. All such attachable objects support the following methods. 793to it. All such attachable objects support the following methods.
612 794
613In 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>
614C<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
615Crossfire TRT). 797Deliantra).
616 798
617=over 4 799=over 4
618 800
619=item $attachable->attach ($attachment, key => $value...) 801=item $attachable->attach ($attachment, key => $value...)
620 802
664=item cf::CLASS::attachment $name, ... 846=item cf::CLASS::attachment $name, ...
665 847
666Register an attachment by C<$name> through which attachable objects of the 848Register an attachment by C<$name> through which attachable objects of the
667given CLASS can refer to this attachment. 849given CLASS can refer to this attachment.
668 850
669Some classes such as crossfire maps and objects can specify attachments 851Some classes such as deliantra maps and objects can specify attachments
670that 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.
671 853
672These calls expect any number of the following handler/hook descriptions: 854These calls expect any number of the following handler/hook descriptions:
673 855
674=over 4 856=over 4
798 980
799 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
800 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
801 983
802 } elsif (ref $type) { 984 } elsif (ref $type) {
803 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
804 986
805 } else { 987 } else {
806 shift @arg; 988 shift @arg;
807 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
808 } 990 }
809 } 991 }
810} 992}
811 993
812sub _object_attach { 994sub _object_attach {
822 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
823 } 1005 }
824 1006
825 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
826 } else { 1008 } else {
827 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
828 } 1010 }
829 1011
830 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
831} 1013}
832 1014
891 1073
892 for (@$callbacks) { 1074 for (@$callbacks) {
893 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
894 1076
895 if ($@) { 1077 if ($@) {
896 warn "$@";
897 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
898 override; 1079 override;
899 } 1080 }
900 1081
901 return 1 if $override; 1082 return 1 if $override;
902 } 1083 }
903 1084
904 0 1085 0
905} 1086}
906 1087
907=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1088=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
908 1089
909=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
910 1091
911Generate an object-specific event with the given arguments. 1092Generate an object-specific event with the given arguments.
912 1093
919=cut 1100=cut
920 1101
921############################################################################# 1102#############################################################################
922# object support 1103# object support
923 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}
1146
924sub reattach { 1147sub reattach {
925 # basically do the same as instantiate, without calling instantiate 1148 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 1149 my ($obj) = @_;
927 1150
1151 # no longer needed after getting rid of delete_package?
928 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
929 1153
930 my $registry = $obj->registry; 1154 my $registry = $obj->registry;
931 1155
932 @$registry = (); 1156 @$registry = ();
933 1157
938 for (@$attach) { 1162 for (@$attach) {
939 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
940 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
941 } 1165 }
942 } else { 1166 } else {
943 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
944 } 1168 }
945 } 1169 }
946} 1170}
947 1171
948cf::attachable->attach ( 1172cf::attachable->attach (
949 prio => -1000000, 1173 prio => -1000000,
950 on_instantiate => sub { 1174 on_instantiate => sub {
951 my ($obj, $data) = @_; 1175 my ($obj, $data) = @_;
952 1176
953 $data = from_json $data; 1177 $data = decode_json $data;
954 1178
955 for (@$data) { 1179 for (@$data) {
956 my ($name, $args) = @$_; 1180 my ($name, $args) = @$_;
957 1181
958 $obj->attach ($name, %{$args || {} }); 1182 $obj->attach ($name, %{$args || {} });
974sub object_freezer_save { 1198sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
976 1200
977 sync_job { 1201 sync_job {
978 if (length $$rdata) { 1202 if (length $$rdata) {
1203 utf8::decode (my $decname = $filename);
979 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
981 1207
982 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1209 aio_chmod $fh, SAVE_MODE;
984 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985 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 }
986 close $fh; 1215 aio_close $fh;
987 1216
988 if (@$objs) { 1217 if (@$objs) {
989 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) {
990 chmod SAVE_MODE, $fh; 1219 aio_chmod $fh, SAVE_MODE;
991 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
992 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
993 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 }
994 close $fh; 1226 aio_close $fh;
995 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
996 } 1228 }
997 } else { 1229 } else {
998 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
999 } 1231 }
1000 1232
1001 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1234
1235 $filename =~ s%/[^/]+$%%;
1236 aio_pathsync $filename if $cf::USE_FSYNC;
1002 } else { 1237 } else {
1003 warn "FATAL: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1004 } 1239 }
1005 } else { 1240 } else {
1006 aio_unlink $filename; 1241 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1008 } 1243 }
1009 } 1244 };
1010} 1245}
1011 1246
1012sub object_freezer_as_string { 1247sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1248 my ($rdata, $objs) = @_;
1014 1249
1026 or return; 1261 or return;
1027 1262
1028 unless (aio_stat "$filename.pst") { 1263 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1264 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1265 or return;
1266
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1267 my $st = eval { Coro::Storable::thaw $av };
1268 $av = $st->{objs};
1032 } 1269 }
1033 1270
1271 utf8::decode (my $decname = $filename);
1034 warn sprintf "loading %s (%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1275
1036 return ($data, $av); 1276 ($data, $av)
1037} 1277}
1038 1278
1039=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
1040 1280
1041=over 4 1281=over 4
1095 my ($name, $cb) = @_; 1335 my ($name, $cb) = @_;
1096 1336
1097 $EXTICMD{$name} = $cb; 1337 $EXTICMD{$name} = $cb;
1098} 1338}
1099 1339
1340use File::Glob ();
1341
1100cf::player->attach ( 1342cf::player->attach (
1101 on_command => sub { 1343 on_unknown_command => sub {
1102 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1103 1345
1104 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1105 or return; 1347 or return;
1106 1348
1114 my ($pl, $buf) = @_; 1356 my ($pl, $buf) = @_;
1115 1357
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1358 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1359
1118 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
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1368 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1369 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1370 }
1371
1372 $pl->ext_reply ($reply, @reply)
1373 if $reply;
1374
1124 } else { 1375 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1377 }
1127 1378
1128 cf::override; 1379 cf::override;
1129 }, 1380 },
1130); 1381);
1131 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
1132sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1133 cf::sync_job { 1399 cf::sync_job {
1134 my %todo; 1400 my %todo;
1135 1401
1136 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1137 next unless -r $path; 1403 next unless -r $path;
1155 1421
1156 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1157 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1158 1424
1159 $ext{source} = 1425 $ext{source} =
1160 "package $pkg; use strict; use utf8;\n" 1426 "package $pkg; use common::sense;\n"
1161 . "#line 1 \"$path\"\n{\n" 1427 . "#line 1 \"$path\"\n{\n"
1162 . $source 1428 . $source
1163 . "\n};\n1"; 1429 . "\n};\n1";
1164 1430
1165 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1166 } 1432 }
1167 1433
1434 my $pass = 0;
1168 my %done; 1435 my %done;
1169 while (%todo) { 1436 while (%todo) {
1170 my $progress; 1437 my $progress;
1171 1438
1439 ++$pass;
1440
1441 ext:
1172 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1173 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1174 goto skip 1444 next ext
1175 unless exists $done{$_}; 1445 unless exists $done{$_};
1176 } 1446 }
1177 1447
1178 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1179 1449
1180 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1181 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1182 : "$v->{base}: extension inactive.\n"; 1454 undef $@; # work around perl 5.10.0 utf-8 caching bug
1183 1455
1456 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1184 if (exists $v->{meta}{mandatory}) { 1457 if exists $v->{meta}{mandatory};
1185 warn $msg; 1458
1186 warn "mandatory extension failed to load, exiting.\n"; 1459 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1187 exit 1; 1460 delete $todo{$k};
1188 } 1461 } else {
1189 1462 $done{$k} = delete $todo{$k};
1190 warn $msg; 1463 push @EXTS, $v->{pkg};
1464 $progress = 1;
1465
1466 info "$v->{base}: extension inactive.\n"
1467 unless $active;
1191 } 1468 }
1192
1193 $done{$k} = delete $todo{$k};
1194 push @EXTS, $v->{pkg};
1195 $progress = 1;
1196 } 1469 }
1197 1470
1198 skip: 1471 unless ($progress) {
1199 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1472 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1200 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 }
1201 } 1479 }
1202 }; 1480 };
1203} 1481}
1204 1482
1205############################################################################# 1483#############################################################################
1206 1484
1207=back 1485=back
1208 1486
1209=head2 CORE EXTENSIONS 1487=head2 CORE EXTENSIONS
1210 1488
1211Functions and methods that extend core crossfire objects. 1489Functions and methods that extend core deliantra objects.
1212 1490
1213=cut 1491=cut
1214 1492
1215package cf::player; 1493package cf::player;
1216 1494
1217use Coro::AIO; 1495use Coro::AIO;
1218 1496
1219=head3 cf::player 1497=head3 cf::player
1220 1498
1221=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}
1222 1514
1223=item cf::player::find $login 1515=item cf::player::find $login
1224 1516
1225Returns the given player object, loading it if necessary (might block). 1517Returns the given player object, loading it if necessary (might block).
1226 1518
1245 1537
1246sub exists($) { 1538sub exists($) {
1247 my ($login) = @_; 1539 my ($login) = @_;
1248 1540
1249 $cf::PLAYER{$login} 1541 $cf::PLAYER{$login}
1250 or cf::sync_job { !aio_stat path $login } 1542 or !aio_stat path $login
1251} 1543}
1252 1544
1253sub find($) { 1545sub find($) {
1254 return $cf::PLAYER{$_[0]} || do { 1546 return $cf::PLAYER{$_[0]} || do {
1255 my $login = $_[0]; 1547 my $login = $_[0];
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1554 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1555 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1556 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1557 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1558
1267 my $pl = load_pl path $login 1559 my $f = new_from_file cf::object::thawer path $login
1268 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;
1269 $cf::PLAYER{$login} = $pl 1567 $cf::PLAYER{$login} = $pl
1270 } 1568 }
1271 } 1569 }
1272} 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);
1273 1584
1274sub save($) { 1585sub save($) {
1275 my ($pl) = @_; 1586 my ($pl) = @_;
1276 1587
1277 return if $pl->{deny_save}; 1588 return if $pl->{deny_save};
1282 return if $pl->{deny_save}; 1593 return if $pl->{deny_save};
1283 1594
1284 aio_mkdir playerdir $pl, 0770; 1595 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1596 $pl->{last_save} = $cf::RUNTIME;
1286 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
1287 $pl->save_pl ($path); 1603 $pl->save_pl ($path);
1288 Coro::cede; 1604 cf::cede_to_tick;
1289} 1605}
1290 1606
1291sub new($) { 1607sub new($) {
1292 my ($login) = @_; 1608 my ($login) = @_;
1293 1609
1299 $cf::PLAYER{$login} = $self; 1615 $cf::PLAYER{$login} = $self;
1300 1616
1301 $self 1617 $self
1302} 1618}
1303 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
1304=item $pl->quit_character 1630=item $pl->quit_character
1305 1631
1306Nukes the player without looking back. If logged in, the connection will 1632Nukes the player without looking back. If logged in, the connection will
1307be destroyed. May block for a long time. 1633be destroyed. May block for a long time.
1308 1634
1312 my ($pl) = @_; 1638 my ($pl) = @_;
1313 1639
1314 my $name = $pl->ob->name; 1640 my $name = $pl->ob->name;
1315 1641
1316 $pl->{deny_save} = 1; 1642 $pl->{deny_save} = 1;
1317 $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
1318 1644
1319 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1645 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1320 $pl->deactivate; 1646 $pl->deactivate;
1647 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1321 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1648 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1322 $pl->ns->destroy if $pl->ns; 1649 $pl->ns->destroy if $pl->ns;
1323 1650
1324 my $path = playerdir $pl; 1651 my $path = playerdir $pl;
1325 my $temp = "$path~$cf::RUNTIME~deleting~"; 1652 my $temp = "$path~$cf::RUNTIME~deleting~";
1361 or return []; 1688 or return [];
1362 1689
1363 my @logins; 1690 my @logins;
1364 1691
1365 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") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1698 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1699 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1700 $buf !~ /^password -------------$/m or next; # official not-valid tag
1701 }
1369 1702
1370 utf8::decode $login; 1703 utf8::decode $login;
1371 push @logins, $login; 1704 push @logins, $login;
1372 } 1705 }
1373 1706
1374 \@logins 1707 \@logins
1375} 1708}
1376 1709
1377=item $player->maps 1710=item $player->maps
1711
1712=item cf::player::maps $login
1378 1713
1379Returns an arrayref of map paths that are private for this 1714Returns an arrayref of map paths that are private for this
1380player. May block. 1715player. May block.
1381 1716
1382=cut 1717=cut
1400 } 1735 }
1401 1736
1402 \@paths 1737 \@paths
1403} 1738}
1404 1739
1405=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1740=item $protocol_xml = $player->expand_cfpod ($cfpod)
1406 1741
1407Expand crossfire pod fragments into protocol xml. 1742Expand deliantra pod fragments into protocol xml.
1408 1743
1409=cut
1410
1411sub expand_cfpod {
1412 ((my $self), (local $_)) = @_;
1413
1414 # escape & and <
1415 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g;
1417
1418 # this is buggy, it needs to properly take care of nested <'s
1419
1420 1 while
1421 # replace B<>, I<>, U<> etc.
1422 s/B<([^\>]*)>/<b>$1<\/b>/
1423 || s/I<([^\>]*)>/<i>$1<\/i>/
1424 || s/U<([^\>]*)>/<u>$1<\/u>/
1425 # replace G<male|female> tags
1426 || s{G<([^>|]*)\|([^>]*)>}{
1427 $self->gender ? $2 : $1
1428 }ge
1429 # replace H<hint text>
1430 || s{H<([^\>]*)>}
1431 {
1432 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "")
1435 [$self->{hintmode}]
1436 }ge;
1437
1438 # create single paragraphs (very hackish)
1439 s/(?<=\S)\n(?=\w)/ /g;
1440
1441 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines
1446
1447 $_
1448}
1449
1450sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode}
1453}
1454
1455=item $player->ext_reply ($msgid, %msg) 1744=item $player->ext_reply ($msgid, @msg)
1456 1745
1457Sends an ext reply to the player. 1746Sends an ext reply to the player.
1458 1747
1459=cut 1748=cut
1460 1749
1461sub ext_reply($$%) { 1750sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1751 my ($self, $id, @msg) = @_;
1463 1752
1464 $msg{msgid} = $id; 1753 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1754}
1467 1755
1468=item $player->ext_event ($type, %msg) 1756=item $player->ext_msg ($type, @msg)
1469 1757
1470Sends an ext event to the client. 1758Sends an ext event to the client.
1471 1759
1472=cut 1760=cut
1473 1761
1474sub ext_event($$%) { 1762sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1763 my ($self, $type, @msg) = @_;
1476 1764
1477 $self->ns->ext_event ($type, %msg); 1765 $self->ns->ext_msg ($type, @msg);
1478} 1766}
1479 1767
1480=head3 cf::region 1768=head3 cf::region
1481 1769
1482=over 4 1770=over 4
1491 1779
1492=cut 1780=cut
1493 1781
1494sub find_by_path($) { 1782sub find_by_path($) {
1495 my ($path) = @_; 1783 my ($path) = @_;
1784
1785 $path =~ s/^~[^\/]*//; # skip ~login
1496 1786
1497 my ($match, $specificity); 1787 my ($match, $specificity);
1498 1788
1499 for my $region (list) { 1789 for my $region (list) {
1500 if ($region->{match} && $path =~ $region->{match}) { 1790 if ($region->{match} && $path =~ $region->{match}) {
1526our $MAX_RESET = 3600; 1816our $MAX_RESET = 3600;
1527our $DEFAULT_RESET = 3000; 1817our $DEFAULT_RESET = 3000;
1528 1818
1529sub generate_random_map { 1819sub generate_random_map {
1530 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
1531 # mit "rum" bekleckern, nicht 1824 # mit "rum" bekleckern, nicht
1532 $self->_create_random_map ( 1825 $self->_create_random_map (
1533 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1826 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1534 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1827 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1535 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1828 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1536 $rmp->{exit_on_final_map}, 1829 $rmp->{exit_on_final_map},
1537 $rmp->{xsize}, $rmp->{ysize}, 1830 $rmp->{xsize}, $rmp->{ysize},
1538 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1831 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1539 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1832 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1554 1847
1555sub register { 1848sub register {
1556 my (undef, $regex, $prio) = @_; 1849 my (undef, $regex, $prio) = @_;
1557 my $pkg = caller; 1850 my $pkg = caller;
1558 1851
1559 no strict;
1560 push @{"$pkg\::ISA"}, __PACKAGE__; 1852 push @{"$pkg\::ISA"}, __PACKAGE__;
1561 1853
1562 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1563} 1855}
1564 1856
1565# also paths starting with '/' 1857# also paths starting with '/'
1566$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1567 1859
1568sub thawer_merge { 1860sub thawer_merge {
1569 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1570 1862
1571 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
1657 1949
1658# the temporary/swap location 1950# the temporary/swap location
1659sub save_path { 1951sub save_path {
1660 my ($self) = @_; 1952 my ($self) = @_;
1661 1953
1662 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1954 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1663 "$TMPDIR/$path.map" 1955 "$TMPDIR/$path.map"
1664} 1956}
1665 1957
1666# the unique path, undef == no special unique path 1958# the unique path, undef == no special unique path
1667sub uniq_path { 1959sub uniq_path {
1668 my ($self) = @_; 1960 my ($self) = @_;
1669 1961
1670 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1962 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1671 "$UNIQUEDIR/$path" 1963 "$UNIQUEDIR/$path"
1672}
1673
1674# and all this just because we cannot iterate over
1675# all maps in C++...
1676sub change_all_map_light {
1677 my ($change) = @_;
1678
1679 $_->change_map_light ($change)
1680 for grep $_->outdoor, values %cf::MAP;
1681} 1964}
1682 1965
1683sub decay_objects { 1966sub decay_objects {
1684 my ($self) = @_; 1967 my ($self) = @_;
1685 1968
1698 1981
1699sub load_header_from($) { 1982sub load_header_from($) {
1700 my ($self, $path) = @_; 1983 my ($self, $path) = @_;
1701 1984
1702 utf8::encode $path; 1985 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1986 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 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;
1708 1994
1709 $self->{load_path} = $path; 1995 $self->{load_path} = $path;
1710 1996
1711 1 1997 1
1712} 1998}
1766sub find { 2052sub find {
1767 my ($path, $origin) = @_; 2053 my ($path, $origin) = @_;
1768 2054
1769 $path = normalise $path, $origin && $origin->path; 2055 $path = normalise $path, $origin && $origin->path;
1770 2056
2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 2058 my $guard2 = cf::lock_acquire "map_find:$path";
1772 2059
1773 $cf::MAP{$path} || do { 2060 $cf::MAP{$path} || do {
1774 my $guard = cf::lock_acquire "map_find:$path";
1775 my $map = new_from_path cf::map $path 2061 my $map = new_from_path cf::map $path
1776 or return; 2062 or return;
1777 2063
1778 $map->{last_save} = $cf::RUNTIME; 2064 $map->{last_save} = $cf::RUNTIME;
1779 2065
1781 or return; 2067 or return;
1782 2068
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2069 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 2070 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 2071 #$cf::WAIT_FOR_TICK->wait;
2072 undef $guard2;
2073 undef $guard1;
1786 $map->reset; 2074 $map->reset;
1787 undef $guard;
1788 return find $path; 2075 return find $path;
1789 } 2076 }
1790 2077
1791 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
1792 } 2079 }
1793} 2080}
1794 2081
1795sub pre_load { } 2082sub pre_load { }
1796sub post_load { } 2083#sub post_load { } # XS
1797 2084
1798sub load { 2085sub load {
1799 my ($self) = @_; 2086 my ($self) = @_;
1800 2087
1801 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
1802 2089
1803 my $path = $self->{path}; 2090 my $path = $self->{path};
1804 2091
1805 { 2092 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 2093 my $guard = cf::lock_acquire "map_data:$path";
1807 2094
2095 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 2096 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 2097
1810 $self->in_memory (cf::MAP_LOADING); 2098 $self->in_memory (cf::MAP_LOADING);
1811 2099
1812 $self->alloc; 2100 $self->alloc;
1813 2101
1814 $self->pre_load; 2102 $self->pre_load;
1815 Coro::cede; 2103 cf::cede_to_tick;
1816 2104
2105 my $f = new_from_file cf::object::thawer $self->{load_path};
2106 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 2107 $self->_load_objects ($f)
1818 or return; 2108 or return;
1819 2109
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2110 $self->post_load_original
1821 if delete $self->{load_original}; 2111 if delete $self->{load_original};
1822 2112
1823 if (my $uniq = $self->uniq_path) { 2113 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 2114 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 2115 unless (aio_stat $uniq) {
2116 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 2117 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 2118 $self->_load_objects ($f);
2119 $f->resolve_delayed_derefs;
2120 }
1828 } 2121 }
1829 } 2122 }
1830 2123
1831 Coro::cede; 2124 $f->resolve_delayed_derefs;
2125
2126 cf::cede_to_tick;
1832 # now do the right thing for maps 2127 # now do the right thing for maps
1833 $self->link_multipart_objects; 2128 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 2129 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 2130 unless $self->difficulty;
1836 Coro::cede; 2131 cf::cede_to_tick;
1837 2132
1838 unless ($self->{deny_activate}) { 2133 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 2134 $self->decay_objects;
1840 $self->fix_auto_apply; 2135 $self->fix_auto_apply;
1841 $self->update_buttons; 2136 $self->update_buttons;
1842 Coro::cede; 2137 cf::cede_to_tick;
1843 $self->set_darkness_map;
1844 Coro::cede;
1845 $self->activate; 2138 $self->activate;
1846 } 2139 }
1847 2140
2141 $self->{last_save} = $cf::RUNTIME;
2142 $self->last_access ($cf::RUNTIME);
2143
1848 $self->in_memory (cf::MAP_IN_MEMORY); 2144 $self->in_memory (cf::MAP_ACTIVE);
1849 } 2145 }
1850 2146
1851 $self->post_load; 2147 $self->post_load;
1852} 2148}
1853 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
1854sub customise_for { 2153sub customise_for {
1855 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
1856 2155
1857 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
1858 if $self->per_player; 2157 if $self->per_player;
1862 2161
1863 $self 2162 $self
1864} 2163}
1865 2164
1866# 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
1867sub load_diag { 2166sub load_neighbours {
1868 my ($map) = @_; 2167 my ($map) = @_;
1869 2168
1870 my @diag; # diagonal neighbours 2169 my @neigh; # diagonal neighbours
1871 2170
1872 for (0 .. 3) { 2171 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 2172 my $neigh = $map->tile_path ($_)
1874 or next; 2173 or next;
1875 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
1876 or next; 2175 or next;
1877 $neigh->load; 2176 $neigh->load;
1878 2177
2178 # now find the diagonal neighbours
2179 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2182 }
1882 2183
1883 for (@diag) { 2184 for (grep defined $_->[0], @neigh) {
2185 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2186 my $neigh = find $path, $origin
1885 or next; 2187 or next;
1886 $neigh->load; 2188 $neigh->load;
1887 } 2189 }
1888} 2190}
1889 2191
1890sub find_sync { 2192sub find_sync {
1891 my ($path, $origin) = @_; 2193 my ($path, $origin) = @_;
1892 2194
1893 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
1894} 2199}
1895 2200
1896sub do_load_sync { 2201sub do_load_sync {
1897 my ($map) = @_; 2202 my ($map) = @_;
1898 2203
1899 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;
1900} 2208}
1901 2209
1902our %MAP_PREFETCH; 2210our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2211our $MAP_PREFETCHER = undef;
1904 2212
1905sub find_async { 2213sub find_async {
1906 my ($path, $origin) = @_; 2214 my ($path, $origin, $load) = @_;
1907 2215
1908 $path = normalise $path, $origin && $origin->{path}; 2216 $path = normalise $path, $origin && $origin->{path};
1909 2217
1910 if (my $map = $cf::MAP{$path}) { 2218 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2219 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1912 } 2220 }
1913 2221
1914 undef $MAP_PREFETCH{$path}; 2222 $MAP_PREFETCH{$path} |= $load;
2223
1915 $MAP_PREFETCHER ||= cf::async { 2224 $MAP_PREFETCHER ||= cf::async {
2225 $Coro::current->{desc} = "map prefetcher";
2226
1916 while (%MAP_PREFETCH) { 2227 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2228 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2229 if (my $map = find $k) {
1919 $map->load; 2230 $map->load if $v;
1920 } 2231 }
1921 2232
1922 delete $MAP_PREFETCH{$path}; 2233 delete $MAP_PREFETCH{$k};
1923 } 2234 }
1924 } 2235 }
1925 undef $MAP_PREFETCHER; 2236 undef $MAP_PREFETCHER;
1926 }; 2237 };
1927 $MAP_PREFETCHER->prio (6); 2238 $MAP_PREFETCHER->prio (6);
1928 2239
1929 () 2240 ()
1930} 2241}
1931 2242
2243# common code, used by both ->save and ->swapout
1932sub save { 2244sub _save {
1933 my ($self) = @_; 2245 my ($self) = @_;
1934
1935 my $lock = cf::lock_acquire "map_data:" . $self->path;
1936 2246
1937 $self->{last_save} = $cf::RUNTIME; 2247 $self->{last_save} = $cf::RUNTIME;
1938 2248
1939 return unless $self->dirty; 2249 return unless $self->dirty;
1940 2250
1946 return if $self->{deny_save}; 2256 return if $self->{deny_save};
1947 2257
1948 local $self->{last_access} = $self->last_access;#d# 2258 local $self->{last_access} = $self->last_access;#d#
1949 2259
1950 cf::async { 2260 cf::async {
2261 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2262 $_->contr->save for $self->players;
1952 }; 2263 };
2264
2265 cf::get_slot 0.02;
1953 2266
1954 if ($uniq) { 2267 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2268 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1956 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2269 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1957 } else { 2270 } else {
1958 $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);
1959 } 2272 }
1960} 2273}
1961 2274
2275sub save {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 $self->_save;
2281}
2282
1962sub swap_out { 2283sub swap_out {
1963 my ($self) = @_; 2284 my ($self) = @_;
1964 2285
1965 # save first because save cedes
1966 $self->save;
1967
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2287
2288 return if $self->in_memory != cf::MAP_ACTIVE;
2289 return if $self->{deny_save};
1970 return if $self->players; 2290 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save};
1973 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
1974 $self->clear; 2301 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2302}
1977 2303
1978sub reset_at { 2304sub reset_at {
1979 my ($self) = @_; 2305 my ($self) = @_;
1980 2306
1998 2324
1999 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2325 my $lock = cf::lock_acquire "map_data:$self->{path}";
2000 2326
2001 return if $self->players; 2327 return if $self->players;
2002 2328
2003 warn "resetting map ", $self->path; 2329 cf::trace "resetting map ", $self->path, "\n";
2004 2330
2005 $self->in_memory (cf::MAP_SWAPPED); 2331 $self->in_memory (cf::MAP_SWAPPED);
2006 2332
2007 # need to save uniques path 2333 # need to save uniques path
2008 unless ($self->{deny_save}) { 2334 unless ($self->{deny_save}) {
2012 if $uniq; 2338 if $uniq;
2013 } 2339 }
2014 2340
2015 delete $cf::MAP{$self->path}; 2341 delete $cf::MAP{$self->path};
2016 2342
2343 $self->deactivate;
2344 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2345 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2346
2021 $self->unlink_save; 2347 $self->unlink_save;
2022 $self->destroy; 2348 $self->destroy;
2023} 2349}
2024 2350
2025my $nuke_counter = "aaaa"; 2351my $nuke_counter = "aaaa";
2026 2352
2027sub nuke { 2353sub nuke {
2028 my ($self) = @_; 2354 my ($self) = @_;
2029 2355
2356 {
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2030 delete $cf::MAP{$self->path}; 2359 delete $cf::MAP{$self->path};
2031 2360
2032 $self->unlink_save; 2361 $self->unlink_save;
2033 2362
2034 bless $self, "cf::map"; 2363 bless $self, "cf::map::wrap";
2035 delete $self->{deny_reset}; 2364 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2365 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2366 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2367 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2368
2040 $cf::MAP{$self->path} = $self; 2369 $cf::MAP{$self->path} = $self;
2370 }
2041 2371
2042 $self->reset; # polite request, might not happen 2372 $self->reset; # polite request, might not happen
2043} 2373}
2044 2374
2045=item $maps = cf::map::tmp_maps 2375=item $maps = cf::map::tmp_maps
2087 2417
2088sub unique_maps() { 2418sub unique_maps() {
2089 [ 2419 [
2090 map { 2420 map {
2091 utf8::decode $_; 2421 utf8::decode $_;
2092 /\.map$/ 2422 s/\.map$//; # TODO future compatibility hack
2423 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2424 ? ()
2093 ? normalise $_ 2425 : normalise $_
2094 : ()
2095 } @{ aio_readdir $UNIQUEDIR or [] } 2426 } @{ aio_readdir $UNIQUEDIR or [] }
2096 ] 2427 ]
2097} 2428}
2098 2429
2099package 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}
2100 2461
2101=back 2462=back
2102 2463
2103=head3 cf::object 2464=head3 cf::object
2104 2465
2108 2469
2109=over 4 2470=over 4
2110 2471
2111=item $ob->inv_recursive 2472=item $ob->inv_recursive
2112 2473
2113Returns 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.
2114 2476
2115=cut 2477=cut
2116 2478
2117sub inv_recursive_; 2479sub inv_recursive_;
2118sub inv_recursive_ { 2480sub inv_recursive_ {
2121 2483
2122sub inv_recursive { 2484sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2485 inv_recursive_ inv $_[0]
2124} 2486}
2125 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
2126package cf; 2516package cf;
2127 2517
2128=back 2518=back
2129 2519
2130=head3 cf::object::player 2520=head3 cf::object::player
2136Sends 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>
2137can 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
2138dialogue with the given NPC character. 2528dialogue with the given NPC character.
2139 2529
2140=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};
2141 2545
2142# rough implementation of a future "reply" method that works 2546# rough implementation of a future "reply" method that works
2143# with dialog boxes. 2547# with dialog boxes.
2144#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
2145sub cf::object::player::reply($$$;$) { 2549sub cf::object::player::reply($$$;$) {
2152 2556
2153 } else { 2557 } else {
2154 my $pl = $self->contr; 2558 my $pl = $self->contr;
2155 2559
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2560 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2561 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2562 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2563
2165 } else { 2564 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2565 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2566 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2168 } 2567 }
2169 } 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 (@_);
2170} 2579}
2171 2580
2172=item $player_object->may ("access") 2581=item $player_object->may ("access")
2173 2582
2174Returns wether the given player is authorized to access resource "access" 2583Returns wether the given player is authorized to access resource "access"
2187 2596
2188=item $player_object->enter_link 2597=item $player_object->enter_link
2189 2598
2190Freezes 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}>).
2191 2600
2192The 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.
2193I<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.
2194 2605
2195Will never block. 2606Will never block.
2196 2607
2197=item $player_object->leave_link ($map, $x, $y) 2608=item $player_object->leave_link ($map, $x, $y)
2198 2609
2218sub cf::object::player::enter_link { 2629sub cf::object::player::enter_link {
2219 my ($self) = @_; 2630 my ($self) = @_;
2220 2631
2221 $self->deactivate_recursive; 2632 $self->deactivate_recursive;
2222 2633
2634 ++$self->{_link_recursion};
2635
2223 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2636 return if UNIVERSAL::isa $self->map, "ext::map_link";
2224 2637
2225 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2638 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2226 if $self->map && $self->map->{path} ne "{link}"; 2639 if $self->map && $self->map->{path} ne "{link}";
2227 2640
2228 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2641 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2229} 2642}
2230 2643
2231sub cf::object::player::leave_link { 2644sub cf::object::player::leave_link {
2232 my ($self, $map, $x, $y) = @_; 2645 my ($self, $map, $x, $y) = @_;
2233 2646
2250 ($x, $y) = (-1, -1) 2663 ($x, $y) = (-1, -1)
2251 unless (defined $x) && (defined $y); 2664 unless (defined $x) && (defined $y);
2252 2665
2253 # use -1 or undef as default coordinates, not 0, 0 2666 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2667 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2668 if $x <= 0 && $y <= 0;
2256 2669
2257 $map->load; 2670 $map->load;
2258 $map->load_diag; 2671 $map->load_neighbours;
2259 2672
2260 return unless $self->contr->active; 2673 return unless $self->contr->active;
2261 $self->activate_recursive;
2262 2674
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2675 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2264 $self->enter_map ($map, $x, $y); 2676 if ($self->enter_map ($map, $x, $y)) {
2265} 2677 # entering was successful
2678 delete $self->{_link_recursion};
2679 # only activate afterwards, to support waiting in hooks
2680 $self->activate_recursive;
2681 }
2266 2682
2683}
2684
2267=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2685=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2268 2686
2269Moves 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
2270her, loading and preparing them map, calling the provided $check callback 2688her, loading and preparing them map, calling the provided $check callback
2271that 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
2272the new (success) or old (failed) map position. In either case, $done will 2690the new (success) or old (failed) map position. In either case, $done will
2273be called at the end of this process. 2691be called at the end of this process.
2274 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 >>.
2695
2275=cut 2696=cut
2276 2697
2277our $GOTOGEN; 2698our $GOTOGEN;
2278 2699
2279sub cf::object::player::goto { 2700sub cf::object::player::goto {
2280 my ($self, $path, $x, $y, $check, $done) = @_; 2701 my ($self, $path, $x, $y, $check, $done) = @_;
2281 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 }
2708
2282 # 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
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2710 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2711
2285 $self->enter_link; 2712 $self->enter_link;
2286 2713
2287 (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
2288 my $map = eval { 2736 my $map = eval {
2289 my $map = cf::map::find $path; 2737 my $map = defined $path ? cf::map::find $path : undef;
2290 2738
2291 if ($map) { 2739 if ($map) {
2292 $map = $map->customise_for ($self); 2740 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2741 $map = $check->($map, $x, $y, $self) if $check && $map;
2294 } else { 2742 } else {
2295 $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);
2296 } 2744 }
2297 2745
2298 $map 2746 $map
2299 }; 2747 };
2300 2748
2306 if ($gen == $self->{_goto_generation}) { 2754 if ($gen == $self->{_goto_generation}) {
2307 delete $self->{_goto_generation}; 2755 delete $self->{_goto_generation};
2308 $self->leave_link ($map, $x, $y); 2756 $self->leave_link ($map, $x, $y);
2309 } 2757 }
2310 2758
2311 $done->() if $done; 2759 $done->($self) if $done;
2312 })->prio (1); 2760 })->prio (1);
2313} 2761}
2314 2762
2315=item $player_object->enter_exit ($exit_object) 2763=item $player_object->enter_exit ($exit_object)
2316 2764
2336} 2784}
2337 2785
2338sub prepare_random_map { 2786sub prepare_random_map {
2339 my ($exit) = @_; 2787 my ($exit) = @_;
2340 2788
2341 my $guard = cf::lock_acquire "exit_prepare:$exit";
2342
2343 # all this does is basically replace the /! path by 2789 # all this does is basically replace the /! path by
2344 # a new random map path (?random/...) with a seed 2790 # a new random map path (?random/...) with a seed
2345 # that depends on the exit object 2791 # that depends on the exit object
2346 2792
2347 my $rmp = parse_random_map_params $exit->msg; 2793 my $rmp = parse_random_map_params $exit->msg;
2349 if ($exit->map) { 2795 if ($exit->map) {
2350 $rmp->{region} = $exit->region->name; 2796 $rmp->{region} = $exit->region->name;
2351 $rmp->{origin_map} = $exit->map->path; 2797 $rmp->{origin_map} = $exit->map->path;
2352 $rmp->{origin_x} = $exit->x; 2798 $rmp->{origin_x} = $exit->x;
2353 $rmp->{origin_y} = $exit->y; 2799 $rmp->{origin_y} = $exit->y;
2800
2801 $exit->map->touch;
2354 } 2802 }
2355 2803
2356 $rmp->{random_seed} ||= $exit->random_seed; 2804 $rmp->{random_seed} ||= $exit->random_seed;
2357 2805
2358 my $data = cf::to_json $rmp; 2806 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2359 my $md5 = Digest::MD5::md5_hex $data; 2807 my $md5 = Digest::MD5::md5_hex $data;
2360 my $meta = "$RANDOMDIR/$md5.meta"; 2808 my $meta = "$RANDOMDIR/$md5.meta";
2361 2809
2362 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2810 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2363 aio_write $fh, 0, (length $data), $data, 0; 2811 aio_write $fh, 0, (length $data), $data, 0;
2364 undef $fh; 2812 undef $fh;
2365 aio_rename "$meta~", $meta; 2813 aio_rename "$meta~", $meta;
2366 2814
2815 my $slaying = "?random/$md5";
2816
2817 if ($exit->valid) {
2367 $exit->slaying ("?random/$md5"); 2818 $exit->slaying ("?random/$md5");
2368 $exit->msg (undef); 2819 $exit->msg (undef);
2820 }
2369 } 2821 }
2370} 2822}
2371 2823
2372sub cf::object::player::enter_exit { 2824sub cf::object::player::enter_exit {
2373 my ($self, $exit) = @_; 2825 my ($self, $exit) = @_;
2374 2826
2375 return unless $self->type == cf::PLAYER; 2827 return unless $self->type == cf::PLAYER;
2376 2828
2377 if ($exit->slaying eq "/!") {
2378 #TODO: this should de-fi-ni-te-ly not be a sync-job
2379 # the problem is that $exit might not survive long enough
2380 # so it needs to be done right now, right here
2381 cf::sync_job { prepare_random_map $exit };
2382 }
2383
2384 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2385 my $hp = $exit->stats->hp;
2386 my $sp = $exit->stats->sp;
2387
2388 $self->enter_link; 2829 $self->enter_link;
2389 2830
2390 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED);
2393
2394 (async { 2831 (async {
2395 $self->deactivate_recursive; # just to be sure 2832 $Coro::current->{desc} = "enter_exit";
2833
2396 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
2397 $self->goto ($slaying, $hp, $sp); 2849 $self->goto ($map, $x, $y);
2398 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
2399 1; 2855 1
2400 }) { 2856 }) {
2401 $self->message ("Something went wrong deep within the crossfire server. " 2857 $self->message ("Something went wrong deep within the deliantra server. "
2402 . "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. "
2403 . "Please report this to the dungeon master!", 2859 . "Please report this to the dungeon master!",
2404 cf::NDI_UNIQUE | cf::NDI_RED); 2860 cf::NDI_UNIQUE | cf::NDI_RED);
2405 2861
2406 warn "ERROR in enter_exit: $@"; 2862 error "ERROR in enter_exit: $@";
2407 $self->leave_link; 2863 $self->leave_link;
2408 } 2864 }
2409 })->prio (1); 2865 })->prio (1);
2410} 2866}
2411 2867
2423sub cf::client::send_drawinfo { 2879sub cf::client::send_drawinfo {
2424 my ($self, $text, $flags) = @_; 2880 my ($self, $text, $flags) = @_;
2425 2881
2426 utf8::encode $text; 2882 utf8::encode $text;
2427 $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);
2884}
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);
2428} 2909}
2429 2910
2430=item $client->send_msg ($channel, $msg, $color, [extra...]) 2911=item $client->send_msg ($channel, $msg, $color, [extra...])
2431 2912
2432Send a drawinfo or msg packet to the client, formatting the msg for the 2913Send a drawinfo or msg packet to the client, formatting the msg for the
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2915the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2916the message unless the client supports the msg packet.
2436 2917
2437=cut 2918=cut
2438 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
2439sub cf::client::send_msg { 3034sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 3035 my ($self, $channel, $msg, $color, @extra) = @_;
2441 3036
2442 $msg = $self->pl->expand_cfpod ($msg); 3037 $msg = $self->pl->expand_cfpod ($msg)
3038 unless $color & cf::NDI_VERBATIM;
2443 3039
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case... 3040 $color &= cf::NDI_CLIENT_MASK; # just in case...
2447 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
2448 if (ref $channel) { 3049 } elsif (ref $channel) {
2449 # send meta info to client, if not yet sent 3050 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 3051 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 3052 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 3053 $self->ext_msg (channel_info => $channel);
2453 } 3054 }
2454 3055
2455 $channel = $channel->{id}; 3056 $channel = $channel->{id};
2456 } 3057 }
2457 3058
2458 if ($self->can_msg) { 3059 return unless @extra || length $msg;
2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2460 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470 3060
2471 if ($color >= 0) { 3061 # default colour, mask it out
2472 if (0 && $msg =~ /\[/) { 3062 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 3063 if $color & cf::NDI_DEF;
2474 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg")
2477 }
2478 }
2479 }
2480}
2481 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
2482=item $client->ext_event ($type, %msg) 3073=item $client->ext_msg ($type, @msg)
2483 3074
2484Sends an ext event to the client. 3075Sends an ext event to the client.
2485 3076
2486=cut 3077=cut
2487 3078
2488sub cf::client::ext_event($$%) { 3079sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 3080 my ($self, $type, @msg) = @_;
2490 3081
2491 return unless $self->extcmd; 3082 if ($self->extcmd == 2) {
2492 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3084 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 3085 push @msg, msgtype => "event_$type";
2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%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 }
2495} 3106}
2496 3107
2497=item $success = $client->query ($flags, "text", \&cb) 3108=item $success = $client->query ($flags, "text", \&cb)
2498 3109
2499Queues a query to the client, calling the given callback with 3110Queues a query to the client, calling the given callback with
2554 my ($ns, $buf) = @_; 3165 my ($ns, $buf) = @_;
2555 3166
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3167 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 3168
2558 if (ref $msg) { 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
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3177 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 3178 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 3179 }
3180
3181 $ns->ext_reply ($reply, @reply)
3182 if $reply;
3183
2565 } else { 3184 } else {
2566 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3185 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2567 } 3186 }
2568 3187
2569 cf::override; 3188 cf::override;
2570 }, 3189 },
2571); 3190);
2591 3210
2592 $coro 3211 $coro
2593} 3212}
2594 3213
2595cf::client->attach ( 3214cf::client->attach (
2596 on_destroy => sub { 3215 on_client_destroy => sub {
2597 my ($ns) = @_; 3216 my ($ns) = @_;
2598 3217
2599 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3218 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2600 }, 3219 },
2601); 3220);
2616our $safe = new Safe "safe"; 3235our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 3236our $safe_hole = new Safe::Hole;
2618 3237
2619$SIG{FPE} = 'IGNORE'; 3238$SIG{FPE} = 'IGNORE';
2620 3239
2621$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));
2622 3245
2623# here we export the classes and methods available to script code 3246# here we export the classes and methods available to script code
2624 3247
2625=pod 3248=pod
2626 3249
2627The following functions and methods are available within a safe environment: 3250The following functions and methods are available within a safe environment:
2628 3251
2629 cf::object 3252 cf::object
2630 contr pay_amount pay_player map x y force_find force_add 3253 contr pay_amount pay_player map x y force_find force_add destroy
2631 insert remove 3254 insert remove name archname title slaying race decrease split
3255 value
2632 3256
2633 cf::object::player 3257 cf::object::player
2634 player 3258 player
2635 3259
2636 cf::player 3260 cf::player
2641 3265
2642=cut 3266=cut
2643 3267
2644for ( 3268for (
2645 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3269 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2646 insert remove)], 3270 insert remove inv nrof name archname title slaying race
3271 decrease split destroy change_exp value msg lore send_msg)],
2647 ["cf::object::player" => qw(player)], 3272 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 3273 ["cf::player" => qw(peaceful send_msg)],
2649 ["cf::map" => qw(trigger)], 3274 ["cf::map" => qw(trigger)],
2650) { 3275) {
2651 no strict 'refs';
2652 my ($pkg, @funs) = @$_; 3276 my ($pkg, @funs) = @$_;
2653 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3277 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2654 for @funs; 3278 for @funs;
2655} 3279}
2656 3280
2671 3295
2672 my $qcode = $code; 3296 my $qcode = $code;
2673 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3297 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2674 $qcode =~ s/\n/\\n/g; 3298 $qcode =~ s/\n/\\n/g;
2675 3299
3300 %vars = (_dummy => 0) unless %vars;
3301
3302 my @res;
2676 local $_; 3303 local $_;
2677 local @safe::cf::_safe_eval_args = values %vars;
2678 3304
2679 my $eval = 3305 my $eval =
2680 "do {\n" 3306 "do {\n"
2681 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3307 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2682 . "#line 0 \"{$qcode}\"\n" 3308 . "#line 0 \"{$qcode}\"\n"
2683 . $code 3309 . $code
2684 . "\n}" 3310 . "\n}"
2685 ; 3311 ;
2686 3312
3313 if ($CFG{safe_eval}) {
2687 sub_generation_inc; 3314 sub_generation_inc;
3315 local @safe::cf::_safe_eval_args = values %vars;
2688 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3316 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2689 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 }
2690 3322
2691 if ($@) { 3323 if ($@) {
2692 warn "$@"; 3324 warn "$@",
2693 warn "while executing safe code '$code'\n"; 3325 "while executing safe code '$code'\n",
2694 warn "with arguments " . (join " ", %vars) . "\n"; 3326 "with arguments " . (join " ", %vars) . "\n";
2695 } 3327 }
2696 3328
2697 wantarray ? @res : $res[0] 3329 wantarray ? @res : $res[0]
2698} 3330}
2699 3331
2713=cut 3345=cut
2714 3346
2715sub register_script_function { 3347sub register_script_function {
2716 my ($fun, $cb) = @_; 3348 my ($fun, $cb) = @_;
2717 3349
2718 no strict 'refs'; 3350 $fun = "safe::$fun" if $CFG{safe_eval};
2719 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3351 *$fun = $safe_hole->wrap ($cb);
2720} 3352}
2721 3353
2722=back 3354=back
2723 3355
2724=cut 3356=cut
2727# the server's init and main functions 3359# the server's init and main functions
2728 3360
2729sub load_facedata($) { 3361sub load_facedata($) {
2730 my ($path) = @_; 3362 my ($path) = @_;
2731 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
2732 warn "loading facedata from $path\n"; 3370 trace "loading facedata from $path\n";
2733 3371
2734 my $facedata; 3372 my $facedata;
2735 0 < aio_load $path, $facedata 3373 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 3374 or die "$path: $!";
2737 3375
2738 $facedata = Coro::Storable::thaw $facedata; 3376 $facedata = Coro::Storable::thaw $facedata;
2739 3377
2740 $facedata->{version} == 2 3378 $facedata->{version} == 2
2741 or cf::cleanup "$path: version mismatch, cannot proceed."; 3379 or cf::cleanup "$path: version mismatch, cannot proceed.";
2742 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
2743 { 3390 {
2744 my $faces = $facedata->{faceinfo}; 3391 my $faces = $facedata->{faceinfo};
2745 3392
2746 while (my ($face, $info) = each %$faces) { 3393 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3394 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3395
2748 cf::face::set_visibility $idx, $info->{visibility}; 3396 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 3397 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3398 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3399 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2752 3400
2753 cf::cede_to_tick; 3401 cf::cede_to_tick;
2754 } 3402 }
2755 3403
2756 while (my ($face, $info) = each %$faces) { 3404 while (my ($face, $info) = each %$faces) {
2757 next unless $info->{smooth}; 3405 next unless $info->{smooth};
3406
2758 my $idx = cf::face::find $face 3407 my $idx = cf::face::find $face
2759 or next; 3408 or next;
3409
2760 if (my $smooth = cf::face::find $info->{smooth}) { 3410 if (my $smooth = cf::face::find $info->{smooth}) {
2761 cf::face::set_smooth $idx, $smooth; 3411 cf::face::set_smooth $idx, $smooth;
2762 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3412 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2763 } else { 3413 } else {
2764 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3414 error "smooth face '$info->{smooth}' not found for face '$face'";
2765 } 3415 }
2766 3416
2767 cf::cede_to_tick; 3417 cf::cede_to_tick;
2768 } 3418 }
2769 } 3419 }
2778 3428
2779 cf::anim::invalidate_all; # d'oh 3429 cf::anim::invalidate_all; # d'oh
2780 } 3430 }
2781 3431
2782 { 3432 {
2783 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 3433 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical;
2787 3434
2788 while (my ($name, $info) = each %$res) { 3435 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({ 3436 if (defined $info->{type}) {
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3437 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2796 3438
2797 if ($name =~ /\.jpg$/) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3439 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3440 cf::face::set_type $idx, $info->{type};
2800 } else { 3441 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 3442 $RESOURCE{$name} = $info; # unused
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 3443 }
2807 3444
2808 cf::cede_to_tick; 3445 cf::cede_to_tick;
2809 } 3446 }
2810 } 3447 }
2811 3448
3449 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3450
2812 1 3451 1
2813} 3452}
2814 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
2815sub 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
2816 load_resource_file "$MAPDIR/regions" 3477 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 3478 or die "unable to load regions file\n";
2818 3479
2819 for (cf::region::list) { 3480 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 3481 $_->{match} = qr/$_->{match}/
2828} 3489}
2829 3490
2830sub reload_archetypes { 3491sub reload_archetypes {
2831 load_resource_file "$DATADIR/archetypes" 3492 load_resource_file "$DATADIR/archetypes"
2832 or die "unable to load archetypes\n"; 3493 or die "unable to load archetypes\n";
2833 #d# NEED to laod twice to resolve forward references
2834 # this really needs to be done in an extra post-pass
2835 # (which needs to be synchronous, so solve it differently)
2836 load_resource_file "$DATADIR/archetypes"
2837 or die "unable to load archetypes\n";
2838} 3494}
2839 3495
2840sub reload_treasures { 3496sub reload_treasures {
2841 load_resource_file "$DATADIR/treasures" 3497 load_resource_file "$DATADIR/treasures"
2842 or die "unable to load treasurelists\n"; 3498 or die "unable to load treasurelists\n";
2843} 3499}
2844 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
2845sub reload_resources { 3524sub reload_resources {
2846 warn "reloading resource files...\n"; 3525 trace "reloading resource files...\n";
2847 3526
3527 reload_facedata;
3528 reload_sound;
3529 reload_archetypes;
2848 reload_regions; 3530 reload_regions;
2849 reload_facedata;
2850 #reload_archetypes;#d#
2851 reload_archetypes;
2852 reload_treasures; 3531 reload_treasures;
2853 3532
2854 warn "finished reloading resource files\n"; 3533 trace "finished reloading resource files\n";
2855} 3534}
2856 3535
2857sub init { 3536sub reload_config {
2858 reload_resources; 3537 trace "reloading config file...\n";
2859}
2860 3538
2861sub cfg_load {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3539 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3540 or return;
2864 3541
2865 local $/; 3542 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3543 *CFG = YAML::XS::Load scalar <$fh>;
2867 3544
2868 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3545 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2869 3546
2870 $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};
2871 $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};
2872 3549
2873 if (exists $CFG{mlockall}) { 3550 if (exists $CFG{mlockall}) {
2875 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3552 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2876 and die "WARNING: m(un)lockall failed: $!\n"; 3553 and die "WARNING: m(un)lockall failed: $!\n";
2877 }; 3554 };
2878 warn $@ if $@; 3555 warn $@ if $@;
2879 } 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;
2880} 3587}
2881 3588
2882sub 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
2883 # we must not ever block the main coroutine 3599 # we must not ever block the main coroutine
2884 local $Coro::idle = sub { 3600 local $Coro::idle = sub {
2885 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#
2886 (async { 3602 (async {
2887 Event::one_event; 3603 $Coro::current->{desc} = "IDLE BUG HANDLER";
3604 EV::loop EV::LOOP_ONESHOT;
2888 })->prio (Coro::PRIO_MAX); 3605 })->prio (Coro::PRIO_MAX);
2889 }; 3606 };
2890 3607
2891 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;
2892 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
2893 load_extensions; 3631 load_extensions;
2894 3632
2895 $TICK_WATCHER->start; 3633 utime time, time, $RUNTIMEFILE;
2896 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;
2897} 3646}
2898 3647
2899############################################################################# 3648#############################################################################
2900# initialisation and cleanup 3649# initialisation and cleanup
2901 3650
2902# install some emergency cleanup handlers 3651# install some emergency cleanup handlers
2903BEGIN { 3652BEGIN {
3653 our %SIGWATCHER = ();
2904 for my $signal (qw(INT HUP TERM)) { 3654 for my $signal (qw(INT HUP TERM)) {
2905 Event->signal ( 3655 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2906 reentrant => 0,
2907 data => WF_AUTOCANCEL,
2908 signal => $signal,
2909 prio => 0,
2910 cb => sub {
2911 cf::cleanup "SIG$signal"; 3656 cf::cleanup "SIG$signal";
2912 },
2913 ); 3657 };
2914 } 3658 }
2915} 3659}
2916 3660
2917sub write_runtime { 3661sub write_runtime_sync {
2918 my $runtime = "$LOCALDIR/runtime"; 3662 my $t0 = AE::time;
2919 3663
2920 # first touch the runtime file to show we are still running: 3664 # first touch the runtime file to show we are still running:
2921 # the fsync below can take a very very long time. 3665 # the fsync below can take a very very long time.
2922 3666
2923 IO::AIO::aio_utime $runtime, undef, undef; 3667 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2924 3668
2925 my $guard = cf::lock_acquire "write_runtime"; 3669 my $guard = cf::lock_acquire "write_runtime";
2926 3670
2927 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3671 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2928 or return; 3672 or return;
2929 3673
2930 my $value = $cf::RUNTIME + 90 + 10; 3674 my $value = $cf::RUNTIME + 90 + 10;
2931 # 10 is the runtime save interval, for a monotonic clock 3675 # 10 is the runtime save interval, for a monotonic clock
2932 # 60 allows for the watchdog to kill the server. 3676 # 60 allows for the watchdog to kill the server.
2942 aio_utime $fh, undef, undef; 3686 aio_utime $fh, undef, undef;
2943 3687
2944 close $fh 3688 close $fh
2945 or return; 3689 or return;
2946 3690
2947 aio_rename "$runtime~", $runtime 3691 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2948 and return; 3692 and return;
2949 3693
2950 warn "runtime file written.\n"; 3694 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2951 3695
2952 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 };
2953} 3747}
2954 3748
2955sub emergency_save() { 3749sub emergency_save() {
2956 my $freeze_guard = cf::freeze_mainloop; 3750 my $freeze_guard = cf::freeze_mainloop;
2957 3751
2958 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;
2959 3758
2960 cf::sync_job { 3759 cf::sync_job {
3760 cf::write_runtime_sync; # external watchdog should not bark
3761
2961 # use a peculiar iteration method to avoid tripping on perl 3762 # use a peculiar iteration method to avoid tripping on perl
2962 # refcount bugs in for. also avoids problems with players 3763 # refcount bugs in for. also avoids problems with players
2963 # and maps saved/destroyed asynchronously. 3764 # and maps saved/destroyed asynchronously.
2964 warn "begin emergency player save\n"; 3765 info "emergency_perl_save: begin player save\n";
2965 for my $login (keys %cf::PLAYER) { 3766 for my $login (keys %cf::PLAYER) {
2966 my $pl = $cf::PLAYER{$login} or next; 3767 my $pl = $cf::PLAYER{$login} or next;
2967 $pl->valid or next; 3768 $pl->valid or next;
3769 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2968 $pl->save; 3770 $pl->save;
2969 } 3771 }
2970 warn "end emergency player save\n"; 3772 info "emergency_perl_save: end player save\n";
2971 3773
2972 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";
2973 for my $path (keys %cf::MAP) { 3777 for my $path (keys %cf::MAP) {
2974 my $map = $cf::MAP{$path} or next; 3778 my $map = $cf::MAP{$path} or next;
2975 $map->valid or next; 3779 $map->valid or next;
2976 $map->save; 3780 $map->save;
2977 } 3781 }
2978 warn "end emergency map save\n"; 3782 info "emergency_perl_save: end map save\n";
2979 3783
2980 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";
2981 BDB::db_env_txn_checkpoint $DB_ENV; 3787 BDB::db_env_txn_checkpoint $DB_ENV;
2982 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
2983 }; 3812 };
2984 3813
2985 warn "leave emergency perl save\n"; 3814 info "emergency_perl_save: leave\n";
2986} 3815}
2987 3816
2988sub post_cleanup { 3817sub post_cleanup {
2989 my ($make_core) = @_; 3818 my ($make_core) = @_;
2990 3819
3820 IO::AIO::flush;
3821
2991 warn Carp::longmess "post_cleanup backtrace" 3822 error Carp::longmess "post_cleanup backtrace"
2992 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 }
2993} 3852}
2994 3853
2995sub do_reload_perl() { 3854sub do_reload_perl() {
2996 # can/must only be called in main 3855 # can/must only be called in main
2997 if ($Coro::current != $Coro::main) { 3856 if (in_main) {
2998 warn "can only reload from main coroutine"; 3857 error "can only reload from main coroutine";
2999 return; 3858 return;
3000 } 3859 }
3001 3860
3861 return if $RELOAD++;
3862
3863 my $t1 = AE::time;
3864
3865 while ($RELOAD) {
3002 warn "reloading..."; 3866 info "reloading...";
3003 3867
3004 warn "entering sync_job"; 3868 trace "entering sync_job";
3005 3869
3006 cf::sync_job { 3870 cf::sync_job {
3007 cf::write_runtime; # external watchdog should not bark
3008 cf::emergency_save; 3871 cf::emergency_save;
3009 cf::write_runtime; # external watchdog should not bark
3010 3872
3011 warn "syncing database to disk";
3012 BDB::db_env_txn_checkpoint $DB_ENV;
3013
3014 # if anything goes wrong in here, we should simply crash as we already saved
3015
3016 warn "cancelling all WF_AUTOCANCEL watchers";
3017 for (Event::all_watchers) {
3018 $_->cancel if $_->data & WF_AUTOCANCEL;
3019 }
3020
3021 warn "flushing outstanding aio requests";
3022 for (;;) {
3023 BDB::flush;
3024 IO::AIO::flush;
3025 Coro::cede;
3026 last unless IO::AIO::nreqs || BDB::nreqs;
3027 warn "iterate...";
3028 }
3029
3030 ++$RELOAD;
3031
3032 warn "cancelling all extension coros"; 3873 trace "cancelling all extension coros";
3033 $_->cancel for values %EXT_CORO; 3874 $_->cancel for values %EXT_CORO;
3034 %EXT_CORO = (); 3875 %EXT_CORO = ();
3035 3876
3036 warn "removing commands"; 3877 trace "removing commands";
3037 %COMMAND = (); 3878 %COMMAND = ();
3038 3879
3039 warn "removing ext/exti commands"; 3880 trace "removing ext/exti commands";
3040 %EXTCMD = (); 3881 %EXTCMD = ();
3041 %EXTICMD = (); 3882 %EXTICMD = ();
3042 3883
3043 warn "unloading/nuking all extensions"; 3884 trace "unloading/nuking all extensions";
3044 for my $pkg (@EXTS) { 3885 for my $pkg (@EXTS) {
3045 warn "... unloading $pkg"; 3886 trace "... unloading $pkg";
3046 3887
3047 if (my $cb = $pkg->can ("unload")) { 3888 if (my $cb = $pkg->can ("unload")) {
3048 eval { 3889 eval {
3049 $cb->($pkg); 3890 $cb->($pkg);
3050 1 3891 1
3051 } 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;
3052 } 3897 }
3053 3898
3054 warn "... nuking $pkg";
3055 Symbol::delete_package $pkg;
3056 }
3057
3058 warn "unloading all perl modules loaded from $LIBDIR"; 3899 trace "unloading all perl modules loaded from $LIBDIR";
3059 while (my ($k, $v) = each %INC) { 3900 while (my ($k, $v) = each %INC) {
3060 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3901 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3061 3902
3062 warn "... unloading $k"; 3903 trace "... unloading $k";
3063 delete $INC{$k}; 3904 delete $INC{$k};
3064 3905
3065 $k =~ s/\.pm$//; 3906 $k =~ s/\.pm$//;
3066 $k =~ s/\//::/g; 3907 $k =~ s/\//::/g;
3067 3908
3068 if (my $cb = $k->can ("unload_module")) { 3909 if (my $cb = $k->can ("unload_module")) {
3069 $cb->(); 3910 $cb->();
3911 }
3912
3913 clear_package $k;
3070 } 3914 }
3071 3915
3072 Symbol::delete_package $k;
3073 }
3074
3075 warn "getting rid of safe::, as good as possible"; 3916 trace "getting rid of safe::, as good as possible";
3076 Symbol::delete_package "safe::$_" 3917 clear_package "safe::$_"
3077 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);
3078 3919
3079 warn "unloading cf.pm \"a bit\""; 3920 trace "unloading cf.pm \"a bit\"";
3080 delete $INC{"cf.pm"}; 3921 delete $INC{"cf.pm"};
3081 delete $INC{"cf/pod.pm"}; 3922 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3082 3923
3083 # don't, removes xs symbols, too, 3924 # don't, removes xs symbols, too,
3084 # and global variables created in xs 3925 # and global variables created in xs
3085 #Symbol::delete_package __PACKAGE__; 3926 #clear_package __PACKAGE__;
3086 3927
3087 warn "unload completed, starting to reload now"; 3928 info "unload completed, starting to reload now";
3088 3929
3089 warn "reloading cf.pm"; 3930 trace "reloading cf.pm";
3090 require cf; 3931 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3932 cf::_connect_to_perl_1;
3092 3933
3093 warn "loading config and database again"; 3934 trace "loading config and database again";
3094 cf::cfg_load; 3935 cf::reload_config;
3095 3936
3096 warn "loading extensions"; 3937 trace "loading extensions";
3097 cf::load_extensions; 3938 cf::load_extensions;
3098 3939
3940 if ($REATTACH_ON_RELOAD) {
3099 warn "reattaching attachments to objects/players"; 3941 trace "reattaching attachments to objects/players";
3100 _global_reattach; # objects, sockets 3942 _global_reattach; # objects, sockets
3101 warn "reattaching attachments to maps"; 3943 trace "reattaching attachments to maps";
3102 reattach $_ for values %MAP; 3944 reattach $_ for values %MAP;
3103 warn "reattaching attachments to players"; 3945 trace "reattaching attachments to players";
3104 reattach $_ for values %PLAYER; 3946 reattach $_ for values %PLAYER;
3947 }
3105 3948
3949 trace "running post_init jobs";
3950 (pop @POST_INIT)->(1) while @POST_INIT;
3951
3106 warn "leaving sync_job"; 3952 trace "leaving sync_job";
3107 3953
3108 1 3954 1
3109 } or do { 3955 } or do {
3110 warn $@; 3956 error $@;
3111 warn "error while reloading, exiting."; 3957 cf::cleanup "error while reloading, exiting.";
3112 exit 1; 3958 };
3959
3960 info "reloaded";
3961 --$RELOAD;
3113 }; 3962 }
3114 3963
3115 warn "reloaded"; 3964 $t1 = AE::time - $t1;
3965 info "reload completed in ${t1}s\n";
3116}; 3966};
3117 3967
3118our $RELOAD_WATCHER; # used only during reload 3968our $RELOAD_WATCHER; # used only during reload
3119 3969
3120sub reload_perl() { 3970sub reload_perl() {
3121 # doing reload synchronously and two reloads happen back-to-back, 3971 # doing reload synchronously and two reloads happen back-to-back,
3122 # coro crashes during coro_state_free->destroy here. 3972 # coro crashes during coro_state_free->destroy here.
3123 3973
3124 $RELOAD_WATCHER ||= Event->timer ( 3974 $RELOAD_WATCHER ||= cf::async {
3125 reentrant => 0, 3975 Coro::AIO::aio_wait cache_extensions;
3126 after => 0, 3976
3127 data => WF_AUTOCANCEL, 3977 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3128 cb => sub {
3129 do_reload_perl; 3978 do_reload_perl;
3130 undef $RELOAD_WATCHER; 3979 undef $RELOAD_WATCHER;
3131 }, 3980 };
3132 ); 3981 };
3133} 3982}
3134 3983
3135register_command "reload" => sub { 3984register_command "reload" => sub {
3136 my ($who, $arg) = @_; 3985 my ($who, $arg) = @_;
3137 3986
3138 if ($who->flag (FLAG_WIZ)) { 3987 if ($who->flag (FLAG_WIZ)) {
3139 $who->message ("reloading server."); 3988 $who->message ("reloading server.");
3989 async {
3990 $Coro::current->{desc} = "perl_reload";
3140 async { reload_perl }; 3991 reload_perl;
3992 };
3141 } 3993 }
3142}; 3994};
3143 3995
3144unshift @INC, $LIBDIR; 3996unshift @INC, $LIBDIR;
3145 3997
3147 3999
3148our @WAIT_FOR_TICK; 4000our @WAIT_FOR_TICK;
3149our @WAIT_FOR_TICK_BEGIN; 4001our @WAIT_FOR_TICK_BEGIN;
3150 4002
3151sub wait_for_tick { 4003sub wait_for_tick {
3152 return unless $TICK_WATCHER->is_active;
3153 return if $Coro::current == $Coro::main; 4004 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3154 4005
3155 my $signal = new Coro::Signal; 4006 my $signal = new Coro::Signal;
3156 push @WAIT_FOR_TICK, $signal; 4007 push @WAIT_FOR_TICK, $signal;
3157 $signal->wait; 4008 $signal->wait;
3158} 4009}
3159 4010
3160sub wait_for_tick_begin { 4011sub wait_for_tick_begin {
3161 return unless $TICK_WATCHER->is_active;
3162 return if $Coro::current == $Coro::main; 4012 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3163 4013
3164 my $signal = new Coro::Signal; 4014 my $signal = new Coro::Signal;
3165 push @WAIT_FOR_TICK_BEGIN, $signal; 4015 push @WAIT_FOR_TICK_BEGIN, $signal;
3166 $signal->wait; 4016 $signal->wait;
3167} 4017}
3168 4018
3169 my $min = 1e6;#d# 4019sub tick {
3170 my $avg = 10;
3171$TICK_WATCHER = Event->timer (
3172 reentrant => 0,
3173 parked => 1,
3174 prio => 0,
3175 at => $NEXT_TICK || $TICK,
3176 data => WF_AUTOCANCEL,
3177 cb => sub {
3178 if ($Coro::current != $Coro::main) { 4020 if ($Coro::current != $Coro::main) {
3179 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"
3180 unless ++$bug_warning > 10; 4022 unless ++$bug_warning > 10;
3181 return; 4023 return;
3182 } 4024 }
3183 4025
3184 $NOW = $tick_start = Event::time;
3185
3186 cf::server_tick; # one server iteration 4026 cf::server_tick; # one server iteration
3187 4027
3188 0 && sync_job {#d# 4028 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3189 for(1..10) {
3190 my $t = Event::time;
3191 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3192 or die;
3193 4029
3194 $map->width (50); 4030 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3195 $map->height (50); 4031 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3196 $map->alloc; 4032 Coro::async_pool {
3197 $map->_load_objects ("/tmp/x.map", 1); 4033 $Coro::current->{desc} = "runtime saver";
3198 my $t = Event::time - $t; 4034 write_runtime_sync
3199 4035 or error "ERROR: unable to write runtime file: $!";
3200 #next unless $t < 0.0013;#d#
3201 if ($t < $min) {
3202 $min = $t;
3203 }
3204 $avg = $avg * 0.99 + $t * 0.01;
3205 }
3206 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3207 exit 0;
3208 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3209 }; 4036 };
4037 }
3210 4038
3211 $RUNTIME += $TICK;
3212 $NEXT_TICK += $TICK;
3213
3214 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3215 $NEXT_RUNTIME_WRITE = $NOW + 10;
3216 Coro::async_pool {
3217 write_runtime
3218 or warn "ERROR: unable to write runtime file: $!";
3219 };
3220 }
3221
3222# my $AFTER = Event::time;
3223# warn $AFTER - $NOW;#d#
3224
3225 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4039 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226 $sig->send; 4040 $sig->send;
3227 } 4041 }
3228 while (my $sig = shift @WAIT_FOR_TICK) { 4042 while (my $sig = shift @WAIT_FOR_TICK) {
3229 $sig->send; 4043 $sig->send;
3230 } 4044 }
3231 4045
3232 $NOW = Event::time; 4046 $LOAD = ($NOW - $TICK_START) / $TICK;
3233
3234 # if we are delayed by four ticks or more, skip them all
3235 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3236
3237 $TICK_WATCHER->at ($NEXT_TICK);
3238 $TICK_WATCHER->start;
3239
3240 $LOAD = ($NOW - $tick_start) / $TICK;
3241 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4047 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242 4048
3243 _post_tick; 4049 if (0) {
3244 4050 if ($NEXT_TICK) {
3245 4051 my $jitter = $TICK_START - $NEXT_TICK;
4052 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4053 debug "jitter $JITTER\n";#d#
4054 }
3246 }, 4055 }
3247); 4056}
3248 4057
3249{ 4058{
3250 BDB::max_poll_time $TICK * 0.1; 4059 # configure BDB
3251 $BDB_POLL_WATCHER = Event->io ( 4060
3252 reentrant => 0,
3253 fd => BDB::poll_fileno,
3254 poll => 'r',
3255 prio => 0,
3256 data => WF_AUTOCANCEL,
3257 cb => \&BDB::poll_cb,
3258 );
3259 BDB::min_parallel 8; 4061 BDB::min_parallel 16;
3260 4062 BDB::max_poll_reqs $TICK * 0.1;
3261 BDB::set_sync_prepare { 4063 $AnyEvent::BDB::WATCHER->priority (1);
3262 my $status;
3263 my $current = $Coro::current;
3264 (
3265 sub {
3266 $status = $!;
3267 $current->ready; undef $current;
3268 },
3269 sub {
3270 Coro::schedule while defined $current;
3271 $! = $status;
3272 },
3273 )
3274 };
3275 4064
3276 unless ($DB_ENV) { 4065 unless ($DB_ENV) {
3277 $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);
3278 4072
3279 cf::sync_job { 4073 cf::sync_job {
3280 eval { 4074 eval {
3281 BDB::db_env_open 4075 BDB::db_env_open
3282 $DB_ENV, 4076 $DB_ENV,
3284 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
3285 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4079 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3286 0666; 4080 0666;
3287 4081
3288 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4082 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3289
3290 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3291 $DB_ENV->set_lk_detect;
3292 }; 4083 };
3293 4084
3294 cf::cleanup "db_env_open(db): $@" if $@; 4085 cf::cleanup "db_env_open(db): $@" if $@;
3295 }; 4086 };
3296 } 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 };
3297} 4098}
3298 4099
3299{ 4100{
4101 # configure IO::AIO
4102
3300 IO::AIO::min_parallel 8; 4103 IO::AIO::min_parallel 8;
3301
3302 undef $Coro::AIO::WATCHER;
3303 IO::AIO::max_poll_time $TICK * 0.1; 4104 IO::AIO::max_poll_time $TICK * 0.1;
3304 $AIO_POLL_WATCHER = Event->io ( 4105 undef $AnyEvent::AIO::WATCHER;
3305 reentrant => 0,
3306 data => WF_AUTOCANCEL,
3307 fd => IO::AIO::poll_fileno,
3308 poll => 'r',
3309 prio => 6,
3310 cb => \&IO::AIO::poll_cb,
3311 );
3312} 4106}
3313 4107
3314my $_log_backtrace; 4108my $_log_backtrace;
3315 4109
3316sub _log_backtrace { 4110sub _log_backtrace {
3319 $msg =~ s/\n//; 4113 $msg =~ s/\n//;
3320 4114
3321 # limit the # of concurrent backtraces 4115 # limit the # of concurrent backtraces
3322 if ($_log_backtrace < 2) { 4116 if ($_log_backtrace < 2) {
3323 ++$_log_backtrace; 4117 ++$_log_backtrace;
4118 my $perl_bt = Carp::longmess $msg;
3324 async { 4119 async {
4120 $Coro::current->{desc} = "abt $msg";
4121
3325 my @bt = fork_call { 4122 my @bt = fork_call {
3326 @addr = map { sprintf "%x", $_ } @addr; 4123 @addr = map { sprintf "%x", $_ } @addr;
3327 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4124 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3328 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 |"
3329 or die "addr2line: $!"; 4126 or die "addr2line: $!";
3337 } 4134 }
3338 4135
3339 @funcs 4136 @funcs
3340 }; 4137 };
3341 4138
3342 LOG llevInfo, "[ABT] $msg\n"; 4139 LOG llevInfo, "[ABT] $perl_bt\n";
4140 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3343 LOG llevInfo, "[ABT] $_\n" for @bt; 4141 LOG llevInfo, "[ABT] $_\n" for @bt;
3344 --$_log_backtrace; 4142 --$_log_backtrace;
3345 }; 4143 };
3346 } else { 4144 } else {
3347 LOG llevInfo, "[ABT] $msg\n"; 4145 LOG llevInfo, "[ABT] $msg\n";
3348 LOG llevInfo, "[ABT] [suppressed]\n"; 4146 LOG llevInfo, "[ABT] [suppressed]\n";
3349 } 4147 }
3350} 4148}
3351 4149
3352# load additional modules 4150# load additional modules
3353use cf::pod; 4151require "cf/$_.pm" for @EXTRA_MODULES;
4152cf::_connect_to_perl_2;
3354 4153
3355END { cf::emergency_save } 4154END { cf::emergency_save }
3356 4155
33571 41561
3358 4157

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines