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.353 by root, Sun Sep 2 08:43:46 2007 UTC vs.
Revision 1.544 by root, Thu May 6 21:58:07 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines