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.223 by root, Sun Mar 11 02:12:44 2007 UTC vs.
Revision 1.354 by root, Sun Sep 2 12:26:54 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.5 (); 15use Coro 3.64 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
24use Coro::Util ();
19 25
26use JSON::XS ();
20use BDB (); 27use BDB ();
21use Data::Dumper; 28use Data::Dumper;
22use Digest::MD5; 29use Digest::MD5;
23use Fcntl; 30use Fcntl;
31use YAML::Syck ();
24use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 33use Time::HiRes;
27use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
28 36
37# configure various modules to our taste
38#
39$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 42
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 43$Event::Eval = 1; # no idea why this is required, but it is
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 44
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1; 46$YAML::Syck::ImplicitUnicode = 1;
37 47
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
39 49
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51
40our %COMMAND = (); 52our %COMMAND = ();
41our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
42 54
43our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
47 60
48our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
49our @EVENT; 62our @EVENT;
50our $LIBDIR = datadir . "/ext";
51 63
52our $TICK = MAX_TIME * 1e-6; 64our $CONFDIR = confdir;
65our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db";
75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
53our $TICK_WATCHER; 77our $TICK_WATCHER;
54our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
55our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
56our $NEXT_TICK; 80our $NEXT_TICK;
57our $NOW; 81our $NOW;
66our $RUNTIME; 90our $RUNTIME;
67 91
68our %PLAYER; # all users 92our %PLAYER; # all users
69our %MAP; # all maps 93our %MAP; # all maps
70our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
71our $RANDOM_MAPS = cf::localdir . "/random";
72our $BDB_ENV_DIR = cf::localdir . "/db";
73
74our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
75our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
76 95
77# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
78our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
79 98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
80binmode STDOUT; 103binmode STDOUT;
81binmode STDERR; 104binmode STDERR;
82 105
83# read virtual server time, if available 106# read virtual server time, if available
84unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
85 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
86 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
87 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
88} 111}
89 112
90mkdir cf::localdir; 113mkdir $_
91mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
92mkdir cf::localdir . "/" . cf::tmpdir;
93mkdir cf::localdir . "/" . cf::uniquedir;
94mkdir $RANDOM_MAPS;
95mkdir $BDB_ENV_DIR;
96 115
97our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
98 117
99sub cf::map::normalise; 118sub cf::map::normalise;
100 119
111=item $cf::RUNTIME 130=item $cf::RUNTIME
112 131
113The time this server has run, starts at 0 and is increased by $cf::TICK on 132The time this server has run, starts at 0 and is increased by $cf::TICK on
114every server tick. 133every server tick.
115 134
116=item $cf::LIBDIR 135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
117 138
118The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
119be found. It will be added to C<@INC> automatically. 140directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and
142database environment.
120 143
121=item $cf::NOW 144=item $cf::NOW
122 145
123The time of the last (current) server tick. 146The time of the last (current) server tick.
124 147
125=item $cf::TICK 148=item $cf::TICK
126 149
127The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
128 161
129=item %cf::CFG 162=item %cf::CFG
130 163
131Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
132from wherever your confdir points to. 165from wherever your confdir points to.
133 166
134=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
135 168
136These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
137or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 170returns directly I<after> the tick processing (and consequently, can only wake one process
138processing has been done. Call C<< ->wait >> on them to maximise the 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
139window of cpu time available, or simply to synchronise to the server tick. 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
140 178
141=back 179=back
142 180
143=cut 181=cut
144 182
145BEGIN { 183BEGIN {
146 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
147 my $msg = join "", @_; 185 my $msg = join "", @_;
148 utf8::encode $msg;
149 186
150 $msg .= "\n" 187 $msg .= "\n"
151 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
152 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
153 LOG llevError, $msg; 193 LOG llevError, $msg;
154 }; 194 };
155} 195}
156 196
157@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
158@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
159@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
160@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
161@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
162@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
163 204
164# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
165# within the Safe compartment. 206# within the Safe compartment.
166for my $pkg (qw( 207for my $pkg (qw(
167 cf::global cf::attachable 208 cf::global cf::attachable
175} 216}
176 217
177$Event::DIED = sub { 218$Event::DIED = sub {
178 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
179}; 220};
221
222#############################################################################
180 223
181=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
182 225
183=over 4 226=over 4
184 227
203 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
204 $d 247 $d
205 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
206} 249}
207 250
208use JSON::Syck (); # TODO# replace by JSON::PC once working
209
210=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
211 252
212Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
213 254
214=cut
215
216sub from_json($) {
217 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
218 JSON::Syck::Load $_[0]
219}
220
221=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
222 256
223Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
224 258
225=cut 259=cut
226 260
227sub to_json($) { 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
228 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 262
229 JSON::Syck::Dump $_[0] 263sub to_json ($) { $json_coder->encode ($_[0]) }
230} 264sub from_json ($) { $json_coder->decode ($_[0]) }
231 265
232=item cf::lock_wait $string 266=item cf::lock_wait $string
233 267
234Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
235 269
238Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
239a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
240for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
241returned. 275returned.
242 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
243Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
244uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
282
283=item $locked = cf::lock_active $string
284
285Return true if the lock is currently active, i.e. somebody has locked it.
245 286
246=cut 287=cut
247 288
248our %LOCK; 289our %LOCK;
249 290
267 308
268 Coro::guard { 309 Coro::guard {
269 # wake up all waiters, to be on the safe side 310 # wake up all waiters, to be on the safe side
270 $_->ready for @{ delete $LOCK{$key} }; 311 $_->ready for @{ delete $LOCK{$key} };
271 } 312 }
313}
314
315sub lock_active($) {
316 my ($key) = @_;
317
318 ! ! $LOCK{$key}
272} 319}
273 320
274sub freeze_mainloop { 321sub freeze_mainloop {
275 return unless $TICK_WATCHER->is_active; 322 return unless $TICK_WATCHER->is_active;
276 323
279 }; 326 };
280 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
281 $guard 328 $guard
282} 329}
283 330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
385}
386
284=item cf::async { BLOCK } 387=item cf::async { BLOCK }
285 388
286Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
287C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 390C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
288thing you are allowed to do is call C<prio> on it. 391thing you are allowed to do is call C<prio> on it.
291 394
292BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
293 396
294=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
295 398
296The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
297always able to handle events or runnable, as crossfire+ is only partly 400is always able to handle events or runnable, as Crossfire TRT is only
298reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable.
299 403
300If it must be done, put the blocking parts into C<sync_job>. This will run 404If it must be done, put the blocking parts into C<sync_job>. This will run
301the given BLOCK in another coroutine while waiting for the result. The 405the given BLOCK in another coroutine while waiting for the result. The
302server will be frozen during this time, so the block should either finish 406server will be frozen during this time, so the block should either finish
303fast or be very important. 407fast or be very important.
306 410
307sub sync_job(&) { 411sub sync_job(&) {
308 my ($job) = @_; 412 my ($job) = @_;
309 413
310 if ($Coro::current == $Coro::main) { 414 if ($Coro::current == $Coro::main) {
415 my $time = Event::time;
416
311 # this is the main coro, too bad, we have to block 417 # this is the main coro, too bad, we have to block
312 # till the operation succeeds, freezing the server :/ 418 # till the operation succeeds, freezing the server :/
313 419
314 # TODO: use suspend/resume instead 420 # TODO: use suspend/resume instead
315 # (but this is cancel-safe) 421 # (but this is cancel-safe)
326 432
327 while ($busy) { 433 while ($busy) {
328 Coro::cede or Event::one_event; 434 Coro::cede or Event::one_event;
329 } 435 }
330 436
437 $time = Event::time - $time;
438
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load
443
331 wantarray ? @res : $res[0] 444 wantarray ? @res : $res[0]
332 } else { 445 } else {
333 # we are in another coroutine, how wonderful, everything just works 446 # we are in another coroutine, how wonderful, everything just works
334 447
335 $job->() 448 $job->()
354 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
355 468
356 $coro 469 $coro
357} 470}
358 471
359sub write_runtime { 472=item fork_call { }, $args
360 my $guard = cf::lock_acquire "write_runtime";
361 473
362 my $runtime = cf::localdir . "/runtime"; 474Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling.
363 478
364 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 479=cut
365 or return;
366 480
367 my $value = $cf::RUNTIME + 90 + 10; 481sub fork_call(&@) {
368 # 10 is the runtime save interval, for a monotonic clock 482 my ($cb, @args) = @_;
369 # 60 allows for the watchdog to kill the server.
370 483
371 (aio_write $fh, 0, (length $value), $value, 0) <= 0 484 # we seemingly have to make a local copy of the whole thing,
372 and return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious)
373 487
374 # always fsync - this file is important 488 my @res = Coro::Util::fork_eval {
375 aio_fsync $fh 489 reset_signals;
376 and return; 490 &$cb
491 }, @args;
377 492
378 close $fh 493 wantarray ? @res : $res[-1]
379 or return; 494}
380 495
381 aio_rename "$runtime~", $runtime 496=item $value = cf::db_get $family => $key
382 and return;
383 497
498Returns a single value from the environment database.
499
500=item cf::db_put $family => $key => $value
501
502Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504
505=cut
506
507our $DB;
508
509sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
384 1 523 }
524}
525
526sub db_get($$) {
527 my $key = "$_[0]/$_[1]";
528
529 cf::sync_job {
530 BDB::db_get $DB, undef, $key, my $data;
531
532 $! ? ()
533 : $data
534 }
535}
536
537sub db_put($$$) {
538 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
540}
541
542=item cf::cache $id => [$paths...], $processversion => $process
543
544Generic caching function that returns the value of the resource $id,
545caching and regenerating as required.
546
547This function can block.
548
549=cut
550
551sub cache {
552 my ($id, $src, $processversion, $process) = @_;
553
554 my $meta =
555 join "\x00",
556 $processversion,
557 map {
558 aio_stat $_
559 and Carp::croak "$_: $!";
560
561 ($_, (stat _)[7,9])
562 } @$src;
563
564 my $dbmeta = db_get cache => "$id/meta";
565 if ($dbmeta ne $meta) {
566 # changed, we may need to process
567
568 my @data;
569 my $md5;
570
571 for (0 .. $#$src) {
572 0 <= aio_load $src->[$_], $data[$_]
573 or Carp::croak "$src->[$_]: $!";
574 }
575
576 # if processing is expensive, check
577 # checksum first
578 if (1) {
579 $md5 =
580 join "\x00",
581 $processversion,
582 map {
583 cf::cede_to_tick;
584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
585 } 0.. $#$src;
586
587
588 my $dbmd5 = db_get cache => "$id/md5";
589 if ($dbmd5 eq $md5) {
590 db_put cache => "$id/meta", $meta;
591
592 return db_get cache => "$id/data";
593 }
594 }
595
596 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time;
599
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
601
602 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta;
605
606 return $data;
607 }
608
609 db_get cache => "$id/data"
610}
611
612=item cf::datalog type => key => value, ...
613
614Log a datalog packet of the given type with the given key-value pairs.
615
616=cut
617
618sub datalog($@) {
619 my ($type, %kv) = @_;
620 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
385} 621}
386 622
387=back 623=back
388 624
389=cut 625=cut
396attach callbacks/event handlers (a collection of which is called an "attachment") 632attach callbacks/event handlers (a collection of which is called an "attachment")
397to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
398 634
399In the following description, CLASS can be any of C<global>, C<object> 635In the following description, CLASS can be any of C<global>, C<object>
400C<player>, C<client> or C<map> (i.e. the attachable objects in 636C<player>, C<client> or C<map> (i.e. the attachable objects in
401crossfire+). 637Crossfire TRT).
402 638
403=over 4 639=over 4
404 640
405=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
406 642
569 $registry = $CB_TYPE[$object_type] ||= []; 805 $registry = $CB_TYPE[$object_type] ||= [];
570 806
571 } elsif ($type eq "subtype") { 807 } elsif ($type eq "subtype") {
572 defined $object_type or Carp::croak "subtype specified without type"; 808 defined $object_type or Carp::croak "subtype specified without type";
573 my $object_subtype = shift @arg; 809 my $object_subtype = shift @arg;
574 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 810 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
575 811
576 } elsif ($type eq "package") { 812 } elsif ($type eq "package") {
577 my $pkg = shift @arg; 813 my $pkg = shift @arg;
578 814
579 while (my ($name, $id) = each %cb_id) { 815 while (my ($name, $id) = each %cb_id) {
608 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
609 } 845 }
610 846
611 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
612 } else { 848 } else {
613 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
614 } 850 }
615 851
616 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
617} 853}
618 854
620 if (ref $_[0]) { 856 if (ref $_[0]) {
621 _object_attach @_; 857 _object_attach @_;
622 } else { 858 } else {
623 _attach shift->_attach_registry, @_; 859 _attach shift->_attach_registry, @_;
624 } 860 }
861 _recalc_want;
625}; 862};
626 863
627# all those should be optimised 864# all those should be optimised
628sub cf::attachable::detach { 865sub cf::attachable::detach {
629 my ($obj, $name) = @_; 866 my ($obj, $name) = @_;
632 delete $obj->{_attachment}{$name}; 869 delete $obj->{_attachment}{$name};
633 reattach ($obj); 870 reattach ($obj);
634 } else { 871 } else {
635 Carp::croak "cannot, currently, detach class attachments"; 872 Carp::croak "cannot, currently, detach class attachments";
636 } 873 }
874 _recalc_want;
637}; 875};
638 876
639sub cf::attachable::attached { 877sub cf::attachable::attached {
640 my ($obj, $name) = @_; 878 my ($obj, $name) = @_;
641 879
656 "; 894 ";
657 die if $@; 895 die if $@;
658} 896}
659 897
660our $override; 898our $override;
661our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
662 900
663sub override { 901sub override {
664 $override = 1; 902 $override = 1;
665 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
666} 904}
667 905
668sub do_invoke { 906sub do_invoke {
669 my $event = shift; 907 my $event = shift;
670 my $callbacks = shift; 908 my $callbacks = shift;
671 909
672 @invoke_results = (); 910 @INVOKE_RESULTS = ();
673 911
674 local $override; 912 local $override;
675 913
676 for (@$callbacks) { 914 for (@$callbacks) {
677 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
694 932
695Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
696 934
697This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
698removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
699results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
700 938
701=back 939=back
702 940
703=cut 941=cut
704 942
705############################################################################# 943#############################################################################
706# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
707 956
708sub reattach { 957sub reattach {
709 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
710 my ($obj) = @_; 959 my ($obj) = @_;
711 960
814 or return; 1063 or return;
815 $av = eval { (Storable::thaw $av)->{objs} }; 1064 $av = eval { (Storable::thaw $av)->{objs} };
816 } 1065 }
817 1066
818 warn sprintf "loading %s (%d)\n", 1067 warn sprintf "loading %s (%d)\n",
819 $filename, length $data, scalar @{$av || []};#d# 1068 $filename, length $data, scalar @{$av || []};
820 return ($data, $av); 1069 return ($data, $av);
821} 1070}
1071
1072=head2 COMMAND CALLBACKS
1073
1074=over 4
1075
1076=cut
822 1077
823############################################################################# 1078#############################################################################
824# command handling &c 1079# command handling &c
825 1080
826=item cf::register_command $name => \&callback($ob,$args); 1081=item cf::register_command $name => \&callback($ob,$args);
839 push @{ $COMMAND{$name} }, [$caller, $cb]; 1094 push @{ $COMMAND{$name} }, [$caller, $cb];
840} 1095}
841 1096
842=item cf::register_extcmd $name => \&callback($pl,$packet); 1097=item cf::register_extcmd $name => \&callback($pl,$packet);
843 1098
844Register a callbackf ro execution when the client sends an extcmd packet. 1099Register a callback for execution when the client sends an (synchronous)
1100extcmd packet. Ext commands will be processed in the order they are
1101received by the server, like other user commands. The first argument is
1102the logged-in player. Ext commands can only be processed after a player
1103has logged in successfully.
845 1104
846If the callback returns something, it is sent back as if reply was being 1105If the callback returns something, it is sent back as if reply was being
847called. 1106called.
848 1107
1108=item cf::register_exticmd $name => \&callback($ns,$packet);
1109
1110Register a callback for execution when the client sends an (asynchronous)
1111exticmd packet. Exti commands are processed by the server as soon as they
1112are received, i.e. out of order w.r.t. other commands. The first argument
1113is a client socket. Exti commands can be received anytime, even before
1114log-in.
1115
1116If the callback returns something, it is sent back as if reply was being
1117called.
1118
849=cut 1119=cut
850 1120
851sub register_extcmd { 1121sub register_extcmd {
852 my ($name, $cb) = @_; 1122 my ($name, $cb) = @_;
853 1123
854 $EXTCMD{$name} = $cb; 1124 $EXTCMD{$name} = $cb;
1125}
1126
1127sub register_exticmd {
1128 my ($name, $cb) = @_;
1129
1130 $EXTICMD{$name} = $cb;
855} 1131}
856 1132
857cf::player->attach ( 1133cf::player->attach (
858 on_command => sub { 1134 on_command => sub {
859 my ($pl, $name, $params) = @_; 1135 my ($pl, $name, $params) = @_;
868 cf::override; 1144 cf::override;
869 }, 1145 },
870 on_extcmd => sub { 1146 on_extcmd => sub {
871 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
872 1148
873 my $msg = eval { from_json $buf }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
874 1150
875 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
876 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
877 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
878 $pl->ext_reply ($msg->{msgid}, %reply);
879 }
880 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
881 } else { 1166 } else {
882 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
883 } 1168 }
884 1169
885 cf::override; 1170 cf::override;
886 }, 1171 },
887); 1172);
888 1173
889sub load_extension {
890 my ($path) = @_;
891
892 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
893 my $base = $1;
894 my $pkg = $1;
895 $pkg =~ s/[^[:word:]]/_/g;
896 $pkg = "ext::$pkg";
897
898 warn "... loading '$path' into '$pkg'\n";
899
900 open my $fh, "<:utf8", $path
901 or die "$path: $!";
902
903 my $source =
904 "package $pkg; use strict; use utf8;\n"
905 . "#line 1 \"$path\"\n{\n"
906 . (do { local $/; <$fh> })
907 . "\n};\n1";
908
909 unless (eval $source) {
910 my $msg = $@ ? "$path: $@\n"
911 : "extension disabled.\n";
912 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
913 warn $@;
914 warn "mandatory extension failed to load, exiting.\n";
915 exit 1;
916 }
917 die $@;
918 }
919
920 push @EXTS, $pkg;
921}
922
923sub load_extensions { 1174sub load_extensions {
1175 cf::sync_job {
1176 my %todo;
1177
924 for my $ext (<$LIBDIR/*.ext>) { 1178 for my $path (<$LIBDIR/*.ext>) {
925 next unless -r $ext; 1179 next unless -r $path;
926 eval { 1180
927 load_extension $ext; 1181 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1182 my $base = $1;
1183 my $pkg = $1;
1184 $pkg =~ s/[^[:word:]]/_/g;
1185 $pkg = "ext::$pkg";
1186
1187 open my $fh, "<:utf8", $path
1188 or die "$path: $!";
1189
1190 my $source = do { local $/; <$fh> };
1191
1192 my %ext = (
1193 path => $path,
1194 base => $base,
1195 pkg => $pkg,
1196 );
1197
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200
1201 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n"
1203 . "#line 1 \"$path\"\n{\n"
1204 . $source
1205 . "\n};\n1";
1206
1207 $todo{$base} = \%ext;
1208 }
1209
1210 my %done;
1211 while (%todo) {
1212 my $progress;
1213
1214 while (my ($k, $v) = each %todo) {
1215 for (split /,\s*/, $v->{meta}{depends}) {
1216 goto skip
1217 unless exists $done{$_};
1218 }
1219
1220 warn "... loading '$k' into '$v->{pkg}'\n";
1221
1222 unless (eval $v->{source}) {
1223 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n";
1225
1226 if (exists $v->{meta}{mandatory}) {
1227 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n";
1229 exit 1;
1230 }
1231
1232 warn $msg;
1233 }
1234
1235 $done{$k} = delete $todo{$k};
1236 push @EXTS, $v->{pkg};
1237 $progress = 1;
928 1 1238 }
929 } or warn "$ext not loaded: $@"; 1239
1240 skip:
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1242 unless $progress;
1243 }
930 } 1244 };
931} 1245}
932 1246
933############################################################################# 1247#############################################################################
934 1248
1249=back
1250
935=head2 CORE EXTENSIONS 1251=head2 CORE EXTENSIONS
936 1252
937Functions and methods that extend core crossfire objects. 1253Functions and methods that extend core crossfire objects.
938 1254
939=cut 1255=cut
951Returns the given player object, loading it if necessary (might block). 1267Returns the given player object, loading it if necessary (might block).
952 1268
953=cut 1269=cut
954 1270
955sub playerdir($) { 1271sub playerdir($) {
956 cf::localdir 1272 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1273 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 1274}
962 1275
963sub path($) { 1276sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1277 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
965 1278
966 (playerdir $login) . "/$login.pl" 1279 (playerdir $login) . "/playerdata"
967} 1280}
968 1281
969sub find_active($) { 1282sub find_active($) {
970 $cf::PLAYER{$_[0]} 1283 $cf::PLAYER{$_[0]}
971 and $cf::PLAYER{$_[0]}->active 1284 and $cf::PLAYER{$_[0]}->active
984 my $login = $_[0]; 1297 my $login = $_[0];
985 1298
986 my $guard = cf::lock_acquire "user_find:$login"; 1299 my $guard = cf::lock_acquire "user_find:$login";
987 1300
988 $cf::PLAYER{$_[0]} || do { 1301 $cf::PLAYER{$_[0]} || do {
1302 # rename old playerfiles to new ones
1303 #TODO: remove when no longer required
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl";
1308
989 my $pl = load_pl path $login 1309 my $pl = load_pl path $login
990 or return; 1310 or return;
991 $cf::PLAYER{$login} = $pl 1311 $cf::PLAYER{$login} = $pl
992 } 1312 }
993 } 1313 }
1005 1325
1006 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1007 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1008 1328
1009 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1010 Coro::cede; 1330 cf::cede_to_tick;
1011} 1331}
1012 1332
1013sub new($) { 1333sub new($) {
1014 my ($login) = @_; 1334 my ($login) = @_;
1015 1335
1019 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1020 1340
1021 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1022 1342
1023 $self 1343 $self
1344}
1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1024} 1354}
1025 1355
1026=item $pl->quit_character 1356=item $pl->quit_character
1027 1357
1028Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
1077while and may block, so not sync_job-capable, ever. 1407while and may block, so not sync_job-capable, ever.
1078 1408
1079=cut 1409=cut
1080 1410
1081sub list_logins { 1411sub list_logins {
1082 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1412 my $dirs = aio_readdir $PLAYERDIR
1083 or return []; 1413 or return [];
1084 1414
1085 my @logins; 1415 my @logins;
1086 1416
1087 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
1418 my $path = path $login;
1419
1420 # a .pst is a dead give-away for a valid player
1421 unless (-e "$path.pst") {
1088 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1422 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1089 aio_read $fh, 0, 512, my $buf, 0 or next; 1423 aio_read $fh, 0, 512, my $buf, 0 or next;
1090 $buf !~ /^password -------------$/m or next; # official not-valid tag 1424 $buf !~ /^password -------------$/m or next; # official not-valid tag
1425 }
1091 1426
1092 utf8::decode $login; 1427 utf8::decode $login;
1093 push @logins, $login; 1428 push @logins, $login;
1094 } 1429 }
1095 1430
1122 } 1457 }
1123 1458
1124 \@paths 1459 \@paths
1125} 1460}
1126 1461
1462=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1463
1464Expand crossfire pod fragments into protocol xml.
1465
1466=cut
1467
1468sub expand_cfpod {
1469 ((my $self), (local $_)) = @_;
1470
1471 # escape & and <
1472 s/&/&amp;/g;
1473 s/(?<![BIUGHT])</&lt;/g;
1474
1475 # this is buggy, it needs to properly take care of nested <'s
1476
1477 1 while
1478 # replace B<>, I<>, U<> etc.
1479 s/B<([^\>]*)>/<b>$1<\/b>/
1480 || s/I<([^\>]*)>/<i>$1<\/i>/
1481 || s/U<([^\>]*)>/<u>$1<\/u>/
1482 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1483 # replace G<male|female> tags
1484 || s{G<([^>|]*)\|([^>]*)>}{
1485 $self->gender ? $2 : $1
1486 }ge
1487 # replace H<hint text>
1488 || s{H<([^\>]*)>}
1489 {
1490 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1491 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1492 "")
1493 [$self->{hintmode}]
1494 }ge;
1495
1496 # create single paragraphs (very hackish)
1497 s/(?<=\S)\n(?=\w)/ /g;
1498
1499 # compress some whitespace
1500 s/\s+\n/\n/g; # ws line-ends
1501 s/\n\n+/\n/g; # double lines
1502 s/^\n+//; # beginning lines
1503 s/\n+$//; # ending lines
1504
1505 $_
1506}
1507
1508sub hintmode {
1509 $_[0]{hintmode} = $_[1] if @_ > 1;
1510 $_[0]{hintmode}
1511}
1512
1127=item $player->ext_reply ($msgid, $msgtype, %msg) 1513=item $player->ext_reply ($msgid, @msg)
1128 1514
1129Sends an ext reply to the player. 1515Sends an ext reply to the player.
1130 1516
1131=cut 1517=cut
1132 1518
1133sub ext_reply($$$%) { 1519sub ext_reply($$@) {
1134 my ($self, $id, %msg) = @_; 1520 my ($self, $id, @msg) = @_;
1135 1521
1136 $msg{msgid} = $id; 1522 $self->ns->ext_reply ($id, @msg)
1137
1138 $self->send ("ext " . cf::to_json \%msg);
1139} 1523}
1140 1524
1141package cf; 1525=item $player->ext_msg ($type, @msg)
1526
1527Sends an ext event to the client.
1528
1529=cut
1530
1531sub ext_msg($$@) {
1532 my ($self, $type, @msg) = @_;
1533
1534 $self->ns->ext_msg ($type, @msg);
1535}
1536
1537=head3 cf::region
1538
1539=over 4
1540
1541=cut
1542
1543package cf::region;
1544
1545=item cf::region::find_by_path $path
1546
1547Tries to decuce the likely region for a map knowing only its path.
1548
1549=cut
1550
1551sub find_by_path($) {
1552 my ($path) = @_;
1553
1554 my ($match, $specificity);
1555
1556 for my $region (list) {
1557 if ($region->{match} && $path =~ $region->{match}) {
1558 ($match, $specificity) = ($region, $region->specificity)
1559 if $region->specificity > $specificity;
1560 }
1561 }
1562
1563 $match
1564}
1142 1565
1143=back 1566=back
1144
1145 1567
1146=head3 cf::map 1568=head3 cf::map
1147 1569
1148=over 4 1570=over 4
1149 1571
1204 my ($self, $merge) = @_; 1626 my ($self, $merge) = @_;
1205 1627
1206 # we have to keep some variables in memory intact 1628 # we have to keep some variables in memory intact
1207 local $self->{path}; 1629 local $self->{path};
1208 local $self->{load_path}; 1630 local $self->{load_path};
1209 local $self->{deny_save};
1210 local $self->{deny_reset};
1211 1631
1212 $self->SUPER::thawer_merge ($merge); 1632 $self->SUPER::thawer_merge ($merge);
1213} 1633}
1214 1634
1215sub normalise { 1635sub normalise {
1262 $self->init; # pass $1 etc. 1682 $self->init; # pass $1 etc.
1263 return $self; 1683 return $self;
1264 } 1684 }
1265 } 1685 }
1266 1686
1267 Carp::carp "unable to resolve path '$path' (base '$base')."; 1687 Carp::cluck "unable to resolve path '$path' (base '$base').";
1268 () 1688 ()
1269} 1689}
1270 1690
1271sub init { 1691sub init {
1272 my ($self) = @_; 1692 my ($self) = @_;
1287 1707
1288# the original (read-only) location 1708# the original (read-only) location
1289sub load_path { 1709sub load_path {
1290 my ($self) = @_; 1710 my ($self) = @_;
1291 1711
1292 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1712 "$MAPDIR/$self->{path}.map"
1293} 1713}
1294 1714
1295# the temporary/swap location 1715# the temporary/swap location
1296sub save_path { 1716sub save_path {
1297 my ($self) = @_; 1717 my ($self) = @_;
1298 1718
1299 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1719 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1300 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1720 "$TMPDIR/$path.map"
1301} 1721}
1302 1722
1303# the unique path, undef == no special unique path 1723# the unique path, undef == no special unique path
1304sub uniq_path { 1724sub uniq_path {
1305 my ($self) = @_; 1725 my ($self) = @_;
1306 1726
1307 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1727 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1308 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1728 "$UNIQUEDIR/$path"
1309} 1729}
1310 1730
1311# and all this just because we cannot iterate over 1731# and all this just because we cannot iterate over
1312# all maps in C++... 1732# all maps in C++...
1313sub change_all_map_light { 1733sub change_all_map_light {
1314 my ($change) = @_; 1734 my ($change) = @_;
1315 1735
1316 $_->change_map_light ($change) 1736 $_->change_map_light ($change)
1317 for grep $_->outdoor, values %cf::MAP; 1737 for grep $_->outdoor, values %cf::MAP;
1738}
1739
1740sub decay_objects {
1741 my ($self) = @_;
1742
1743 return if $self->{deny_reset};
1744
1745 $self->do_decay_objects;
1318} 1746}
1319 1747
1320sub unlink_save { 1748sub unlink_save {
1321 my ($self) = @_; 1749 my ($self) = @_;
1322 1750
1380 $self->load_header_orig 1808 $self->load_header_orig
1381 or return; 1809 or return;
1382 $self->prepare_orig; 1810 $self->prepare_orig;
1383 } 1811 }
1384 1812
1813 $self->{deny_reset} = 1
1814 if $self->no_reset;
1815
1816 $self->default_region (cf::region::find_by_path $self->{path})
1817 unless $self->default_region;
1818
1385 1 1819 1
1386} 1820}
1387 1821
1388sub find; 1822sub find;
1389sub find { 1823sub find {
1401 $map->{last_save} = $cf::RUNTIME; 1835 $map->{last_save} = $cf::RUNTIME;
1402 1836
1403 $map->load_header 1837 $map->load_header
1404 or return; 1838 or return;
1405 1839
1406 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1840 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1407 # doing this can freeze the server in a sync job, obviously 1841 # doing this can freeze the server in a sync job, obviously
1408 #$cf::WAIT_FOR_TICK->wait; 1842 #$cf::WAIT_FOR_TICK->wait;
1409 $map->reset; 1843 $map->reset;
1410 undef $guard; 1844 undef $guard;
1411 return find $path; 1845 return find $path;
1422 my ($self) = @_; 1856 my ($self) = @_;
1423 1857
1424 local $self->{deny_reset} = 1; # loading can take a long time 1858 local $self->{deny_reset} = 1; # loading can take a long time
1425 1859
1426 my $path = $self->{path}; 1860 my $path = $self->{path};
1861
1862 {
1863 my $guard1 = cf::lock_acquire "map_data:$path";
1427 my $guard = cf::lock_acquire "map_load:$path"; 1864 my $guard2 = cf::lock_acquire "map_load:$path";
1428 1865
1429 return if $self->in_memory != cf::MAP_SWAPPED; 1866 return if $self->in_memory != cf::MAP_SWAPPED;
1430 1867
1431 $self->in_memory (cf::MAP_LOADING); 1868 $self->in_memory (cf::MAP_LOADING);
1432 1869
1433 $self->alloc; 1870 $self->alloc;
1434 1871
1435 $self->pre_load; 1872 $self->pre_load;
1873 cf::cede_to_tick;
1436 1874
1437 $self->_load_objects ($self->{load_path}, 1) 1875 $self->_load_objects ($self->{load_path}, 1)
1438 or return; 1876 or return;
1439 1877
1440 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1878 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1441 if delete $self->{load_original}; 1879 if delete $self->{load_original};
1442 1880
1443 if (my $uniq = $self->uniq_path) { 1881 if (my $uniq = $self->uniq_path) {
1444 utf8::encode $uniq; 1882 utf8::encode $uniq;
1445 if (aio_open $uniq, O_RDONLY, 0) { 1883 if (aio_open $uniq, O_RDONLY, 0) {
1446 $self->clear_unique_items; 1884 $self->clear_unique_items;
1447 $self->_load_objects ($uniq, 0); 1885 $self->_load_objects ($uniq, 0);
1448 } 1886 }
1449 } 1887 }
1450 1888
1451 Coro::cede; 1889 cf::cede_to_tick;
1452
1453 # now do the right thing for maps 1890 # now do the right thing for maps
1454 $self->link_multipart_objects; 1891 $self->link_multipart_objects;
1455
1456 unless ($self->{deny_activate}) {
1457 $self->decay_objects;
1458 $self->fix_auto_apply;
1459 $self->update_buttons;
1460 Coro::cede;
1461 $self->set_darkness_map;
1462 $self->difficulty ($self->estimate_difficulty) 1892 $self->difficulty ($self->estimate_difficulty)
1463 unless $self->difficulty; 1893 unless $self->difficulty;
1464 Coro::cede; 1894 cf::cede_to_tick;
1895
1896 unless ($self->{deny_activate}) {
1897 $self->decay_objects;
1898 $self->fix_auto_apply;
1899 $self->update_buttons;
1900 cf::cede_to_tick;
1901 $self->set_darkness_map;
1902 cf::cede_to_tick;
1465 $self->activate; 1903 $self->activate;
1904 }
1905
1906 $self->{last_save} = $cf::RUNTIME;
1907 $self->last_access ($cf::RUNTIME);
1908
1909 $self->in_memory (cf::MAP_IN_MEMORY);
1466 } 1910 }
1467 1911
1468 $self->post_load; 1912 $self->post_load;
1469
1470 $self->in_memory (cf::MAP_IN_MEMORY);
1471} 1913}
1472 1914
1473sub customise_for { 1915sub customise_for {
1474 my ($self, $ob) = @_; 1916 my ($self, $ob) = @_;
1475 1917
1476 return find "~" . $ob->name . "/" . $self->{path} 1918 return find "~" . $ob->name . "/" . $self->{path}
1477 if $self->per_player; 1919 if $self->per_player;
1478 1920
1921# return find "?party/" . $ob->name . "/" . $self->{path}
1922# if $self->per_party;
1923
1479 $self 1924 $self
1480} 1925}
1481 1926
1482# find and load all maps in the 3x3 area around a map 1927# find and load all maps in the 3x3 area around a map
1483sub load_diag { 1928sub load_neighbours {
1484 my ($map) = @_; 1929 my ($map) = @_;
1485 1930
1486 my @diag; # diagonal neighbours 1931 my @neigh; # diagonal neighbours
1487 1932
1488 for (0 .. 3) { 1933 for (0 .. 3) {
1489 my $neigh = $map->tile_path ($_) 1934 my $neigh = $map->tile_path ($_)
1490 or next; 1935 or next;
1491 $neigh = find $neigh, $map 1936 $neigh = find $neigh, $map
1492 or next; 1937 or next;
1493 $neigh->load; 1938 $neigh->load;
1494 1939
1940 push @neigh,
1495 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1941 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1496 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1942 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1497 } 1943 }
1498 1944
1499 for (@diag) { 1945 for (grep defined $_->[0], @neigh) {
1946 my ($path, $origin) = @$_;
1500 my $neigh = find @$_ 1947 my $neigh = find $path, $origin
1501 or next; 1948 or next;
1502 $neigh->load; 1949 $neigh->load;
1503 } 1950 }
1504} 1951}
1505 1952
1510} 1957}
1511 1958
1512sub do_load_sync { 1959sub do_load_sync {
1513 my ($map) = @_; 1960 my ($map) = @_;
1514 1961
1962 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1963 if $Coro::current == $Coro::main;
1964
1515 cf::sync_job { $map->load }; 1965 cf::sync_job { $map->load };
1516} 1966}
1517 1967
1518our %MAP_PREFETCH; 1968our %MAP_PREFETCH;
1519our $MAP_PREFETCHER = undef; 1969our $MAP_PREFETCHER = undef;
1520 1970
1521sub find_async { 1971sub find_async {
1522 my ($path, $origin) = @_; 1972 my ($path, $origin, $load) = @_;
1523 1973
1524 $path = normalise $path, $origin && $origin->{path}; 1974 $path = normalise $path, $origin && $origin->{path};
1525 1975
1526 if (my $map = $cf::MAP{$path}) { 1976 if (my $map = $cf::MAP{$path}) {
1527 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1977 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1528 } 1978 }
1529 1979
1530 undef $MAP_PREFETCH{$path}; 1980 $MAP_PREFETCH{$path} |= $load;
1981
1531 $MAP_PREFETCHER ||= cf::async { 1982 $MAP_PREFETCHER ||= cf::async {
1532 while (%MAP_PREFETCH) { 1983 while (%MAP_PREFETCH) {
1533 for my $path (keys %MAP_PREFETCH) { 1984 while (my ($k, $v) = each %MAP_PREFETCH) {
1534 my $map = find $path 1985 if (my $map = find $k) {
1535 or next;
1536 $map->load; 1986 $map->load if $v;
1987 }
1537 1988
1538 delete $MAP_PREFETCH{$path}; 1989 delete $MAP_PREFETCH{$k};
1539 } 1990 }
1540 } 1991 }
1541 undef $MAP_PREFETCHER; 1992 undef $MAP_PREFETCHER;
1542 }; 1993 };
1543 $MAP_PREFETCHER->prio (6); 1994 $MAP_PREFETCHER->prio (6);
1546} 1997}
1547 1998
1548sub save { 1999sub save {
1549 my ($self) = @_; 2000 my ($self) = @_;
1550 2001
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 2002 my $lock = cf::lock_acquire "map_data:$self->{path}";
1552 2003
1553 $self->{last_save} = $cf::RUNTIME; 2004 $self->{last_save} = $cf::RUNTIME;
1554 2005
1555 return unless $self->dirty; 2006 return unless $self->dirty;
1556 2007
1579 my ($self) = @_; 2030 my ($self) = @_;
1580 2031
1581 # save first because save cedes 2032 # save first because save cedes
1582 $self->save; 2033 $self->save;
1583 2034
1584 my $lock = cf::lock_acquire "map_data:" . $self->path; 2035 my $lock = cf::lock_acquire "map_data:$self->{path}";
1585 2036
1586 return if $self->players; 2037 return if $self->players;
1587 return if $self->in_memory != cf::MAP_IN_MEMORY; 2038 return if $self->in_memory != cf::MAP_IN_MEMORY;
1588 return if $self->{deny_save}; 2039 return if $self->{deny_save};
1589 2040
1593 2044
1594sub reset_at { 2045sub reset_at {
1595 my ($self) = @_; 2046 my ($self) = @_;
1596 2047
1597 # TODO: safety, remove and allow resettable per-player maps 2048 # TODO: safety, remove and allow resettable per-player maps
1598 return 1e99 if $self->isa ("ext::map_per_player");#d#
1599 return 1e99 if $self->{deny_reset}; 2049 return 1e99 if $self->{deny_reset};
1600 2050
1601 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2051 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1602 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2052 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1603 2053
1614 my ($self) = @_; 2064 my ($self) = @_;
1615 2065
1616 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2066 my $lock = cf::lock_acquire "map_data:$self->{path}";
1617 2067
1618 return if $self->players; 2068 return if $self->players;
1619 return if $self->isa ("ext::map_per_player");#d#
1620 2069
1621 warn "resetting map ", $self->path;#d# 2070 warn "resetting map ", $self->path;
1622 2071
1623 $self->in_memory (cf::MAP_SWAPPED); 2072 $self->in_memory (cf::MAP_SWAPPED);
1624 2073
1625 # need to save uniques path 2074 # need to save uniques path
1626 unless ($self->{deny_save}) { 2075 unless ($self->{deny_save}) {
1643my $nuke_counter = "aaaa"; 2092my $nuke_counter = "aaaa";
1644 2093
1645sub nuke { 2094sub nuke {
1646 my ($self) = @_; 2095 my ($self) = @_;
1647 2096
2097 {
2098 my $lock = cf::lock_acquire "map_data:$self->{path}";
2099
1648 delete $cf::MAP{$self->path}; 2100 delete $cf::MAP{$self->path};
1649 2101
1650 $self->unlink_save; 2102 $self->unlink_save;
1651 2103
1652 bless $self, "cf::map"; 2104 bless $self, "cf::map";
1653 delete $self->{deny_reset}; 2105 delete $self->{deny_reset};
1654 $self->{deny_save} = 1; 2106 $self->{deny_save} = 1;
1655 $self->reset_timeout (1); 2107 $self->reset_timeout (1);
1656 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2108 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1657 2109
1658 $cf::MAP{$self->path} = $self; 2110 $cf::MAP{$self->path} = $self;
2111 }
1659 2112
1660 $self->reset; # polite request, might not happen 2113 $self->reset; # polite request, might not happen
2114}
2115
2116=item $maps = cf::map::tmp_maps
2117
2118Returns an arrayref with all map paths of currently instantiated and saved
2119maps. May block.
2120
2121=cut
2122
2123sub tmp_maps() {
2124 [
2125 map {
2126 utf8::decode $_;
2127 /\.map$/
2128 ? normalise $_
2129 : ()
2130 } @{ aio_readdir $TMPDIR or [] }
2131 ]
2132}
2133
2134=item $maps = cf::map::random_maps
2135
2136Returns an arrayref with all map paths of currently instantiated and saved
2137random maps. May block.
2138
2139=cut
2140
2141sub random_maps() {
2142 [
2143 map {
2144 utf8::decode $_;
2145 /\.map$/
2146 ? normalise "?random/$_"
2147 : ()
2148 } @{ aio_readdir $RANDOMDIR or [] }
2149 ]
1661} 2150}
1662 2151
1663=item cf::map::unique_maps 2152=item cf::map::unique_maps
1664 2153
1665Returns an arrayref of paths of all shared maps that have 2154Returns an arrayref of paths of all shared maps that have
1666instantiated unique items. May block. 2155instantiated unique items. May block.
1667 2156
1668=cut 2157=cut
1669 2158
1670sub unique_maps() { 2159sub unique_maps() {
1671 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2160 [
1672 or return; 2161 map {
1673
1674 my @paths;
1675
1676 for (@$files) {
1677 utf8::decode $_; 2162 utf8::decode $_;
1678 next if /\.pst$/; 2163 /\.map$/
1679 next unless /^$PATH_SEP/o; 2164 ? normalise $_
1680 2165 : ()
1681 push @paths, cf::map::normalise $_; 2166 } @{ aio_readdir $UNIQUEDIR or [] }
1682 } 2167 ]
1683
1684 \@paths
1685} 2168}
1686 2169
1687package cf; 2170package cf;
1688 2171
1689=back 2172=back
1735 2218
1736 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2219 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1737 2220
1738 if ($self->{record_replies}) { 2221 if ($self->{record_replies}) {
1739 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2222 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2223
1740 } else { 2224 } else {
2225 my $pl = $self->contr;
2226
2227 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2228 my $dialog = $pl->{npc_dialog};
2229 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2230
2231 } else {
1741 $msg = $npc->name . " says: $msg" if $npc; 2232 $msg = $npc->name . " says: $msg" if $npc;
1742 $self->message ($msg, $flags); 2233 $self->message ($msg, $flags);
2234 }
1743 } 2235 }
2236}
2237
2238=item $object->send_msg ($channel, $msg, $color, [extra...])
2239
2240=cut
2241
2242sub cf::object::send_msg {
2243 my $pl = shift->contr
2244 or return;
2245 $pl->send_msg (@_);
1744} 2246}
1745 2247
1746=item $player_object->may ("access") 2248=item $player_object->may ("access")
1747 2249
1748Returns wether the given player is authorized to access resource "access" 2250Returns wether the given player is authorized to access resource "access"
1795 $self->deactivate_recursive; 2297 $self->deactivate_recursive;
1796 2298
1797 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2299 return if UNIVERSAL::isa $self->map, "ext::map_link";
1798 2300
1799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2301 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1800 if $self->map; 2302 if $self->map && $self->map->{path} ne "{link}";
1801 2303
1802 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2304 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1803} 2305}
1804 2306
1805sub cf::object::player::leave_link { 2307sub cf::object::player::leave_link {
1806 my ($self, $map, $x, $y) = @_; 2308 my ($self, $map, $x, $y) = @_;
2309
2310 return unless $self->contr->active;
1807 2311
1808 my $link_pos = delete $self->{_link_pos}; 2312 my $link_pos = delete $self->{_link_pos};
1809 2313
1810 unless ($map) { 2314 unless ($map) {
1811 # restore original map position 2315 # restore original map position
1825 # use -1 or undef as default coordinates, not 0, 0 2329 # use -1 or undef as default coordinates, not 0, 0
1826 ($x, $y) = ($map->enter_x, $map->enter_y) 2330 ($x, $y) = ($map->enter_x, $map->enter_y)
1827 if $x <=0 && $y <= 0; 2331 if $x <=0 && $y <= 0;
1828 2332
1829 $map->load; 2333 $map->load;
1830 $map->load_diag; 2334 $map->load_neighbours;
1831 2335
1832 return unless $self->contr->active; 2336 return unless $self->contr->active;
1833 $self->activate_recursive; 2337 $self->activate_recursive;
1834 2338
1835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1836 $self->enter_map ($map, $x, $y); 2340 $self->enter_map ($map, $x, $y);
1837} 2341}
1838 2342
1839cf::player->attach ( 2343=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1840 on_logout => sub {
1841 my ($pl) = @_;
1842 2344
1843 # abort map switching before logout 2345Moves the player to the given map-path and coordinates by first freezing
1844 if ($pl->ob->{_link_pos}) { 2346her, loading and preparing them map, calling the provided $check callback
1845 cf::sync_job { 2347that has to return the map if sucecssful, and then unfreezes the player on
1846 $pl->ob->leave_link 2348the new (success) or old (failed) map position. In either case, $done will
1847 }; 2349be called at the end of this process.
1848 }
1849 },
1850 on_login => sub {
1851 my ($pl) = @_;
1852 2350
1853 # try to abort aborted map switching on player login :)
1854 # should happen only on crashes
1855 if ($pl->ob->{_link_pos}) {
1856 $pl->ob->enter_link;
1857 (async {
1858 $pl->ob->reply (undef,
1859 "There was an internal problem at your last logout, "
1860 . "the server will try to bring you to your intended destination in a second.",
1861 cf::NDI_RED);
1862 # we need this sleep as the login has a concurrent enter_exit running
1863 # and this sleep increases chances of the player not ending up in scorn
1864 Coro::Timer::sleep 1;
1865 $pl->ob->leave_link;
1866 })->prio (2);
1867 }
1868 },
1869);
1870
1871=item $player_object->goto ($path, $x, $y)
1872
1873=cut 2351=cut
2352
2353our $GOTOGEN;
1874 2354
1875sub cf::object::player::goto { 2355sub cf::object::player::goto {
1876 my ($self, $path, $x, $y) = @_; 2356 my ($self, $path, $x, $y, $check, $done) = @_;
2357
2358 # do generation counting so two concurrent goto's will be executed in-order
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1877 2360
1878 $self->enter_link; 2361 $self->enter_link;
1879 2362
1880 (async { 2363 (async {
1881 my $map = eval { 2364 my $map = eval {
1882 my $map = cf::map::find $path; 2365 my $map = cf::map::find $path;
2366
2367 if ($map) {
1883 $map = $map->customise_for ($self) if $map; 2368 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map;
2370 } else {
2371 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2372 }
2373
1884 $map 2374 $map
2375 };
2376
2377 if ($@) {
2378 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2379 LOG llevError | logBacktrace, Carp::longmess $@;
1885 } or 2380 }
1886 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1887 2381
2382 if ($gen == $self->{_goto_generation}) {
2383 delete $self->{_goto_generation};
1888 $self->leave_link ($map, $x, $y); 2384 $self->leave_link ($map, $x, $y);
2385 }
2386
2387 $done->() if $done;
1889 })->prio (1); 2388 })->prio (1);
1890} 2389}
1891 2390
1892=item $player_object->enter_exit ($exit_object) 2391=item $player_object->enter_exit ($exit_object)
1893 2392
1932 2431
1933 $rmp->{random_seed} ||= $exit->random_seed; 2432 $rmp->{random_seed} ||= $exit->random_seed;
1934 2433
1935 my $data = cf::to_json $rmp; 2434 my $data = cf::to_json $rmp;
1936 my $md5 = Digest::MD5::md5_hex $data; 2435 my $md5 = Digest::MD5::md5_hex $data;
1937 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2436 my $meta = "$RANDOMDIR/$md5.meta";
1938 2437
1939 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2438 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1940 aio_write $fh, 0, (length $data), $data, 0; 2439 aio_write $fh, 0, (length $data), $data, 0;
1941 undef $fh; 2440 undef $fh;
1942 aio_rename "$meta~", $meta; 2441 aio_rename "$meta~", $meta;
1951 2450
1952 return unless $self->type == cf::PLAYER; 2451 return unless $self->type == cf::PLAYER;
1953 2452
1954 if ($exit->slaying eq "/!") { 2453 if ($exit->slaying eq "/!") {
1955 #TODO: this should de-fi-ni-te-ly not be a sync-job 2454 #TODO: this should de-fi-ni-te-ly not be a sync-job
2455 # the problem is that $exit might not survive long enough
2456 # so it needs to be done right now, right here
1956 cf::sync_job { prepare_random_map $exit }; 2457 cf::sync_job { prepare_random_map $exit };
1957 } 2458 }
1958 2459
1959 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2460 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1960 my $hp = $exit->stats->hp; 2461 my $hp = $exit->stats->hp;
1961 my $sp = $exit->stats->sp; 2462 my $sp = $exit->stats->sp;
1962 2463
1963 $self->enter_link; 2464 $self->enter_link;
2465
2466 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED);
1964 2469
1965 (async { 2470 (async {
1966 $self->deactivate_recursive; # just to be sure 2471 $self->deactivate_recursive; # just to be sure
1967 unless (eval { 2472 unless (eval {
1968 $self->goto ($slaying, $hp, $sp); 2473 $self->goto ($slaying, $hp, $sp);
1969 2474
1970 1; 2475 1;
1971 }) { 2476 }) {
1972 $self->message ("Something went wrong deep within the crossfire server. " 2477 $self->message ("Something went wrong deep within the crossfire server. "
1973 . "I'll try to bring you back to the map you were before. " 2478 . "I'll try to bring you back to the map you were before. "
1974 . "Please report this to the dungeon master!", 2479 . "Please report this to the dungeon master!",
1975 cf::NDI_UNIQUE | cf::NDI_RED); 2480 cf::NDI_UNIQUE | cf::NDI_RED);
1976 2481
1977 warn "ERROR in enter_exit: $@"; 2482 warn "ERROR in enter_exit: $@";
1978 $self->leave_link; 2483 $self->leave_link;
1979 } 2484 }
1980 })->prio (1); 2485 })->prio (1);
1993 2498
1994sub cf::client::send_drawinfo { 2499sub cf::client::send_drawinfo {
1995 my ($self, $text, $flags) = @_; 2500 my ($self, $text, $flags) = @_;
1996 2501
1997 utf8::encode $text; 2502 utf8::encode $text;
1998 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2503 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1999} 2504}
2000 2505
2506=item $client->send_msg ($channel, $msg, $color, [extra...])
2507
2508Send a drawinfo or msg packet to the client, formatting the msg for the
2509client if neccessary. C<$type> should be a string identifying the type of
2510the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet.
2512
2513=cut
2514
2515our %CHANNEL = (
2516 "c/identify" => {
2517 id => "identify",
2518 title => "Identify",
2519 reply => undef,
2520 tooltip => "Items recently identified",
2521 },
2522 "c/examine" => {
2523 id => "examine",
2524 title => "Examine",
2525 reply => undef,
2526 tooltip => "Signs and other items you examined",
2527 },
2528);
2529
2530sub cf::client::send_msg {
2531 my ($self, $channel, $msg, $color, @extra) = @_;
2532
2533 $msg = $self->pl->expand_cfpod ($msg);
2534
2535 $color &= cf::NDI_CLIENT_MASK; # just in case...
2536
2537 # check predefined channels, for the benefit of C
2538 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2539
2540 if (ref $channel) {
2541 # send meta info to client, if not yet sent
2542 unless (exists $self->{channel}{$channel->{id}}) {
2543 $self->{channel}{$channel->{id}} = $channel;
2544 $self->ext_msg (channel_info => $channel)
2545 if $self->can_msg;
2546 }
2547
2548 $channel = $channel->{id};
2549 }
2550
2551 return unless @extra || length $msg;
2552
2553 if ($self->can_msg) {
2554 # default colour, mask it out
2555 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2556 if $color & cf::NDI_DEF;
2557
2558 $self->send_packet ("msg " . $self->{json_coder}->encode (
2559 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2560 } else {
2561 if ($color >= 0) {
2562 # replace some tags by gcfclient-compatible ones
2563 for ($msg) {
2564 1 while
2565 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2566 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2567 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2568 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2569 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2570 }
2571
2572 $color &= cf::NDI_COLOR_MASK;
2573
2574 utf8::encode $msg;
2575
2576 if (0 && $msg =~ /\[/) {
2577 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg")
2582 }
2583 }
2584 }
2585}
2586
2587=item $client->ext_msg ($type, @msg)
2588
2589Sends an ext event to the client.
2590
2591=cut
2592
2593sub cf::client::ext_msg($$@) {
2594 my ($self, $type, @msg) = @_;
2595
2596 if ($self->extcmd == 2) {
2597 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2598 } elsif ($self->extcmd == 1) { # TODO: remove
2599 push @msg, msgtype => "event_$type";
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2601 }
2602}
2603
2604=item $client->ext_reply ($msgid, @msg)
2605
2606Sends an ext reply to the client.
2607
2608=cut
2609
2610sub cf::client::ext_reply($$@) {
2611 my ($self, $id, @msg) = @_;
2612
2613 if ($self->extcmd == 2) {
2614 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2615 } elsif ($self->extcmd == 1) {
2616 #TODO: version 1, remove
2617 unshift @msg, msgtype => "reply", msgid => $id;
2618 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2619 }
2620}
2001 2621
2002=item $success = $client->query ($flags, "text", \&cb) 2622=item $success = $client->query ($flags, "text", \&cb)
2003 2623
2004Queues a query to the client, calling the given callback with 2624Queues a query to the client, calling the given callback with
2005the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2625the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2006C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2626C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2007 2627
2008Queries can fail, so check the return code. Or don't, as queries will become 2628Queries can fail, so check the return code. Or don't, as queries will
2009reliable at some point in the future. 2629become reliable at some point in the future.
2010 2630
2011=cut 2631=cut
2012 2632
2013sub cf::client::query { 2633sub cf::client::query {
2014 my ($self, $flags, $text, $cb) = @_; 2634 my ($self, $flags, $text, $cb) = @_;
2022 utf8::encode $text; 2642 utf8::encode $text;
2023 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2643 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2024 2644
2025 $self->send_packet ($self->{query_queue}[0][0]) 2645 $self->send_packet ($self->{query_queue}[0][0])
2026 if @{ $self->{query_queue} } == 1; 2646 if @{ $self->{query_queue} } == 1;
2647
2648 1
2027} 2649}
2028 2650
2029cf::client->attach ( 2651cf::client->attach (
2652 on_connect => sub {
2653 my ($ns) = @_;
2654
2655 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2656 },
2030 on_reply => sub { 2657 on_reply => sub {
2031 my ($ns, $msg) = @_; 2658 my ($ns, $msg) = @_;
2032 2659
2033 # this weird shuffling is so that direct followup queries 2660 # this weird shuffling is so that direct followup queries
2034 # get handled first 2661 # get handled first
2046 } else { 2673 } else {
2047 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2674 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2048 } 2675 }
2049 } 2676 }
2050 }, 2677 },
2678 on_exticmd => sub {
2679 my ($ns, $buf) = @_;
2680
2681 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2682
2683 if (ref $msg) {
2684 my ($type, $reply, @payload) =
2685 "ARRAY" eq ref $msg
2686 ? @$msg
2687 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2688
2689 my @reply;
2690
2691 if (my $cb = $EXTICMD{$type}) {
2692 @reply = $cb->($ns, @payload);
2693 }
2694
2695 $ns->ext_reply ($reply, @reply)
2696 if $reply;
2697
2698 } else {
2699 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2700 }
2701
2702 cf::override;
2703 },
2051); 2704);
2052 2705
2053=item $client->async (\&cb) 2706=item $client->async (\&cb)
2054 2707
2055Create a new coroutine, running the specified callback. The coroutine will 2708Create a new coroutine, running the specified callback. The coroutine will
2096our $safe = new Safe "safe"; 2749our $safe = new Safe "safe";
2097our $safe_hole = new Safe::Hole; 2750our $safe_hole = new Safe::Hole;
2098 2751
2099$SIG{FPE} = 'IGNORE'; 2752$SIG{FPE} = 'IGNORE';
2100 2753
2101$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2754$safe->permit_only (Opcode::opset qw(
2755 :base_core :base_mem :base_orig :base_math
2756 grepstart grepwhile mapstart mapwhile
2757 sort time
2758));
2102 2759
2103# here we export the classes and methods available to script code 2760# here we export the classes and methods available to script code
2104 2761
2105=pod 2762=pod
2106 2763
2107The following fucntions and emthods are available within a safe environment: 2764The following functions and methods are available within a safe environment:
2108 2765
2109 cf::object contr pay_amount pay_player map 2766 cf::object
2767 contr pay_amount pay_player map x y force_find force_add
2768 insert remove name archname title slaying race decrease_ob_nr
2769
2110 cf::object::player player 2770 cf::object::player
2111 cf::player peaceful 2771 player
2112 cf::map trigger 2772
2773 cf::player
2774 peaceful
2775
2776 cf::map
2777 trigger
2113 2778
2114=cut 2779=cut
2115 2780
2116for ( 2781for (
2117 ["cf::object" => qw(contr pay_amount pay_player map)], 2782 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2783 insert remove inv name archname title slaying race
2784 decrease_ob_nr)],
2118 ["cf::object::player" => qw(player)], 2785 ["cf::object::player" => qw(player)],
2119 ["cf::player" => qw(peaceful)], 2786 ["cf::player" => qw(peaceful)],
2120 ["cf::map" => qw(trigger)], 2787 ["cf::map" => qw(trigger)],
2121) { 2788) {
2122 no strict 'refs'; 2789 no strict 'refs';
2193=back 2860=back
2194 2861
2195=cut 2862=cut
2196 2863
2197############################################################################# 2864#############################################################################
2198
2199=head2 EXTENSION DATABASE SUPPORT
2200
2201Crossfire maintains a very simple database for extension use. It can
2202currently store anything that can be serialised using Storable, which
2203excludes objects.
2204
2205The parameter C<$family> should best start with the name of the extension
2206using it, it should be unique.
2207
2208=over 4
2209
2210=item $value = cf::db_get $family => $key
2211
2212Returns a single value from the database.
2213
2214=item cf::db_put $family => $key => $value
2215
2216Stores the given C<$value> in the family.
2217
2218=cut
2219
2220our $DB;
2221
2222sub db_init {
2223 unless ($DB) {
2224 $DB = BDB::db_create $DB_ENV;
2225
2226 cf::sync_job {
2227 eval {
2228 $DB->set_flags (BDB::CHKSUM);
2229
2230 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2231 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2232 cf::cleanup "db_open(db): $!" if $!;
2233 };
2234 cf::cleanup "db_open(db): $@" if $@;
2235 };
2236
2237 my $path = cf::localdir . "/database.pst";
2238 if (stat $path) {
2239 cf::sync_job {
2240 my $pst = Storable::retrieve $path;
2241
2242 cf::db_put (board => data => $pst->{board});
2243 cf::db_put (guildrules => data => $pst->{guildrules});
2244 cf::db_put (rent => balance => $pst->{rent}{balance});
2245 BDB::db_env_txn_checkpoint $DB_ENV;
2246
2247 unlink $path;
2248 };
2249 }
2250 }
2251}
2252
2253sub db_get($$) {
2254 my $key = "$_[0]/$_[1]";
2255
2256 cf::sync_job {
2257 BDB::db_get $DB, undef, $key, my $data;
2258
2259 $! ? ()
2260 : Compress::LZF::sthaw $data
2261 }
2262}
2263
2264sub db_put($$$) {
2265 BDB::dbreq_pri 4;
2266 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2267}
2268
2269#############################################################################
2270# the server's init and main functions 2865# the server's init and main functions
2271 2866
2272sub load_faces { 2867sub load_facedata($) {
2273 my $path = sprintf "%s/faces", cf::datadir; 2868 my ($path) = @_;
2274 2869
2870 # HACK to clear player env face cache, we need some signal framework
2871 # for this (global event?)
2872 %ext::player_env::MUSIC_FACE_CACHE = ();
2873
2874 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2875
2275 warn "loading faces from $path\n"; 2876 warn "loading facedata from $path\n";
2276 2877
2277 my $faces; 2878 my $facedata;
2278 0 < aio_load $path, $faces 2879 0 < aio_load $path, $facedata
2279 or die "$path: $!"; 2880 or die "$path: $!";
2280 2881
2281 Coro::cede;
2282 $faces = Storable::thaw $faces; 2882 $facedata = Coro::Storable::thaw $facedata;
2283 Coro::cede;
2284 2883
2884 $facedata->{version} == 2
2885 or cf::cleanup "$path: version mismatch, cannot proceed.";
2886
2887 # patch in the exptable
2888 $facedata->{resource}{"res/exp_table"} = {
2889 type => FT_RSRC,
2890 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2891 };
2892 cf::cede_to_tick;
2893
2894 {
2895 my $faces = $facedata->{faceinfo};
2896
2285 while (my ($face, $info) = each %$faces) { 2897 while (my ($face, $info) = each %$faces) {
2286 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2898 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2287 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2899 cf::face::set_visibility $idx, $info->{visibility};
2900 cf::face::set_magicmap $idx, $info->{magicmap};
2288 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2901 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2289 Coro::cede; 2902 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2903
2904 cf::cede_to_tick;
2905 }
2906
2907 while (my ($face, $info) = each %$faces) {
2908 next unless $info->{smooth};
2909 my $idx = cf::face::find $face
2910 or next;
2911 if (my $smooth = cf::face::find $info->{smooth}) {
2912 cf::face::set_smooth $idx, $smooth;
2913 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2914 } else {
2915 warn "smooth face '$info->{smooth}' not found for face '$face'";
2916 }
2917
2918 cf::cede_to_tick;
2919 }
2920 }
2921
2922 {
2923 my $anims = $facedata->{animinfo};
2924
2925 while (my ($anim, $info) = each %$anims) {
2926 cf::anim::set $anim, $info->{frames}, $info->{facings};
2927 cf::cede_to_tick;
2928 }
2929
2930 cf::anim::invalidate_all; # d'oh
2931 }
2932
2933 {
2934 # TODO: for gcfclient pleasure, we should give resources
2935 # that gcfclient doesn't grok a >10000 face index.
2936 my $res = $facedata->{resource};
2937
2938 my $soundconf = delete $res->{"res/sound.conf"};
2939
2940 while (my ($name, $info) = each %$res) {
2941 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2942 my $data;
2943
2944 if ($info->{type} & 1) {
2945 # prepend meta info
2946
2947 my $meta = $enc->encode ({
2948 name => $name,
2949 %{ $info->{meta} || {} },
2950 });
2951
2952 $data = pack "(w/a*)*", $meta, $info->{data};
2953 } else {
2954 $data = $info->{data};
2955 }
2956
2957 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2958 cf::face::set_type $idx, $info->{type};
2959
2960 cf::cede_to_tick;
2961 }
2962
2963 if ($soundconf) {
2964 $soundconf = $enc->decode (delete $soundconf->{data});
2965
2966 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2967 my $sound = $soundconf->{compat}[$_]
2968 or next;
2969
2970 my $face = cf::face::find "sound/$sound->[1]";
2971 cf::sound::set $sound->[0] => $face;
2972 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2973 }
2974
2975 while (my ($k, $v) = each %{$soundconf->{event}}) {
2976 my $face = cf::face::find "sound/$v";
2977 cf::sound::set $k => $face;
2978 }
2979 }
2290 } 2980 }
2291 2981
2292 1 2982 1
2293} 2983}
2294 2984
2985register_exticmd fx_want => sub {
2986 my ($ns, $want) = @_;
2987
2988 while (my ($k, $v) = each %$want) {
2989 $ns->fx_want ($k, $v);
2990 }
2991};
2992
2993sub reload_regions {
2994 # HACK to clear player env face cache, we need some signal framework
2995 # for this (global event?)
2996 %ext::player_env::MUSIC_FACE_CACHE = ();
2997
2998 load_resource_file "$MAPDIR/regions"
2999 or die "unable to load regions file\n";
3000
3001 for (cf::region::list) {
3002 $_->{match} = qr/$_->{match}/
3003 if exists $_->{match};
3004 }
3005}
3006
3007sub reload_facedata {
3008 load_facedata "$DATADIR/facedata"
3009 or die "unable to load facedata\n";
3010}
3011
3012sub reload_archetypes {
3013 load_resource_file "$DATADIR/archetypes"
3014 or die "unable to load archetypes\n";
3015 #d# NEED to laod twice to resolve forward references
3016 # this really needs to be done in an extra post-pass
3017 # (which needs to be synchronous, so solve it differently)
3018 load_resource_file "$DATADIR/archetypes"
3019 or die "unable to load archetypes\n";
3020}
3021
3022sub reload_treasures {
3023 load_resource_file "$DATADIR/treasures"
3024 or die "unable to load treasurelists\n";
3025}
3026
2295sub reload_resources { 3027sub reload_resources {
2296 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 3028 warn "reloading resource files...\n";
2297 or die "unable to load regions file\n";#d# 3029
3030 reload_regions;
2298 load_faces 3031 reload_facedata;
2299 or die "unable to load faces\n";#d# 3032 #reload_archetypes;#d#
3033 reload_archetypes;
3034 reload_treasures;
3035
3036 warn "finished reloading resource files\n";
2300} 3037}
2301 3038
2302sub init { 3039sub init {
2303 reload_resources; 3040 reload_resources;
2304} 3041}
2305 3042
2306sub cfg_load { 3043sub reload_config {
2307 open my $fh, "<:utf8", cf::confdir . "/config" 3044 open my $fh, "<:utf8", "$CONFDIR/config"
2308 or return; 3045 or return;
2309 3046
2310 local $/; 3047 local $/;
2311 *CFG = YAML::Syck::Load <$fh>; 3048 *CFG = YAML::Syck::Load <$fh>;
2312 3049
2331 (async { 3068 (async {
2332 Event::one_event; 3069 Event::one_event;
2333 })->prio (Coro::PRIO_MAX); 3070 })->prio (Coro::PRIO_MAX);
2334 }; 3071 };
2335 3072
2336 cfg_load; 3073 reload_config;
2337 db_init; 3074 db_init;
2338 load_extensions; 3075 load_extensions;
2339 3076
2340 $TICK_WATCHER->start; 3077 $TICK_WATCHER->start;
2341 Event::loop; 3078 Event::loop;
2357 }, 3094 },
2358 ); 3095 );
2359 } 3096 }
2360} 3097}
2361 3098
3099sub write_runtime {
3100 my $runtime = "$LOCALDIR/runtime";
3101
3102 # first touch the runtime file to show we are still running:
3103 # the fsync below can take a very very long time.
3104
3105 IO::AIO::aio_utime $runtime, undef, undef;
3106
3107 my $guard = cf::lock_acquire "write_runtime";
3108
3109 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3110 or return;
3111
3112 my $value = $cf::RUNTIME + 90 + 10;
3113 # 10 is the runtime save interval, for a monotonic clock
3114 # 60 allows for the watchdog to kill the server.
3115
3116 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3117 and return;
3118
3119 # always fsync - this file is important
3120 aio_fsync $fh
3121 and return;
3122
3123 # touch it again to show we are up-to-date
3124 aio_utime $fh, undef, undef;
3125
3126 close $fh
3127 or return;
3128
3129 aio_rename "$runtime~", $runtime
3130 and return;
3131
3132 warn "runtime file written.\n";
3133
3134 1
3135}
3136
2362sub emergency_save() { 3137sub emergency_save() {
2363 my $freeze_guard = cf::freeze_mainloop; 3138 my $freeze_guard = cf::freeze_mainloop;
2364 3139
2365 warn "enter emergency perl save\n"; 3140 warn "enter emergency perl save\n";
2366 3141
2397 3172
2398 warn Carp::longmess "post_cleanup backtrace" 3173 warn Carp::longmess "post_cleanup backtrace"
2399 if $make_core; 3174 if $make_core;
2400} 3175}
2401 3176
2402sub reload() { 3177sub do_reload_perl() {
2403 # can/must only be called in main 3178 # can/must only be called in main
2404 if ($Coro::current != $Coro::main) { 3179 if ($Coro::current != $Coro::main) {
2405 warn "can only reload from main coroutine"; 3180 warn "can only reload from main coroutine";
2406 return; 3181 return;
2407 } 3182 }
2441 %EXT_CORO = (); 3216 %EXT_CORO = ();
2442 3217
2443 warn "removing commands"; 3218 warn "removing commands";
2444 %COMMAND = (); 3219 %COMMAND = ();
2445 3220
2446 warn "removing ext commands"; 3221 warn "removing ext/exti commands";
2447 %EXTCMD = (); 3222 %EXTCMD = ();
3223 %EXTICMD = ();
2448 3224
2449 warn "unloading/nuking all extensions"; 3225 warn "unloading/nuking all extensions";
2450 for my $pkg (@EXTS) { 3226 for my $pkg (@EXTS) {
2451 warn "... unloading $pkg"; 3227 warn "... unloading $pkg";
2452 3228
2482 Symbol::delete_package "safe::$_" 3258 Symbol::delete_package "safe::$_"
2483 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3259 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2484 3260
2485 warn "unloading cf.pm \"a bit\""; 3261 warn "unloading cf.pm \"a bit\"";
2486 delete $INC{"cf.pm"}; 3262 delete $INC{"cf.pm"};
3263 delete $INC{"cf/pod.pm"};
2487 3264
2488 # don't, removes xs symbols, too, 3265 # don't, removes xs symbols, too,
2489 # and global variables created in xs 3266 # and global variables created in xs
2490 #Symbol::delete_package __PACKAGE__; 3267 #Symbol::delete_package __PACKAGE__;
2491 3268
2494 warn "reloading cf.pm"; 3271 warn "reloading cf.pm";
2495 require cf; 3272 require cf;
2496 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3273 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2497 3274
2498 warn "loading config and database again"; 3275 warn "loading config and database again";
2499 cf::cfg_load; 3276 cf::reload_config;
2500 3277
2501 warn "loading extensions"; 3278 warn "loading extensions";
2502 cf::load_extensions; 3279 cf::load_extensions;
2503 3280
2504 warn "reattaching attachments to objects/players"; 3281 warn "reattaching attachments to objects/players";
2506 warn "reattaching attachments to maps"; 3283 warn "reattaching attachments to maps";
2507 reattach $_ for values %MAP; 3284 reattach $_ for values %MAP;
2508 warn "reattaching attachments to players"; 3285 warn "reattaching attachments to players";
2509 reattach $_ for values %PLAYER; 3286 reattach $_ for values %PLAYER;
2510 3287
2511 warn "loading reloadable resources";
2512 reload_resources;
2513
2514 warn "leaving sync_job"; 3288 warn "leaving sync_job";
2515 3289
2516 1 3290 1
2517 } or do { 3291 } or do {
2518 warn $@; 3292 warn $@;
2523 warn "reloaded"; 3297 warn "reloaded";
2524}; 3298};
2525 3299
2526our $RELOAD_WATCHER; # used only during reload 3300our $RELOAD_WATCHER; # used only during reload
2527 3301
3302sub reload_perl() {
3303 # doing reload synchronously and two reloads happen back-to-back,
3304 # coro crashes during coro_state_free->destroy here.
3305
3306 $RELOAD_WATCHER ||= Event->timer (
3307 reentrant => 0,
3308 after => 0,
3309 data => WF_AUTOCANCEL,
3310 cb => sub {
3311 do_reload_perl;
3312 undef $RELOAD_WATCHER;
3313 },
3314 );
3315}
3316
2528register_command "reload" => sub { 3317register_command "reload" => sub {
2529 my ($who, $arg) = @_; 3318 my ($who, $arg) = @_;
2530 3319
2531 if ($who->flag (FLAG_WIZ)) { 3320 if ($who->flag (FLAG_WIZ)) {
2532 $who->message ("reloading server."); 3321 $who->message ("reloading server.");
2533 3322 async { reload_perl };
2534 # doing reload synchronously and two reloads happen back-to-back,
2535 # coro crashes during coro_state_free->destroy here.
2536
2537 $RELOAD_WATCHER ||= Event->timer (
2538 reentrant => 0,
2539 after => 0,
2540 data => WF_AUTOCANCEL,
2541 cb => sub {
2542 reload;
2543 undef $RELOAD_WATCHER;
2544 },
2545 );
2546 } 3323 }
2547}; 3324};
2548 3325
2549unshift @INC, $LIBDIR; 3326unshift @INC, $LIBDIR;
2550 3327
2551my $bug_warning = 0; 3328my $bug_warning = 0;
2552 3329
3330our @WAIT_FOR_TICK;
3331our @WAIT_FOR_TICK_BEGIN;
3332
3333sub wait_for_tick {
3334 return unless $TICK_WATCHER->is_active;
3335 return if $Coro::current == $Coro::main;
3336
3337 my $signal = new Coro::Signal;
3338 push @WAIT_FOR_TICK, $signal;
3339 $signal->wait;
3340}
3341
3342sub wait_for_tick_begin {
3343 return unless $TICK_WATCHER->is_active;
3344 return if $Coro::current == $Coro::main;
3345
3346 my $signal = new Coro::Signal;
3347 push @WAIT_FOR_TICK_BEGIN, $signal;
3348 $signal->wait;
3349}
3350
3351 my $min = 1e6;#d#
3352 my $avg = 10;
2553$TICK_WATCHER = Event->timer ( 3353$TICK_WATCHER = Event->timer (
2554 reentrant => 0, 3354 reentrant => 0,
2555 parked => 1, 3355 parked => 1,
2556 prio => 0, 3356 prio => 0,
2557 at => $NEXT_TICK || $TICK, 3357 at => $NEXT_TICK || $TICK,
2561 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3361 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2562 unless ++$bug_warning > 10; 3362 unless ++$bug_warning > 10;
2563 return; 3363 return;
2564 } 3364 }
2565 3365
2566 $NOW = Event::time; 3366 $NOW = $tick_start = Event::time;
2567 3367
2568 cf::server_tick; # one server iteration 3368 cf::server_tick; # one server iteration
3369
3370 0 && sync_job {#d#
3371 for(1..10) {
3372 my $t = Event::time;
3373 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3374 or die;
3375
3376 $map->width (50);
3377 $map->height (50);
3378 $map->alloc;
3379 $map->_load_objects ("/tmp/x.map", 1);
3380 my $t = Event::time - $t;
3381
3382 #next unless $t < 0.0013;#d#
3383 if ($t < $min) {
3384 $min = $t;
3385 }
3386 $avg = $avg * 0.99 + $t * 0.01;
3387 }
3388 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3389 exit 0;
3390 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3391 };
3392
2569 $RUNTIME += $TICK; 3393 $RUNTIME += $TICK;
2570 $NEXT_TICK += $TICK; 3394 $NEXT_TICK += $TICK;
2571 3395
2572 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3396 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2573 $NEXT_RUNTIME_WRITE = $NOW + 10; 3397 $NEXT_RUNTIME_WRITE = $NOW + 10;
2575 write_runtime 3399 write_runtime
2576 or warn "ERROR: unable to write runtime file: $!"; 3400 or warn "ERROR: unable to write runtime file: $!";
2577 }; 3401 };
2578 } 3402 }
2579 3403
2580 $WAIT_FOR_TICK->broadcast;
2581 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2582
2583# my $AFTER = Event::time; 3404# my $AFTER = Event::time;
2584# warn $AFTER - $NOW;#d# 3405# warn $AFTER - $NOW;#d#
2585 3406
3407 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3408 $sig->send;
3409 }
3410 while (my $sig = shift @WAIT_FOR_TICK) {
3411 $sig->send;
3412 }
3413
3414 $NOW = Event::time;
3415
2586 # if we are delayed by four ticks or more, skip them all 3416 # if we are delayed by four ticks or more, skip them all
2587 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3417 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2588 3418
2589 $TICK_WATCHER->at ($NEXT_TICK); 3419 $TICK_WATCHER->at ($NEXT_TICK);
2590 $TICK_WATCHER->start; 3420 $TICK_WATCHER->start;
3421
3422 $LOAD = ($NOW - $tick_start) / $TICK;
3423 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3424
3425 _post_tick;
3426
3427
2591 }, 3428 },
2592); 3429);
2593 3430
2594{ 3431{
2595 BDB::max_poll_time $TICK * 0.1; 3432 BDB::max_poll_time $TICK * 0.1;
2623 3460
2624 cf::sync_job { 3461 cf::sync_job {
2625 eval { 3462 eval {
2626 BDB::db_env_open 3463 BDB::db_env_open
2627 $DB_ENV, 3464 $DB_ENV,
2628 $BDB_ENV_DIR, 3465 $BDBDIR,
2629 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3466 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2630 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3467 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2631 0666; 3468 0666;
2632 3469
2633 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3470 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2634 3471
2635 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3472 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2636 $DB_ENV->set_lk_detect; 3473 $DB_ENV->set_lk_detect;
2637 }; 3474 };
2638 3475
2654 prio => 6, 3491 prio => 6,
2655 cb => \&IO::AIO::poll_cb, 3492 cb => \&IO::AIO::poll_cb,
2656 ); 3493 );
2657} 3494}
2658 3495
3496my $_log_backtrace;
3497
3498sub _log_backtrace {
3499 my ($msg, @addr) = @_;
3500
3501 $msg =~ s/\n//;
3502
3503 # limit the # of concurrent backtraces
3504 if ($_log_backtrace < 2) {
3505 ++$_log_backtrace;
3506 async {
3507 my @bt = fork_call {
3508 @addr = map { sprintf "%x", $_ } @addr;
3509 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3510 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3511 or die "addr2line: $!";
3512
3513 my @funcs;
3514 my @res = <$fh>;
3515 chomp for @res;
3516 while (@res) {
3517 my ($func, $line) = splice @res, 0, 2, ();
3518 push @funcs, "[$func] $line";
3519 }
3520
3521 @funcs
3522 };
3523
3524 LOG llevInfo, "[ABT] $msg\n";
3525 LOG llevInfo, "[ABT] $_\n" for @bt;
3526 --$_log_backtrace;
3527 };
3528 } else {
3529 LOG llevInfo, "[ABT] $msg\n";
3530 LOG llevInfo, "[ABT] [suppressed]\n";
3531 }
3532}
3533
3534# load additional modules
3535use cf::pod;
3536
2659END { cf::emergency_save } 3537END { cf::emergency_save }
2660 3538
26611 35391
2662 3540

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines