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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.532 by root, Thu Apr 29 07:32:34 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines