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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.311 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.544 by root, Thu May 6 21:58:07 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5;
29use Fcntl; 56use Fcntl;
30use YAML::Syck (); 57use YAML::XS ();
31use IO::AIO 2.32 (); 58use IO::AIO ();
32use Time::HiRes; 59use Time::HiRes;
33use Compress::LZF; 60use Compress::LZF;
34use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
35 64
36# configure various modules to our taste 65# configure various modules to our taste
37# 66#
38$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41 75
42$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
43 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 78
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
53 85
54our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
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 incloader);
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 common::sense;\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},
1554 1848
1555sub register { 1849sub register {
1556 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1557 my $pkg = caller; 1851 my $pkg = caller;
1558 1852
1559 no strict;
1560 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1561 1854
1562 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1563} 1856}
1564 1857
1565# also paths starting with '/' 1858# also paths starting with '/'
1566$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1567 1860
1568sub thawer_merge { 1861sub thawer_merge {
1569 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1570 1863
1571 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
1576} 1869}
1577 1870
1578sub normalise { 1871sub normalise {
1579 my ($path, $base) = @_; 1872 my ($path, $base) = @_;
1580 1873
1581 $path = "$path"; # make sure its a string 1874 $path = "$path"; # make sure it's a string
1582 1875
1583 $path =~ s/\.map$//; 1876 $path =~ s/\.map$//;
1584 1877
1585 # map plan: 1878 # map plan:
1586 # 1879 #
1625 $self->init; # pass $1 etc. 1918 $self->init; # pass $1 etc.
1626 return $self; 1919 return $self;
1627 } 1920 }
1628 } 1921 }
1629 1922
1630 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1923 Carp::cluck "unable to resolve path '$path' (base '$base')";
1631 () 1924 ()
1632} 1925}
1633 1926
1634sub init { 1927sub init {
1635 my ($self) = @_; 1928 my ($self) = @_;
1657 1950
1658# the temporary/swap location 1951# the temporary/swap location
1659sub save_path { 1952sub save_path {
1660 my ($self) = @_; 1953 my ($self) = @_;
1661 1954
1662 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1663 "$TMPDIR/$path.map" 1956 "$TMPDIR/$path.map"
1664} 1957}
1665 1958
1666# the unique path, undef == no special unique path 1959# the unique path, undef == no special unique path
1667sub uniq_path { 1960sub uniq_path {
1668 my ($self) = @_; 1961 my ($self) = @_;
1669 1962
1670 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1963 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1671 "$UNIQUEDIR/$path" 1964 "$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} 1965}
1682 1966
1683sub decay_objects { 1967sub decay_objects {
1684 my ($self) = @_; 1968 my ($self) = @_;
1685 1969
1698 1982
1699sub load_header_from($) { 1983sub load_header_from($) {
1700 my ($self, $path) = @_; 1984 my ($self, $path) = @_;
1701 1985
1702 utf8::encode $path; 1986 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1987 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 or return; 1988 or return;
1989
1990 $self->_load_header ($f)
1991 or return;
1992
1993 local $MAP_LOADING{$self->{path}} = $self;
1994 $f->resolve_delayed_derefs;
1708 1995
1709 $self->{load_path} = $path; 1996 $self->{load_path} = $path;
1710 1997
1711 1 1998 1
1712} 1999}
1764 2051
1765sub find; 2052sub find;
1766sub find { 2053sub find {
1767 my ($path, $origin) = @_; 2054 my ($path, $origin) = @_;
1768 2055
2056 cf::cede_to_tick;
2057
1769 $path = normalise $path, $origin && $origin->path; 2058 $path = normalise $path, $origin && $origin->path;
1770 2059
2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 2061 my $guard2 = cf::lock_acquire "map_find:$path";
1772 2062
1773 $cf::MAP{$path} || do { 2063 $cf::MAP{$path} || do {
1774 my $guard = cf::lock_acquire "map_find:$path";
1775 my $map = new_from_path cf::map $path 2064 my $map = new_from_path cf::map $path
1776 or return; 2065 or return;
1777 2066
1778 $map->{last_save} = $cf::RUNTIME; 2067 $map->{last_save} = $cf::RUNTIME;
1779 2068
1781 or return; 2070 or return;
1782 2071
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2072 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 2073 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 2074 #$cf::WAIT_FOR_TICK->wait;
2075 undef $guard2;
2076 undef $guard1;
1786 $map->reset; 2077 $map->reset;
1787 undef $guard;
1788 return find $path; 2078 return find $path;
1789 } 2079 }
1790 2080
1791 $cf::MAP{$path} = $map 2081 $cf::MAP{$path} = $map
1792 } 2082 }
1793} 2083}
1794 2084
1795sub pre_load { } 2085sub pre_load { }
1796sub post_load { } 2086#sub post_load { } # XS
1797 2087
1798sub load { 2088sub load {
1799 my ($self) = @_; 2089 my ($self) = @_;
1800 2090
1801 local $self->{deny_reset} = 1; # loading can take a long time 2091 local $self->{deny_reset} = 1; # loading can take a long time
1802 2092
1803 my $path = $self->{path}; 2093 my $path = $self->{path};
1804 2094
1805 { 2095 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 2096 my $guard = cf::lock_acquire "map_data:$path";
1807 2097
2098 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 2099 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 2100
1810 $self->in_memory (cf::MAP_LOADING); 2101 $self->in_memory (cf::MAP_LOADING);
1811 2102
1812 $self->alloc; 2103 $self->alloc;
1813 2104
1814 $self->pre_load; 2105 $self->pre_load;
1815 Coro::cede; 2106 cf::cede_to_tick;
1816 2107
2108 my $f = new_from_file cf::object::thawer $self->{load_path};
2109 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 2110 $self->_load_objects ($f)
1818 or return; 2111 or return;
1819 2112
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2113 $self->post_load_original
1821 if delete $self->{load_original}; 2114 if delete $self->{load_original};
1822 2115
1823 if (my $uniq = $self->uniq_path) { 2116 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 2117 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 2118 unless (aio_stat $uniq) {
2119 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 2120 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 2121 $self->_load_objects ($f);
2122 $f->resolve_delayed_derefs;
2123 }
1828 } 2124 }
1829 } 2125 }
1830 2126
1831 Coro::cede; 2127 $f->resolve_delayed_derefs;
2128
2129 cf::cede_to_tick;
1832 # now do the right thing for maps 2130 # now do the right thing for maps
1833 $self->link_multipart_objects; 2131 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 2132 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 2133 unless $self->difficulty;
1836 Coro::cede; 2134 cf::cede_to_tick;
1837 2135
1838 unless ($self->{deny_activate}) { 2136 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 2137 $self->decay_objects;
1840 $self->fix_auto_apply; 2138 $self->fix_auto_apply;
1841 $self->update_buttons; 2139 $self->update_buttons;
1842 Coro::cede; 2140 cf::cede_to_tick;
1843 $self->set_darkness_map;
1844 Coro::cede;
1845 $self->activate; 2141 $self->activate;
1846 } 2142 }
1847 2143
2144 $self->{last_save} = $cf::RUNTIME;
2145 $self->last_access ($cf::RUNTIME);
2146
1848 $self->in_memory (cf::MAP_IN_MEMORY); 2147 $self->in_memory (cf::MAP_ACTIVE);
1849 } 2148 }
1850 2149
1851 $self->post_load; 2150 $self->post_load;
1852} 2151}
1853 2152
2153# customize the map for a given player, i.e.
2154# return the _real_ map. used by e.g. per-player
2155# maps to change the path to ~playername/mappath
1854sub customise_for { 2156sub customise_for {
1855 my ($self, $ob) = @_; 2157 my ($self, $ob) = @_;
1856 2158
1857 return find "~" . $ob->name . "/" . $self->{path} 2159 return find "~" . $ob->name . "/" . $self->{path}
1858 if $self->per_player; 2160 if $self->per_player;
1862 2164
1863 $self 2165 $self
1864} 2166}
1865 2167
1866# find and load all maps in the 3x3 area around a map 2168# find and load all maps in the 3x3 area around a map
1867sub load_diag { 2169sub load_neighbours {
1868 my ($map) = @_; 2170 my ($map) = @_;
1869 2171
1870 my @diag; # diagonal neighbours 2172 my @neigh; # diagonal neighbours
1871 2173
1872 for (0 .. 3) { 2174 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 2175 my $neigh = $map->tile_path ($_)
1874 or next; 2176 or next;
1875 $neigh = find $neigh, $map 2177 $neigh = find $neigh, $map
1876 or next; 2178 or next;
1877 $neigh->load; 2179 $neigh->load;
1878 2180
2181 # now find the diagonal neighbours
2182 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2183 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2184 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2185 }
1882 2186
1883 for (@diag) { 2187 for (grep defined $_->[0], @neigh) {
2188 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2189 my $neigh = find $path, $origin
1885 or next; 2190 or next;
1886 $neigh->load; 2191 $neigh->load;
1887 } 2192 }
1888} 2193}
1889 2194
1890sub find_sync { 2195sub find_sync {
1891 my ($path, $origin) = @_; 2196 my ($path, $origin) = @_;
1892 2197
1893 cf::sync_job { find $path, $origin } 2198 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199 if $Coro::current == $Coro::main;
2200
2201 find $path, $origin
1894} 2202}
1895 2203
1896sub do_load_sync { 2204sub do_load_sync {
1897 my ($map) = @_; 2205 my ($map) = @_;
1898 2206
1899 cf::sync_job { $map->load }; 2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2208 if $Coro::current == $Coro::main;
2209
2210 $map->load;
1900} 2211}
1901 2212
1902our %MAP_PREFETCH; 2213our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2214our $MAP_PREFETCHER = undef;
1904 2215
1905sub find_async { 2216sub find_async {
1906 my ($path, $origin) = @_; 2217 my ($path, $origin, $load) = @_;
1907 2218
1908 $path = normalise $path, $origin && $origin->{path}; 2219 $path = normalise $path, $origin && $origin->{path};
1909 2220
1910 if (my $map = $cf::MAP{$path}) { 2221 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2222 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1912 } 2223 }
1913 2224
1914 undef $MAP_PREFETCH{$path}; 2225 $MAP_PREFETCH{$path} |= $load;
2226
1915 $MAP_PREFETCHER ||= cf::async { 2227 $MAP_PREFETCHER ||= cf::async {
2228 $Coro::current->{desc} = "map prefetcher";
2229
1916 while (%MAP_PREFETCH) { 2230 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2231 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2232 if (my $map = find $k) {
1919 $map->load; 2233 $map->load if $v;
1920 } 2234 }
1921 2235
1922 delete $MAP_PREFETCH{$path}; 2236 delete $MAP_PREFETCH{$k};
1923 } 2237 }
1924 } 2238 }
1925 undef $MAP_PREFETCHER; 2239 undef $MAP_PREFETCHER;
1926 }; 2240 };
1927 $MAP_PREFETCHER->prio (6); 2241 $MAP_PREFETCHER->prio (6);
1928 2242
1929 () 2243 ()
1930} 2244}
1931 2245
2246# common code, used by both ->save and ->swapout
1932sub save { 2247sub _save {
1933 my ($self) = @_; 2248 my ($self) = @_;
1934
1935 my $lock = cf::lock_acquire "map_data:" . $self->path;
1936 2249
1937 $self->{last_save} = $cf::RUNTIME; 2250 $self->{last_save} = $cf::RUNTIME;
1938 2251
1939 return unless $self->dirty; 2252 return unless $self->dirty;
1940 2253
1946 return if $self->{deny_save}; 2259 return if $self->{deny_save};
1947 2260
1948 local $self->{last_access} = $self->last_access;#d# 2261 local $self->{last_access} = $self->last_access;#d#
1949 2262
1950 cf::async { 2263 cf::async {
2264 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2265 $_->contr->save for $self->players;
1952 }; 2266 };
2267
2268 cf::get_slot 0.02;
1953 2269
1954 if ($uniq) { 2270 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2271 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1956 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2272 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1957 } else { 2273 } else {
1958 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2274 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1959 } 2275 }
1960} 2276}
1961 2277
2278sub save {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 $self->_save;
2284}
2285
1962sub swap_out { 2286sub swap_out {
1963 my ($self) = @_; 2287 my ($self) = @_;
1964 2288
1965 # save first because save cedes
1966 $self->save;
1967
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2290
2291 return if $self->in_memory != cf::MAP_ACTIVE;
2292 return if $self->{deny_save};
1970 return if $self->players; 2293 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save};
1973 2294
2295 # first deactivate the map and "unlink" it from the core
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2298 $self->in_memory (cf::MAP_SWAPPED);
2299
2300 # then atomically save
2301 $self->_save;
2302
2303 # then free the map
1974 $self->clear; 2304 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2305}
1977 2306
1978sub reset_at { 2307sub reset_at {
1979 my ($self) = @_; 2308 my ($self) = @_;
1980 2309
1998 2327
1999 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2328 my $lock = cf::lock_acquire "map_data:$self->{path}";
2000 2329
2001 return if $self->players; 2330 return if $self->players;
2002 2331
2003 warn "resetting map ", $self->path; 2332 cf::trace "resetting map ", $self->path, "\n";
2004 2333
2005 $self->in_memory (cf::MAP_SWAPPED); 2334 $self->in_memory (cf::MAP_SWAPPED);
2006 2335
2007 # need to save uniques path 2336 # need to save uniques path
2008 unless ($self->{deny_save}) { 2337 unless ($self->{deny_save}) {
2012 if $uniq; 2341 if $uniq;
2013 } 2342 }
2014 2343
2015 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2016 2345
2346 $self->deactivate;
2347 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2348 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2349
2021 $self->unlink_save; 2350 $self->unlink_save;
2022 $self->destroy; 2351 $self->destroy;
2023} 2352}
2024 2353
2025my $nuke_counter = "aaaa"; 2354my $nuke_counter = "aaaa";
2026 2355
2027sub nuke { 2356sub nuke {
2028 my ($self) = @_; 2357 my ($self) = @_;
2029 2358
2359 {
2360 my $lock = cf::lock_acquire "map_data:$self->{path}";
2361
2030 delete $cf::MAP{$self->path}; 2362 delete $cf::MAP{$self->path};
2031 2363
2032 $self->unlink_save; 2364 $self->unlink_save;
2033 2365
2034 bless $self, "cf::map"; 2366 bless $self, "cf::map::wrap";
2035 delete $self->{deny_reset}; 2367 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2368 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2369 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2370 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2371
2040 $cf::MAP{$self->path} = $self; 2372 $cf::MAP{$self->path} = $self;
2373 }
2041 2374
2042 $self->reset; # polite request, might not happen 2375 $self->reset; # polite request, might not happen
2043} 2376}
2044 2377
2045=item $maps = cf::map::tmp_maps 2378=item $maps = cf::map::tmp_maps
2087 2420
2088sub unique_maps() { 2421sub unique_maps() {
2089 [ 2422 [
2090 map { 2423 map {
2091 utf8::decode $_; 2424 utf8::decode $_;
2092 /\.map$/ 2425 s/\.map$//; # TODO future compatibility hack
2426 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2427 ? ()
2093 ? normalise $_ 2428 : normalise $_
2094 : ()
2095 } @{ aio_readdir $UNIQUEDIR or [] } 2429 } @{ aio_readdir $UNIQUEDIR or [] }
2096 ] 2430 ]
2097} 2431}
2098 2432
2099package cf; 2433=item cf::map::static_maps
2434
2435Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2436file in the shared directory excluding F</styles> and F</editor>). May
2437block.
2438
2439=cut
2440
2441sub static_maps() {
2442 my @dirs = "";
2443 my @maps;
2444
2445 while (@dirs) {
2446 my $dir = shift @dirs;
2447
2448 next if $dir eq "/styles" || $dir eq "/editor";
2449
2450 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2451 or return;
2452
2453 for (@$files) {
2454 s/\.map$// or next;
2455 utf8::decode $_;
2456 push @maps, "$dir/$_";
2457 }
2458
2459 push @dirs, map "$dir/$_", @$dirs;
2460 }
2461
2462 \@maps
2463}
2100 2464
2101=back 2465=back
2102 2466
2103=head3 cf::object 2467=head3 cf::object
2104 2468
2108 2472
2109=over 4 2473=over 4
2110 2474
2111=item $ob->inv_recursive 2475=item $ob->inv_recursive
2112 2476
2113Returns the inventory of the object _and_ their inventories, recursively. 2477Returns the inventory of the object I<and> their inventories, recursively,
2478but I<not> the object itself.
2114 2479
2115=cut 2480=cut
2116 2481
2117sub inv_recursive_; 2482sub inv_recursive_;
2118sub inv_recursive_ { 2483sub inv_recursive_ {
2121 2486
2122sub inv_recursive { 2487sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2488 inv_recursive_ inv $_[0]
2124} 2489}
2125 2490
2491=item $ref = $ob->ref
2492
2493Creates and returns a persistent reference to an object that can be stored as a string.
2494
2495=item $ob = cf::object::deref ($refstring)
2496
2497returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2498even if the object actually exists. May block.
2499
2500=cut
2501
2502sub deref {
2503 my ($ref) = @_;
2504
2505 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2506 my ($uuid, $name) = ($1, $2);
2507 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2508 or return;
2509 $pl->ob->uuid eq $uuid
2510 or return;
2511
2512 $pl->ob
2513 } else {
2514 warn "$ref: cannot resolve object reference\n";
2515 undef
2516 }
2517}
2518
2126package cf; 2519package cf;
2127 2520
2128=back 2521=back
2129 2522
2130=head3 cf::object::player 2523=head3 cf::object::player
2136Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2529Sends 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 2530can be C<undef>. Does the right thing when the player is currently in a
2138dialogue with the given NPC character. 2531dialogue with the given NPC character.
2139 2532
2140=cut 2533=cut
2534
2535our $SAY_CHANNEL = {
2536 id => "say",
2537 title => "Map",
2538 reply => "say ",
2539 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2540};
2541
2542our $CHAT_CHANNEL = {
2543 id => "chat",
2544 title => "Chat",
2545 reply => "chat ",
2546 tooltip => "Player chat and shouts, global to the server.",
2547};
2141 2548
2142# rough implementation of a future "reply" method that works 2549# rough implementation of a future "reply" method that works
2143# with dialog boxes. 2550# with dialog boxes.
2144#TODO: the first argument must go, split into a $npc->reply_to ( method 2551#TODO: the first argument must go, split into a $npc->reply_to ( method
2145sub cf::object::player::reply($$$;$) { 2552sub cf::object::player::reply($$$;$) {
2152 2559
2153 } else { 2560 } else {
2154 my $pl = $self->contr; 2561 my $pl = $self->contr;
2155 2562
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2563 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2564 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2565 $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 2566
2165 } else { 2567 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2568 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2569 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2168 } 2570 }
2169 } 2571 }
2572}
2573
2574=item $object->send_msg ($channel, $msg, $color, [extra...])
2575
2576=cut
2577
2578sub cf::object::send_msg {
2579 my $pl = shift->contr
2580 or return;
2581 $pl->send_msg (@_);
2170} 2582}
2171 2583
2172=item $player_object->may ("access") 2584=item $player_object->may ("access")
2173 2585
2174Returns wether the given player is authorized to access resource "access" 2586Returns wether the given player is authorized to access resource "access"
2187 2599
2188=item $player_object->enter_link 2600=item $player_object->enter_link
2189 2601
2190Freezes the player and moves him/her to a special map (C<{link}>). 2602Freezes the player and moves him/her to a special map (C<{link}>).
2191 2603
2192The player should be reasonably safe there for short amounts of time. You 2604The player should be reasonably safe there for short amounts of time (e.g.
2193I<MUST> call C<leave_link> as soon as possible, though. 2605for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2606though, as the player cannot control the character while it is on the link
2607map.
2194 2608
2195Will never block. 2609Will never block.
2196 2610
2197=item $player_object->leave_link ($map, $x, $y) 2611=item $player_object->leave_link ($map, $x, $y)
2198 2612
2218sub cf::object::player::enter_link { 2632sub cf::object::player::enter_link {
2219 my ($self) = @_; 2633 my ($self) = @_;
2220 2634
2221 $self->deactivate_recursive; 2635 $self->deactivate_recursive;
2222 2636
2637 ++$self->{_link_recursion};
2638
2223 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2639 return if UNIVERSAL::isa $self->map, "ext::map_link";
2224 2640
2225 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2641 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2226 if $self->map && $self->map->{path} ne "{link}"; 2642 if $self->map && $self->map->{path} ne "{link}";
2227 2643
2228 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2644 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2229} 2645}
2230 2646
2231sub cf::object::player::leave_link { 2647sub cf::object::player::leave_link {
2232 my ($self, $map, $x, $y) = @_; 2648 my ($self, $map, $x, $y) = @_;
2233 2649
2250 ($x, $y) = (-1, -1) 2666 ($x, $y) = (-1, -1)
2251 unless (defined $x) && (defined $y); 2667 unless (defined $x) && (defined $y);
2252 2668
2253 # use -1 or undef as default coordinates, not 0, 0 2669 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2670 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2671 if $x <= 0 && $y <= 0;
2256 2672
2257 $map->load; 2673 $map->load;
2258 $map->load_diag; 2674 $map->load_neighbours;
2259 2675
2260 return unless $self->contr->active; 2676 return unless $self->contr->active;
2261 $self->activate_recursive;
2262 2677
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2678 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2264 $self->enter_map ($map, $x, $y); 2679 if ($self->enter_map ($map, $x, $y)) {
2265} 2680 # entering was successful
2681 delete $self->{_link_recursion};
2682 # only activate afterwards, to support waiting in hooks
2683 $self->activate_recursive;
2684 }
2266 2685
2686}
2687
2267=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2688=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2268 2689
2269Moves the player to the given map-path and coordinates by first freezing 2690Moves the player to the given map-path and coordinates by first freezing
2270her, loading and preparing them map, calling the provided $check callback 2691her, loading and preparing them map, calling the provided $check callback
2271that has to return the map if sucecssful, and then unfreezes the player on 2692that 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 2693the new (success) or old (failed) map position. In either case, $done will
2273be called at the end of this process. 2694be called at the end of this process.
2274 2695
2696Note that $check will be called with a potentially non-loaded map, so if
2697it needs a loaded map it has to call C<< ->load >>.
2698
2275=cut 2699=cut
2276 2700
2277our $GOTOGEN; 2701our $GOTOGEN;
2278 2702
2279sub cf::object::player::goto { 2703sub cf::object::player::goto {
2280 my ($self, $path, $x, $y, $check, $done) = @_; 2704 my ($self, $path, $x, $y, $check, $done) = @_;
2281 2705
2706 if ($self->{_link_recursion} >= $MAX_LINKS) {
2707 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2708 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2709 ($path, $x, $y) = @$EMERGENCY_POSITION;
2710 }
2711
2282 # do generation counting so two concurrent goto's will be executed in-order 2712 # do generation counting so two concurrent goto's will be executed in-order
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2713 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2714
2285 $self->enter_link; 2715 $self->enter_link;
2286 2716
2287 (async { 2717 (async {
2718 $Coro::current->{desc} = "player::goto $path $x $y";
2719
2720 # *tag paths override both path and x|y
2721 if ($path =~ /^\*(.*)$/) {
2722 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2723 my $ob = $obs[rand @obs];
2724
2725 # see if we actually can go there
2726 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2727 $ob = $obs[rand @obs];
2728 } else {
2729 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2730 }
2731 # else put us there anyways for now #d#
2732
2733 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2734 } else {
2735 ($path, $x, $y) = (undef, undef, undef);
2736 }
2737 }
2738
2288 my $map = eval { 2739 my $map = eval {
2289 my $map = cf::map::find $path; 2740 my $map = defined $path ? cf::map::find $path : undef;
2290 2741
2291 if ($map) { 2742 if ($map) {
2292 $map = $map->customise_for ($self); 2743 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2744 $map = $check->($map, $x, $y, $self) if $check && $map;
2294 } else { 2745 } else {
2295 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2746 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2296 } 2747 }
2297 2748
2298 $map 2749 $map
2299 }; 2750 };
2300 2751
2306 if ($gen == $self->{_goto_generation}) { 2757 if ($gen == $self->{_goto_generation}) {
2307 delete $self->{_goto_generation}; 2758 delete $self->{_goto_generation};
2308 $self->leave_link ($map, $x, $y); 2759 $self->leave_link ($map, $x, $y);
2309 } 2760 }
2310 2761
2311 $done->() if $done; 2762 $done->($self) if $done;
2312 })->prio (1); 2763 })->prio (1);
2313} 2764}
2314 2765
2315=item $player_object->enter_exit ($exit_object) 2766=item $player_object->enter_exit ($exit_object)
2316 2767
2336} 2787}
2337 2788
2338sub prepare_random_map { 2789sub prepare_random_map {
2339 my ($exit) = @_; 2790 my ($exit) = @_;
2340 2791
2341 my $guard = cf::lock_acquire "exit_prepare:$exit";
2342
2343 # all this does is basically replace the /! path by 2792 # all this does is basically replace the /! path by
2344 # a new random map path (?random/...) with a seed 2793 # a new random map path (?random/...) with a seed
2345 # that depends on the exit object 2794 # that depends on the exit object
2346 2795
2347 my $rmp = parse_random_map_params $exit->msg; 2796 my $rmp = parse_random_map_params $exit->msg;
2349 if ($exit->map) { 2798 if ($exit->map) {
2350 $rmp->{region} = $exit->region->name; 2799 $rmp->{region} = $exit->region->name;
2351 $rmp->{origin_map} = $exit->map->path; 2800 $rmp->{origin_map} = $exit->map->path;
2352 $rmp->{origin_x} = $exit->x; 2801 $rmp->{origin_x} = $exit->x;
2353 $rmp->{origin_y} = $exit->y; 2802 $rmp->{origin_y} = $exit->y;
2803
2804 $exit->map->touch;
2354 } 2805 }
2355 2806
2356 $rmp->{random_seed} ||= $exit->random_seed; 2807 $rmp->{random_seed} ||= $exit->random_seed;
2357 2808
2358 my $data = cf::to_json $rmp; 2809 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2359 my $md5 = Digest::MD5::md5_hex $data; 2810 my $md5 = Digest::MD5::md5_hex $data;
2360 my $meta = "$RANDOMDIR/$md5.meta"; 2811 my $meta = "$RANDOMDIR/$md5.meta";
2361 2812
2362 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2813 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2363 aio_write $fh, 0, (length $data), $data, 0; 2814 aio_write $fh, 0, (length $data), $data, 0;
2364 undef $fh; 2815 undef $fh;
2365 aio_rename "$meta~", $meta; 2816 aio_rename "$meta~", $meta;
2366 2817
2818 my $slaying = "?random/$md5";
2819
2820 if ($exit->valid) {
2367 $exit->slaying ("?random/$md5"); 2821 $exit->slaying ("?random/$md5");
2368 $exit->msg (undef); 2822 $exit->msg (undef);
2823 }
2369 } 2824 }
2370} 2825}
2371 2826
2372sub cf::object::player::enter_exit { 2827sub cf::object::player::enter_exit {
2373 my ($self, $exit) = @_; 2828 my ($self, $exit) = @_;
2374 2829
2375 return unless $self->type == cf::PLAYER; 2830 return unless $self->type == cf::PLAYER;
2376 2831
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; 2832 $self->enter_link;
2389 2833
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 { 2834 (async {
2395 $self->deactivate_recursive; # just to be sure 2835 $Coro::current->{desc} = "enter_exit";
2836
2396 unless (eval { 2837 unless (eval {
2838 $self->deactivate_recursive; # just to be sure
2839
2840 # random map handling
2841 {
2842 my $guard = cf::lock_acquire "exit_prepare:$exit";
2843
2844 prepare_random_map $exit
2845 if $exit->slaying eq "/!";
2846 }
2847
2848 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2849 my $x = $exit->stats->hp;
2850 my $y = $exit->stats->sp;
2851
2397 $self->goto ($slaying, $hp, $sp); 2852 $self->goto ($map, $x, $y);
2398 2853
2854 # if exit is damned, update players death & WoR home-position
2855 $self->contr->savebed ($map, $x, $y)
2856 if $exit->flag (cf::FLAG_DAMNED);
2857
2399 1; 2858 1
2400 }) { 2859 }) {
2401 $self->message ("Something went wrong deep within the crossfire server. " 2860 $self->message ("Something went wrong deep within the deliantra server. "
2402 . "I'll try to bring you back to the map you were before. " 2861 . "I'll try to bring you back to the map you were before. "
2403 . "Please report this to the dungeon master!", 2862 . "Please report this to the dungeon master!",
2404 cf::NDI_UNIQUE | cf::NDI_RED); 2863 cf::NDI_UNIQUE | cf::NDI_RED);
2405 2864
2406 warn "ERROR in enter_exit: $@"; 2865 error "ERROR in enter_exit: $@";
2407 $self->leave_link; 2866 $self->leave_link;
2408 } 2867 }
2409 })->prio (1); 2868 })->prio (1);
2410} 2869}
2411 2870
2423sub cf::client::send_drawinfo { 2882sub cf::client::send_drawinfo {
2424 my ($self, $text, $flags) = @_; 2883 my ($self, $text, $flags) = @_;
2425 2884
2426 utf8::encode $text; 2885 utf8::encode $text;
2427 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2886 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2887}
2888
2889=item $client->send_big_packet ($pkt)
2890
2891Like C<send_packet>, but tries to compress large packets, and fragments
2892them as required.
2893
2894=cut
2895
2896our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2897
2898sub cf::client::send_big_packet {
2899 my ($self, $pkt) = @_;
2900
2901 # try lzf for large packets
2902 $pkt = "lzf " . Compress::LZF::compress $pkt
2903 if 1024 <= length $pkt and $self->{can_lzf};
2904
2905 # split very large packets
2906 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2907 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2908 $pkt = "frag";
2909 }
2910
2911 $self->send_packet ($pkt);
2428} 2912}
2429 2913
2430=item $client->send_msg ($channel, $msg, $color, [extra...]) 2914=item $client->send_msg ($channel, $msg, $color, [extra...])
2431 2915
2432Send a drawinfo or msg packet to the client, formatting the msg for the 2916Send a drawinfo or msg packet to the client, formatting the msg for the
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2918the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2919the message unless the client supports the msg packet.
2436 2920
2437=cut 2921=cut
2438 2922
2923# non-persistent channels (usually the info channel)
2924our %CHANNEL = (
2925 "c/motd" => {
2926 id => "infobox",
2927 title => "MOTD",
2928 reply => undef,
2929 tooltip => "The message of the day",
2930 },
2931 "c/identify" => {
2932 id => "infobox",
2933 title => "Identify",
2934 reply => undef,
2935 tooltip => "Items recently identified",
2936 },
2937 "c/examine" => {
2938 id => "infobox",
2939 title => "Examine",
2940 reply => undef,
2941 tooltip => "Signs and other items you examined",
2942 },
2943 "c/shopinfo" => {
2944 id => "infobox",
2945 title => "Shop Info",
2946 reply => undef,
2947 tooltip => "What your bargaining skill tells you about the shop",
2948 },
2949 "c/book" => {
2950 id => "infobox",
2951 title => "Book",
2952 reply => undef,
2953 tooltip => "The contents of a note or book",
2954 },
2955 "c/lookat" => {
2956 id => "infobox",
2957 title => "Look",
2958 reply => undef,
2959 tooltip => "What you saw there",
2960 },
2961 "c/who" => {
2962 id => "infobox",
2963 title => "Players",
2964 reply => undef,
2965 tooltip => "Shows players who are currently online",
2966 },
2967 "c/body" => {
2968 id => "infobox",
2969 title => "Body Parts",
2970 reply => undef,
2971 tooltip => "Shows which body parts you posess and are available",
2972 },
2973 "c/statistics" => {
2974 id => "infobox",
2975 title => "Statistics",
2976 reply => undef,
2977 tooltip => "Shows your primary statistics",
2978 },
2979 "c/skills" => {
2980 id => "infobox",
2981 title => "Skills",
2982 reply => undef,
2983 tooltip => "Shows your experience per skill and item power",
2984 },
2985 "c/shopitems" => {
2986 id => "infobox",
2987 title => "Shop Items",
2988 reply => undef,
2989 tooltip => "Shows the items currently for sale in this shop",
2990 },
2991 "c/resistances" => {
2992 id => "infobox",
2993 title => "Resistances",
2994 reply => undef,
2995 tooltip => "Shows your resistances",
2996 },
2997 "c/pets" => {
2998 id => "infobox",
2999 title => "Pets",
3000 reply => undef,
3001 tooltip => "Shows information abotu your pets/a specific pet",
3002 },
3003 "c/perceiveself" => {
3004 id => "infobox",
3005 title => "Perceive Self",
3006 reply => undef,
3007 tooltip => "You gained detailed knowledge about yourself",
3008 },
3009 "c/uptime" => {
3010 id => "infobox",
3011 title => "Uptime",
3012 reply => undef,
3013 tooltip => "How long the server has been running since last restart",
3014 },
3015 "c/mapinfo" => {
3016 id => "infobox",
3017 title => "Map Info",
3018 reply => undef,
3019 tooltip => "Information related to the maps",
3020 },
3021 "c/party" => {
3022 id => "party",
3023 title => "Party",
3024 reply => "gsay ",
3025 tooltip => "Messages and chat related to your party",
3026 },
3027 "c/death" => {
3028 id => "death",
3029 title => "Death",
3030 reply => undef,
3031 tooltip => "Reason for and more info about your most recent death",
3032 },
3033 "c/say" => $SAY_CHANNEL,
3034 "c/chat" => $CHAT_CHANNEL,
3035);
3036
2439sub cf::client::send_msg { 3037sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 3038 my ($self, $channel, $msg, $color, @extra) = @_;
2441 3039
2442 $msg = $self->pl->expand_cfpod ($msg); 3040 $msg = $self->pl->expand_cfpod ($msg)
3041 unless $color & cf::NDI_VERBATIM;
2443 3042
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case... 3043 $color &= cf::NDI_CLIENT_MASK; # just in case...
2447 3044
3045 # check predefined channels, for the benefit of C
3046 if ($CHANNEL{$channel}) {
3047 $channel = $CHANNEL{$channel};
3048
3049 $self->ext_msg (channel_info => $channel);
3050 $channel = $channel->{id};
3051
2448 if (ref $channel) { 3052 } elsif (ref $channel) {
2449 # send meta info to client, if not yet sent 3053 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 3054 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 3055 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 3056 $self->ext_msg (channel_info => $channel);
2453 } 3057 }
2454 3058
2455 $channel = $channel->{id}; 3059 $channel = $channel->{id};
2456 } 3060 }
2457 3061
2458 if ($self->can_msg) { 3062 return unless @extra || length $msg;
2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2460 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470 3063
2471 if ($color >= 0) { 3064 # default colour, mask it out
2472 if (0 && $msg =~ /\[/) { 3065 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 3066 if $color & cf::NDI_DEF;
2474 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg")
2477 }
2478 }
2479 }
2480}
2481 3067
3068 my $pkt = "msg "
3069 . $self->{json_coder}->encode (
3070 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
3071 );
3072
3073 $self->send_big_packet ($pkt);
3074}
3075
2482=item $client->ext_event ($type, %msg) 3076=item $client->ext_msg ($type, @msg)
2483 3077
2484Sends an ext event to the client. 3078Sends an ext event to the client.
2485 3079
2486=cut 3080=cut
2487 3081
2488sub cf::client::ext_event($$%) { 3082sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 3083 my ($self, $type, @msg) = @_;
2490 3084
2491 return unless $self->extcmd; 3085 if ($self->extcmd == 2) {
2492 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3087 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 3088 push @msg, msgtype => "event_$type";
2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 3089 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3090 }
3091}
3092
3093=item $client->ext_reply ($msgid, @msg)
3094
3095Sends an ext reply to the client.
3096
3097=cut
3098
3099sub cf::client::ext_reply($$@) {
3100 my ($self, $id, @msg) = @_;
3101
3102 if ($self->extcmd == 2) {
3103 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3104 } elsif ($self->extcmd == 1) {
3105 #TODO: version 1, remove
3106 unshift @msg, msgtype => "reply", msgid => $id;
3107 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3108 }
2495} 3109}
2496 3110
2497=item $success = $client->query ($flags, "text", \&cb) 3111=item $success = $client->query ($flags, "text", \&cb)
2498 3112
2499Queues a query to the client, calling the given callback with 3113Queues a query to the client, calling the given callback with
2554 my ($ns, $buf) = @_; 3168 my ($ns, $buf) = @_;
2555 3169
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3170 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 3171
2558 if (ref $msg) { 3172 if (ref $msg) {
3173 my ($type, $reply, @payload) =
3174 "ARRAY" eq ref $msg
3175 ? @$msg
3176 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3177
3178 my @reply;
3179
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3180 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 3181 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 3182 }
3183
3184 $ns->ext_reply ($reply, @reply)
3185 if $reply;
3186
2565 } else { 3187 } else {
2566 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3188 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2567 } 3189 }
2568 3190
2569 cf::override; 3191 cf::override;
2570 }, 3192 },
2571); 3193);
2591 3213
2592 $coro 3214 $coro
2593} 3215}
2594 3216
2595cf::client->attach ( 3217cf::client->attach (
2596 on_destroy => sub { 3218 on_client_destroy => sub {
2597 my ($ns) = @_; 3219 my ($ns) = @_;
2598 3220
2599 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3221 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2600 }, 3222 },
2601); 3223);
2616our $safe = new Safe "safe"; 3238our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 3239our $safe_hole = new Safe::Hole;
2618 3240
2619$SIG{FPE} = 'IGNORE'; 3241$SIG{FPE} = 'IGNORE';
2620 3242
2621$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3243$safe->permit_only (Opcode::opset qw(
3244 :base_core :base_mem :base_orig :base_math :base_loop
3245 grepstart grepwhile mapstart mapwhile
3246 sort time
3247));
2622 3248
2623# here we export the classes and methods available to script code 3249# here we export the classes and methods available to script code
2624 3250
2625=pod 3251=pod
2626 3252
2627The following functions and methods are available within a safe environment: 3253The following functions and methods are available within a safe environment:
2628 3254
2629 cf::object 3255 cf::object
2630 contr pay_amount pay_player map x y force_find force_add 3256 contr pay_amount pay_player map x y force_find force_add destroy
2631 insert remove 3257 insert remove name archname title slaying race decrease split
3258 value
2632 3259
2633 cf::object::player 3260 cf::object::player
2634 player 3261 player
2635 3262
2636 cf::player 3263 cf::player
2641 3268
2642=cut 3269=cut
2643 3270
2644for ( 3271for (
2645 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3272 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2646 insert remove)], 3273 insert remove inv nrof name archname title slaying race
3274 decrease split destroy change_exp value msg lore send_msg)],
2647 ["cf::object::player" => qw(player)], 3275 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 3276 ["cf::player" => qw(peaceful send_msg)],
2649 ["cf::map" => qw(trigger)], 3277 ["cf::map" => qw(trigger)],
2650) { 3278) {
2651 no strict 'refs';
2652 my ($pkg, @funs) = @$_; 3279 my ($pkg, @funs) = @$_;
2653 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2654 for @funs; 3281 for @funs;
2655} 3282}
2656 3283
2671 3298
2672 my $qcode = $code; 3299 my $qcode = $code;
2673 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3300 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2674 $qcode =~ s/\n/\\n/g; 3301 $qcode =~ s/\n/\\n/g;
2675 3302
3303 %vars = (_dummy => 0) unless %vars;
3304
3305 my @res;
2676 local $_; 3306 local $_;
2677 local @safe::cf::_safe_eval_args = values %vars;
2678 3307
2679 my $eval = 3308 my $eval =
2680 "do {\n" 3309 "do {\n"
2681 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3310 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2682 . "#line 0 \"{$qcode}\"\n" 3311 . "#line 0 \"{$qcode}\"\n"
2683 . $code 3312 . $code
2684 . "\n}" 3313 . "\n}"
2685 ; 3314 ;
2686 3315
3316 if ($CFG{safe_eval}) {
2687 sub_generation_inc; 3317 sub_generation_inc;
3318 local @safe::cf::_safe_eval_args = values %vars;
2688 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3319 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2689 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 }
2690 3325
2691 if ($@) { 3326 if ($@) {
2692 warn "$@"; 3327 warn "$@",
2693 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
2694 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
2695 } 3330 }
2696 3331
2697 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
2698} 3333}
2699 3334
2713=cut 3348=cut
2714 3349
2715sub register_script_function { 3350sub register_script_function {
2716 my ($fun, $cb) = @_; 3351 my ($fun, $cb) = @_;
2717 3352
2718 no strict 'refs'; 3353 $fun = "safe::$fun" if $CFG{safe_eval};
2719 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3354 *$fun = $safe_hole->wrap ($cb);
2720} 3355}
2721 3356
2722=back 3357=back
2723 3358
2724=cut 3359=cut
2727# the server's init and main functions 3362# the server's init and main functions
2728 3363
2729sub load_facedata($) { 3364sub load_facedata($) {
2730 my ($path) = @_; 3365 my ($path) = @_;
2731 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
2732 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
2733 3374
2734 my $facedata; 3375 my $facedata;
2735 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 3377 or die "$path: $!";
2737 3378
2738 $facedata = Coro::Storable::thaw $facedata; 3379 $facedata = Coro::Storable::thaw $facedata;
2739 3380
2740 $facedata->{version} == 2 3381 $facedata->{version} == 2
2741 or cf::cleanup "$path: version mismatch, cannot proceed."; 3382 or cf::cleanup "$path: version mismatch, cannot proceed.";
2742 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
2743 { 3393 {
2744 my $faces = $facedata->{faceinfo}; 3394 my $faces = $facedata->{faceinfo};
2745 3395
2746 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3397 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3398
2748 cf::face::set_visibility $idx, $info->{visibility}; 3399 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 3400 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2752 3403
2753 cf::cede_to_tick; 3404 cf::cede_to_tick;
2754 } 3405 }
2755 3406
2756 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
2757 next unless $info->{smooth}; 3408 next unless $info->{smooth};
3409
2758 my $idx = cf::face::find $face 3410 my $idx = cf::face::find $face
2759 or next; 3411 or next;
3412
2760 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
2761 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
2762 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2763 } else { 3416 } else {
2764 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
2765 } 3418 }
2766 3419
2767 cf::cede_to_tick; 3420 cf::cede_to_tick;
2768 } 3421 }
2769 } 3422 }
2778 3431
2779 cf::anim::invalidate_all; # d'oh 3432 cf::anim::invalidate_all; # d'oh
2780 } 3433 }
2781 3434
2782 { 3435 {
2783 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 3436 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical;
2787 3437
2788 while (my ($name, $info) = each %$res) { 3438 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({ 3439 if (defined $info->{type}) {
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2796 3441
2797 if ($name =~ /\.jpg$/) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3443 cf::face::set_type $idx, $info->{type};
2800 } else { 3444 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 3445 $RESOURCE{$name} = $info; # unused
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 3446 }
2807 3447
2808 cf::cede_to_tick; 3448 cf::cede_to_tick;
2809 } 3449 }
2810 } 3450 }
2811 3451
3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3453
2812 1 3454 1
2813} 3455}
2814 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
2815sub 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
2816 load_resource_file "$MAPDIR/regions" 3480 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 3481 or die "unable to load regions file\n";
2818 3482
2819 for (cf::region::list) { 3483 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 3484 $_->{match} = qr/$_->{match}/
2828} 3492}
2829 3493
2830sub reload_archetypes { 3494sub reload_archetypes {
2831 load_resource_file "$DATADIR/archetypes" 3495 load_resource_file "$DATADIR/archetypes"
2832 or die "unable to load archetypes\n"; 3496 or die "unable to load archetypes\n";
2833 #d# NEED to laod twice to resolve forward references
2834 # this really needs to be done in an extra post-pass
2835 # (which needs to be synchronous, so solve it differently)
2836 load_resource_file "$DATADIR/archetypes"
2837 or die "unable to load archetypes\n";
2838} 3497}
2839 3498
2840sub reload_treasures { 3499sub reload_treasures {
2841 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
2842 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
2843} 3502}
2844 3503
3504sub reload_exp {
3505 cf::init_experience;
3506}
3507
3508sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n";
3510
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3515
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_]
3518 or next;
3519
3520 my $face = cf::face::find "sound/$sound->[1]";
3521 cf::sound::set $sound->[0] => $face;
3522 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3523 }
3524
3525 while (my ($k, $v) = each %{$soundconf->{event}}) {
3526 my $face = cf::face::find "sound/$v";
3527 cf::sound::set $k => $face;
3528 }
3529}
3530
2845sub reload_resources { 3531sub reload_resources {
2846 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
2847 3533
3534 reload_exp;
3535 reload_facedata;
3536 reload_sound;
3537 reload_archetypes;
2848 reload_regions; 3538 reload_regions;
2849 reload_facedata;
2850 #reload_archetypes;#d#
2851 reload_archetypes;
2852 reload_treasures; 3539 reload_treasures;
2853 3540
2854 warn "finished reloading resource files\n"; 3541 trace "finished reloading resource files\n";
2855} 3542}
2856 3543
2857sub init { 3544sub reload_config {
2858 reload_resources; 3545 trace "reloading config file...\n";
2859}
2860 3546
2861sub cfg_load {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3547 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3548 or return;
2864 3549
2865 local $/; 3550 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3551 *CFG = YAML::XS::Load scalar <$fh>;
2867 3552
2868 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3553 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2869 3554
2870 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3555 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2871 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3556 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2872 3557
2873 if (exists $CFG{mlockall}) { 3558 if (exists $CFG{mlockall}) {
2875 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3560 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2876 and die "WARNING: m(un)lockall failed: $!\n"; 3561 and die "WARNING: m(un)lockall failed: $!\n";
2877 }; 3562 };
2878 warn $@ if $@; 3563 warn $@ if $@;
2879 } 3564 }
3565
3566 trace "finished reloading resource files\n";
3567}
3568
3569sub pidfile() {
3570 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3571 or die "$PIDFILE: $!";
3572 flock $fh, &Fcntl::LOCK_EX
3573 or die "$PIDFILE: flock: $!";
3574 $fh
3575}
3576
3577# make sure only one server instance is running at any one time
3578sub atomic {
3579 my $fh = pidfile;
3580
3581 my $pid = <$fh>;
3582 kill 9, $pid if $pid > 0;
3583
3584 seek $fh, 0, 0;
3585 print $fh $$;
3586}
3587
3588sub main_loop {
3589 trace "EV::loop starting\n";
3590 if (1) {
3591 EV::loop;
3592 }
3593 trace "EV::loop returned\n";
3594 goto &main_loop unless $REALLY_UNLOOP;
2880} 3595}
2881 3596
2882sub main { 3597sub main {
3598 cf::init_globals; # initialise logging
3599
3600 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3601 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3602 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3603 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3604
3605 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3606
2883 # we must not ever block the main coroutine 3607 # we must not ever block the main coroutine
2884 local $Coro::idle = sub { 3608 local $Coro::idle = sub {
2885 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3609 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2886 (async { 3610 (async {
2887 Event::one_event; 3611 $Coro::current->{desc} = "IDLE BUG HANDLER";
3612 EV::loop EV::LOOP_ONESHOT;
2888 })->prio (Coro::PRIO_MAX); 3613 })->prio (Coro::PRIO_MAX);
2889 }; 3614 };
2890 3615
2891 cfg_load; 3616 evthread_start IO::AIO::poll_fileno;
3617
3618 cf::sync_job {
3619 cf::incloader::init ();
3620
3621 cf::init_anim;
3622 cf::init_attackmess;
3623 cf::init_dynamic;
3624
3625 cf::load_settings;
3626 cf::load_materials;
3627
3628 reload_resources;
3629 reload_config;
2892 db_init; 3630 db_init;
3631
3632 cf::init_uuid;
3633 cf::init_signals;
3634 cf::init_skills;
3635
3636 cf::init_beforeplay;
3637
3638 atomic;
3639
2893 load_extensions; 3640 load_extensions;
2894 3641
2895 $TICK_WATCHER->start; 3642 utime time, time, $RUNTIMEFILE;
2896 Event::loop; 3643
3644 # no (long-running) fork's whatsoever before this point(!)
3645 use POSIX ();
3646 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3647
3648 (pop @POST_INIT)->(0) while @POST_INIT;
3649 };
3650
3651 cf::object::thawer::errors_are_fatal 0;
3652 info "parse errors in files are no longer fatal from this point on.\n";
3653
3654 my $free_main; $free_main = EV::idle sub {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :)
3657 };
3658
3659 goto &main_loop;
2897} 3660}
2898 3661
2899############################################################################# 3662#############################################################################
2900# initialisation and cleanup 3663# initialisation and cleanup
2901 3664
2902# install some emergency cleanup handlers 3665# install some emergency cleanup handlers
2903BEGIN { 3666BEGIN {
3667 our %SIGWATCHER = ();
2904 for my $signal (qw(INT HUP TERM)) { 3668 for my $signal (qw(INT HUP TERM)) {
2905 Event->signal ( 3669 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2906 reentrant => 0,
2907 data => WF_AUTOCANCEL,
2908 signal => $signal,
2909 prio => 0,
2910 cb => sub {
2911 cf::cleanup "SIG$signal"; 3670 cf::cleanup "SIG$signal";
2912 },
2913 ); 3671 };
2914 } 3672 }
2915} 3673}
2916 3674
2917sub write_runtime { 3675sub write_runtime_sync {
2918 my $runtime = "$LOCALDIR/runtime"; 3676 my $t0 = AE::time;
2919 3677
2920 # first touch the runtime file to show we are still running: 3678 # first touch the runtime file to show we are still running:
2921 # the fsync below can take a very very long time. 3679 # the fsync below can take a very very long time.
2922 3680
2923 IO::AIO::aio_utime $runtime, undef, undef; 3681 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2924 3682
2925 my $guard = cf::lock_acquire "write_runtime"; 3683 my $guard = cf::lock_acquire "write_runtime";
2926 3684
2927 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3685 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2928 or return; 3686 or return;
2929 3687
2930 my $value = $cf::RUNTIME + 90 + 10; 3688 my $value = $cf::RUNTIME + 90 + 10;
2931 # 10 is the runtime save interval, for a monotonic clock 3689 # 10 is the runtime save interval, for a monotonic clock
2932 # 60 allows for the watchdog to kill the server. 3690 # 60 allows for the watchdog to kill the server.
2942 aio_utime $fh, undef, undef; 3700 aio_utime $fh, undef, undef;
2943 3701
2944 close $fh 3702 close $fh
2945 or return; 3703 or return;
2946 3704
2947 aio_rename "$runtime~", $runtime 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2948 and return; 3706 and return;
2949 3707
2950 warn "runtime file written.\n"; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2951 3709
2952 1 3710 1
3711}
3712
3713our $uuid_lock;
3714our $uuid_skip;
3715
3716sub write_uuid_sync($) {
3717 $uuid_skip ||= $_[0];
3718
3719 return if $uuid_lock;
3720 local $uuid_lock = 1;
3721
3722 my $uuid = "$LOCALDIR/uuid";
3723
3724 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3725 or return;
3726
3727 my $value = uuid_seq uuid_cur;
3728
3729 unless ($value) {
3730 info "cowardly refusing to write zero uuid value!\n";
3731 return;
3732 }
3733
3734 my $value = uuid_str $value + $uuid_skip;
3735 $uuid_skip = 0;
3736
3737 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3738 and return;
3739
3740 # always fsync - this file is important
3741 aio_fsync $fh
3742 and return;
3743
3744 close $fh
3745 or return;
3746
3747 aio_rename "$uuid~", $uuid
3748 and return;
3749
3750 trace "uuid file written ($value).\n";
3751
3752 1
3753
3754}
3755
3756sub write_uuid($$) {
3757 my ($skip, $sync) = @_;
3758
3759 $sync ? write_uuid_sync $skip
3760 : async { write_uuid_sync $skip };
2953} 3761}
2954 3762
2955sub emergency_save() { 3763sub emergency_save() {
2956 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
2957 3765
2958 warn "enter emergency perl save\n"; 3766 info "emergency_perl_save: enter\n";
3767
3768 # this is a trade-off: we want to be very quick here, so
3769 # save all maps without fsync, and later call a global sync
3770 # (which in turn might be very very slow)
3771 local $USE_FSYNC = 0;
2959 3772
2960 cf::sync_job { 3773 cf::sync_job {
3774 cf::write_runtime_sync; # external watchdog should not bark
3775
2961 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
2962 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
2963 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
2964 warn "begin emergency player save\n"; 3779 info "emergency_perl_save: begin player save\n";
2965 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
2966 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
2967 $pl->valid or next; 3782 $pl->valid or next;
3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2968 $pl->save; 3784 $pl->save;
2969 } 3785 }
2970 warn "end emergency player save\n"; 3786 info "emergency_perl_save: end player save\n";
2971 3787
2972 warn "begin emergency map save\n"; 3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3790 info "emergency_perl_save: begin map save\n";
2973 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
2974 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
2975 $map->valid or next; 3793 $map->valid or next;
2976 $map->save; 3794 $map->save;
2977 } 3795 }
2978 warn "end emergency map save\n"; 3796 info "emergency_perl_save: end map save\n";
2979 3797
2980 warn "begin emergency database checkpoint\n"; 3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3800 info "emergency_perl_save: begin database checkpoint\n";
2981 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
2982 warn "end emergency database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3803
3804 info "emergency_perl_save: begin write uuid\n";
3805 write_uuid_sync 1;
3806 info "emergency_perl_save: end write uuid\n";
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: syncing database to disk";
3811 BDB::db_env_txn_checkpoint $DB_ENV;
3812
3813 info "emergency_perl_save: starting sync\n";
3814 IO::AIO::aio_sync sub {
3815 info "emergency_perl_save: finished sync\n";
3816 };
3817
3818 cf::write_runtime_sync; # external watchdog should not bark
3819
3820 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) {
3822 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3823 }
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
2983 }; 3826 };
2984 3827
2985 warn "leave emergency perl save\n"; 3828 info "emergency_perl_save: leave\n";
2986} 3829}
2987 3830
2988sub post_cleanup { 3831sub post_cleanup {
2989 my ($make_core) = @_; 3832 my ($make_core) = @_;
2990 3833
3834 IO::AIO::flush;
3835
2991 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
2992 if $make_core; 3837 if $make_core;
3838
3839 my $fh = pidfile;
3840 unlink $PIDFILE if <$fh> == $$;
3841}
3842
3843# a safer delete_package, copied from Symbol
3844sub clear_package($) {
3845 my $pkg = shift;
3846
3847 # expand to full symbol table name if needed
3848 unless ($pkg =~ /^main::.*::$/) {
3849 $pkg = "main$pkg" if $pkg =~ /^::/;
3850 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3851 $pkg .= '::' unless $pkg =~ /::$/;
3852 }
3853
3854 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3855 my $stem_symtab = *{$stem}{HASH};
3856
3857 defined $stem_symtab and exists $stem_symtab->{$leaf}
3858 or return;
3859
3860 # clear all symbols
3861 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3862 for my $name (keys %$leaf_symtab) {
3863 _gv_clear *{"$pkg$name"};
3864# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3865 }
2993} 3866}
2994 3867
2995sub do_reload_perl() { 3868sub do_reload_perl() {
2996 # can/must only be called in main 3869 # can/must only be called in main
2997 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
2998 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
2999 return; 3872 return;
3000 } 3873 }
3001 3874
3875 return if $RELOAD++;
3876
3877 my $t1 = AE::time;
3878
3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3002 warn "reloading..."; 3881 info "reloading...";
3003 3882
3004 warn "entering sync_job"; 3883 trace "entering sync_job";
3005 3884
3006 cf::sync_job { 3885 cf::sync_job {
3007 cf::write_runtime; # external watchdog should not bark
3008 cf::emergency_save; 3886 #cf::emergency_save;
3009 cf::write_runtime; # external watchdog should not bark
3010 3887
3011 warn "syncing database to disk";
3012 BDB::db_env_txn_checkpoint $DB_ENV;
3013
3014 # if anything goes wrong in here, we should simply crash as we already saved
3015
3016 warn "cancelling all WF_AUTOCANCEL watchers";
3017 for (Event::all_watchers) {
3018 $_->cancel if $_->data & WF_AUTOCANCEL;
3019 }
3020
3021 warn "flushing outstanding aio requests";
3022 for (;;) {
3023 BDB::flush;
3024 IO::AIO::flush;
3025 Coro::cede;
3026 last unless IO::AIO::nreqs || BDB::nreqs;
3027 warn "iterate...";
3028 }
3029
3030 ++$RELOAD;
3031
3032 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3033 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3034 %EXT_CORO = (); 3890 %EXT_CORO = ();
3035 3891
3036 warn "removing commands"; 3892 trace "removing commands";
3037 %COMMAND = (); 3893 %COMMAND = ();
3038 3894
3039 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3040 %EXTCMD = (); 3896 %EXTCMD = ();
3041 %EXTICMD = (); 3897 %EXTICMD = ();
3042 3898
3043 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3044 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3045 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3046 3902
3047 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3048 eval { 3904 eval {
3049 $cb->($pkg); 3905 $cb->($pkg);
3050 1 3906 1
3051 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3908 }
3909
3910 trace "... clearing $pkg";
3911 clear_package $pkg;
3052 } 3912 }
3053 3913
3054 warn "... nuking $pkg";
3055 Symbol::delete_package $pkg;
3056 }
3057
3058 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3059 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3060 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3061 3917
3062 warn "... unloading $k"; 3918 trace "... unloading $k";
3063 delete $INC{$k}; 3919 delete $INC{$k};
3064 3920
3065 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3066 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3067 3923
3068 if (my $cb = $k->can ("unload_module")) { 3924 if (my $cb = $k->can ("unload_module")) {
3069 $cb->(); 3925 $cb->();
3926 }
3927
3928 clear_package $k;
3070 } 3929 }
3071 3930
3072 Symbol::delete_package $k;
3073 }
3074
3075 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3076 Symbol::delete_package "safe::$_" 3932 clear_package "safe::$_"
3077 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3933 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3078 3934
3079 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3080 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3081 delete $INC{"cf/pod.pm"}; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3082 3938
3083 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3084 # and global variables created in xs 3940 # and global variables created in xs
3085 #Symbol::delete_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3086 3942
3087 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3088 3944
3089 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3090 require cf; 3946 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3947 cf::_connect_to_perl_1;
3092 3948
3093 warn "loading config and database again"; 3949 trace "loading config and database again";
3094 cf::cfg_load; 3950 cf::reload_config;
3095 3951
3096 warn "loading extensions"; 3952 trace "loading extensions";
3097 cf::load_extensions; 3953 cf::load_extensions;
3098 3954
3955 if ($REATTACH_ON_RELOAD) {
3099 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3100 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3101 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3102 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3103 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3104 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3962 }
3105 3963
3964 trace "running post_init jobs";
3965 (pop @POST_INIT)->(1) while @POST_INIT;
3966
3106 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3107 3968
3108 1 3969 1
3109 } or do { 3970 } or do {
3110 warn $@; 3971 error $@;
3111 warn "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3112 exit 1; 3973 };
3974
3975 info "reloaded";
3976 --$RELOAD;
3113 }; 3977 }
3114 3978
3115 warn "reloaded"; 3979 $t1 = AE::time - $t1;
3980 info "reload completed in ${t1}s\n";
3116}; 3981};
3117 3982
3118our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3119 3984
3120sub reload_perl() { 3985sub reload_perl() {
3121 # doing reload synchronously and two reloads happen back-to-back, 3986 # doing reload synchronously and two reloads happen back-to-back,
3122 # coro crashes during coro_state_free->destroy here. 3987 # coro crashes during coro_state_free->destroy here.
3123 3988
3124 $RELOAD_WATCHER ||= Event->timer ( 3989 $RELOAD_WATCHER ||= cf::async {
3125 reentrant => 0, 3990 Coro::AIO::aio_wait cache_extensions;
3126 after => 0, 3991
3127 data => WF_AUTOCANCEL, 3992 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3128 cb => sub {
3129 do_reload_perl; 3993 do_reload_perl;
3130 undef $RELOAD_WATCHER; 3994 undef $RELOAD_WATCHER;
3131 }, 3995 };
3132 ); 3996 };
3133} 3997}
3134 3998
3135register_command "reload" => sub { 3999register_command "reload" => sub {
3136 my ($who, $arg) = @_; 4000 my ($who, $arg) = @_;
3137 4001
3138 if ($who->flag (FLAG_WIZ)) { 4002 if ($who->flag (FLAG_WIZ)) {
3139 $who->message ("reloading server."); 4003 $who->message ("reloading server.");
4004 async {
4005 $Coro::current->{desc} = "perl_reload";
3140 async { reload_perl }; 4006 reload_perl;
4007 };
3141 } 4008 }
3142}; 4009};
3143 4010
3144unshift @INC, $LIBDIR; 4011#############################################################################
3145 4012
3146my $bug_warning = 0; 4013my $bug_warning = 0;
3147 4014
3148our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3149our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
3150 4017
3151sub wait_for_tick { 4018sub wait_for_tick {
3152 return unless $TICK_WATCHER->is_active;
3153 return if $Coro::current == $Coro::main; 4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3154 4020
3155 my $signal = new Coro::Signal; 4021 my $signal = new Coro::Signal;
3156 push @WAIT_FOR_TICK, $signal; 4022 push @WAIT_FOR_TICK, $signal;
3157 $signal->wait; 4023 $signal->wait;
3158} 4024}
3159 4025
3160sub wait_for_tick_begin { 4026sub wait_for_tick_begin {
3161 return unless $TICK_WATCHER->is_active;
3162 return if $Coro::current == $Coro::main; 4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3163 4028
3164 my $signal = new Coro::Signal; 4029 my $signal = new Coro::Signal;
3165 push @WAIT_FOR_TICK_BEGIN, $signal; 4030 push @WAIT_FOR_TICK_BEGIN, $signal;
3166 $signal->wait; 4031 $signal->wait;
3167} 4032}
3168 4033
3169 my $min = 1e6;#d# 4034sub tick {
3170 my $avg = 10;
3171$TICK_WATCHER = Event->timer (
3172 reentrant => 0,
3173 parked => 1,
3174 prio => 0,
3175 at => $NEXT_TICK || $TICK,
3176 data => WF_AUTOCANCEL,
3177 cb => sub {
3178 if ($Coro::current != $Coro::main) { 4035 if ($Coro::current != $Coro::main) {
3179 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4036 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3180 unless ++$bug_warning > 10; 4037 unless ++$bug_warning > 10;
3181 return; 4038 return;
3182 } 4039 }
3183 4040
3184 $NOW = $tick_start = Event::time;
3185
3186 cf::server_tick; # one server iteration 4041 cf::server_tick; # one server iteration
3187 4042
3188 0 && sync_job {#d# 4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3189 for(1..10) {
3190 my $t = Event::time;
3191 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3192 or die;
3193 4044
3194 $map->width (50); 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3195 $map->height (50); 4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3196 $map->alloc; 4047 Coro::async_pool {
3197 $map->_load_objects ("/tmp/x.map", 1); 4048 $Coro::current->{desc} = "runtime saver";
3198 my $t = Event::time - $t; 4049 write_runtime_sync
3199 4050 or error "ERROR: unable to write runtime file: $!";
3200 #next unless $t < 0.0013;#d#
3201 if ($t < $min) {
3202 $min = $t;
3203 }
3204 $avg = $avg * 0.99 + $t * 0.01;
3205 }
3206 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3207 exit 0;
3208 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3209 }; 4051 };
4052 }
3210 4053
3211 $RUNTIME += $TICK;
3212 $NEXT_TICK += $TICK;
3213
3214 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3215 $NEXT_RUNTIME_WRITE = $NOW + 10;
3216 Coro::async_pool {
3217 write_runtime
3218 or warn "ERROR: unable to write runtime file: $!";
3219 };
3220 }
3221
3222# my $AFTER = Event::time;
3223# warn $AFTER - $NOW;#d#
3224
3225 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226 $sig->send; 4055 $sig->send;
3227 } 4056 }
3228 while (my $sig = shift @WAIT_FOR_TICK) { 4057 while (my $sig = shift @WAIT_FOR_TICK) {
3229 $sig->send; 4058 $sig->send;
3230 } 4059 }
3231 4060
3232 $NOW = Event::time; 4061 $LOAD = ($NOW - $TICK_START) / $TICK;
3233
3234 # if we are delayed by four ticks or more, skip them all
3235 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3236
3237 $TICK_WATCHER->at ($NEXT_TICK);
3238 $TICK_WATCHER->start;
3239
3240 $LOAD = ($NOW - $tick_start) / $TICK;
3241 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4062 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242 4063
3243 _post_tick; 4064 if (0) {
3244 4065 if ($NEXT_TICK) {
3245 4066 my $jitter = $TICK_START - $NEXT_TICK;
4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4068 debug "jitter $JITTER\n";#d#
4069 }
3246 }, 4070 }
3247); 4071}
3248 4072
3249{ 4073{
3250 BDB::max_poll_time $TICK * 0.1; 4074 # configure BDB
3251 $BDB_POLL_WATCHER = Event->io ( 4075
3252 reentrant => 0,
3253 fd => BDB::poll_fileno,
3254 poll => 'r',
3255 prio => 0,
3256 data => WF_AUTOCANCEL,
3257 cb => \&BDB::poll_cb,
3258 );
3259 BDB::min_parallel 8; 4076 BDB::min_parallel 16;
3260 4077 BDB::max_poll_reqs $TICK * 0.1;
3261 BDB::set_sync_prepare { 4078 $AnyEvent::BDB::WATCHER->priority (1);
3262 my $status;
3263 my $current = $Coro::current;
3264 (
3265 sub {
3266 $status = $!;
3267 $current->ready; undef $current;
3268 },
3269 sub {
3270 Coro::schedule while defined $current;
3271 $! = $status;
3272 },
3273 )
3274 };
3275 4079
3276 unless ($DB_ENV) { 4080 unless ($DB_ENV) {
3277 $DB_ENV = BDB::db_env_create; 4081 $DB_ENV = BDB::db_env_create;
4082 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4083 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4084 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4085 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4086 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3278 4087
3279 cf::sync_job { 4088 cf::sync_job {
3280 eval { 4089 eval {
3281 BDB::db_env_open 4090 BDB::db_env_open
3282 $DB_ENV, 4091 $DB_ENV,
3284 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4093 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3285 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4094 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3286 0666; 4095 0666;
3287 4096
3288 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4097 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3289
3290 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3291 $DB_ENV->set_lk_detect;
3292 }; 4098 };
3293 4099
3294 cf::cleanup "db_env_open(db): $@" if $@; 4100 cf::cleanup "db_env_open(db): $@" if $@;
3295 }; 4101 };
3296 } 4102 }
4103
4104 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4105 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4106 };
4107 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4108 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4109 };
4110 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4111 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4112 };
3297} 4113}
3298 4114
3299{ 4115{
4116 # configure IO::AIO
4117
3300 IO::AIO::min_parallel 8; 4118 IO::AIO::min_parallel 8;
3301
3302 undef $Coro::AIO::WATCHER;
3303 IO::AIO::max_poll_time $TICK * 0.1; 4119 IO::AIO::max_poll_time $TICK * 0.1;
3304 $AIO_POLL_WATCHER = Event->io ( 4120 undef $AnyEvent::AIO::WATCHER;
3305 reentrant => 0,
3306 data => WF_AUTOCANCEL,
3307 fd => IO::AIO::poll_fileno,
3308 poll => 'r',
3309 prio => 6,
3310 cb => \&IO::AIO::poll_cb,
3311 );
3312} 4121}
3313 4122
3314my $_log_backtrace; 4123my $_log_backtrace;
3315 4124
3316sub _log_backtrace { 4125sub _log_backtrace {
3319 $msg =~ s/\n//; 4128 $msg =~ s/\n//;
3320 4129
3321 # limit the # of concurrent backtraces 4130 # limit the # of concurrent backtraces
3322 if ($_log_backtrace < 2) { 4131 if ($_log_backtrace < 2) {
3323 ++$_log_backtrace; 4132 ++$_log_backtrace;
4133 my $perl_bt = Carp::longmess $msg;
3324 async { 4134 async {
4135 $Coro::current->{desc} = "abt $msg";
4136
3325 my @bt = fork_call { 4137 my @bt = fork_call {
3326 @addr = map { sprintf "%x", $_ } @addr; 4138 @addr = map { sprintf "%x", $_ } @addr;
3327 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4139 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3328 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4140 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3329 or die "addr2line: $!"; 4141 or die "addr2line: $!";
3337 } 4149 }
3338 4150
3339 @funcs 4151 @funcs
3340 }; 4152 };
3341 4153
3342 LOG llevInfo, "[ABT] $msg\n"; 4154 LOG llevInfo, "[ABT] $perl_bt\n";
4155 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3343 LOG llevInfo, "[ABT] $_\n" for @bt; 4156 LOG llevInfo, "[ABT] $_\n" for @bt;
3344 --$_log_backtrace; 4157 --$_log_backtrace;
3345 }; 4158 };
3346 } else { 4159 } else {
3347 LOG llevInfo, "[ABT] $msg\n"; 4160 LOG llevInfo, "[ABT] $msg\n";
3348 LOG llevInfo, "[ABT] [suppressed]\n"; 4161 LOG llevInfo, "[ABT] [suppressed]\n";
3349 } 4162 }
3350} 4163}
3351 4164
3352# load additional modules 4165# load additional modules
3353use cf::pod; 4166require "cf/$_.pm" for @EXTRA_MODULES;
4167cf::_connect_to_perl_2;
3354 4168
3355END { cf::emergency_save } 4169END { cf::emergency_save }
3356 4170
33571 41711
3358 4172

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines