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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines