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.321 by root, Thu Jul 26 21:44:43 2007 UTC vs.
Revision 1.538 by root, Tue May 4 21:45:43 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines