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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines