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.125 by root, Tue Jan 2 23:06:39 2007 UTC vs.
Revision 1.145 by root, Sun Jan 7 21:54:59 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Digest::MD5; 20use Digest::MD5;
21use Fcntl; 21use Fcntl;
22use IO::AIO 2.31 (); 22use IO::AIO 2.32 ();
23use YAML::Syck (); 23use YAML::Syck ();
24use Time::HiRes; 24use Time::HiRes;
25 25
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
… …
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 185=item cf::lock_wait $string
209 186
210Wait until the given lock is available. See cf::lock_acquire. 187Wait until the given lock is available. See cf::lock_acquire.
211 188
212=item my $lock = cf::lock_acquire $string 189=item my $lock = cf::lock_acquire $string
213 190
214Wait until the given lock is available and then acquires it and returns 191Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope, 192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 193for example when the coroutine gets canceled), the lock is automatically
217returned. 194returned.
218 195
219Lock names should begin with a unique identifier (for example, find_map 196Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 197uses map_find and cf::map::load uses map_load).
221 198
222=cut 199=cut
223 200
224our %LOCK; 201our %LOCK;
225 202
… …
239 # wait, to be sure we are not locked 216 # wait, to be sure we are not locked
240 lock_wait $key; 217 lock_wait $key;
241 218
242 $LOCK{$key} = []; 219 $LOCK{$key} = [];
243 220
244 cf::guard { 221 Coro::guard {
245 # wake up all waiters, to be on the safe side 222 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 223 $_->ready for @{ delete $LOCK{$key} };
247 } 224 }
248} 225}
226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
235=item cf::async { BLOCK }
236
237Currently the same as Coro::async_pool, meaning you cannot use
238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
240
241=cut
242
243BEGIN { *async = \&Coro::async_pool }
249 244
250=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
251 246
252The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
253always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
… …
267 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
269 264
270 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
271 # (but this is cancel-safe) 266 # (but this is cancel-safe)
272 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
273 268
274 my $busy = 1; 269 my $busy = 1;
275 my @res; 270 my @res;
276 271
277 (Coro::async { 272 (async {
278 @res = eval { $job->() }; 273 @res = eval { $job->() };
279 warn $@ if $@; 274 warn $@ if $@;
280 undef $busy; 275 undef $busy;
281 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
282 277
283 while ($busy) { 278 while ($busy) {
284 Coro::cede_notself; 279 Coro::cede or Event::one_event;
285 Event::one_event unless Coro::nready;
286 } 280 }
287 281
288 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
289 } else { 283 } else {
290 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
291 285
292 $job->() 286 $job->()
293 } 287 }
294} 288}
295 289
296=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
297 291
298Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
299when the extension calling this is being unloaded. 293extension calling this is being unloaded.
300 294
301=cut 295=cut
302 296
303sub coro(&) { 297sub async_ext(&) {
304 my $cb = shift; 298 my $cb = shift;
305 299
306 my $coro; $coro = async { 300 my $coro = &Coro::async ($cb);
307 eval {
308 $cb->();
309 };
310 warn $@ if $@;
311 };
312 301
313 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
314 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
315 }); 304 });
316 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
1083 1072
1084=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1085 1074
1086Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1087 1076
1077=cut
1078
1079package cf::player;
1080
1088=head3 cf::player 1081=head3 cf::player
1089 1082
1090=over 4 1083=over 4
1091 1084
1092=item cf::player::exists $login 1085=item cf::player::find $login
1093 1086
1094Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1095 1088
1096=cut 1089=cut
1097 1090
1098sub cf::player::exists($) { 1091sub playerdir($) {
1099 cf::player::find $_[0] 1092 cf::localdir
1100 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 . "/"
1094 . cf::playerdir
1095 . "/"
1096 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1097}
1098
1099sub path($) {
1100 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1101
1102 (playerdir $login) . "/$login.pl"
1103}
1104
1105sub find_active($) {
1106 $cf::PLAYER{$_[0]}
1107 and $cf::PLAYER{$_[0]}->active
1108 and $cf::PLAYER{$_[0]}
1109}
1110
1111sub exists($) {
1112 my ($login) = @_;
1113
1114 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login }
1116}
1117
1118sub find($) {
1119 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0];
1121
1122 my $guard = cf::lock_acquire "user_find:$login";
1123
1124 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1125 };
1126}
1127
1128sub save($) {
1129 my ($pl) = @_;
1130
1131 return if $pl->{deny_save};
1132
1133 my $path = path $pl;
1134 my $guard = cf::lock_acquire "user_save:$path";
1135
1136 return if $pl->{deny_save};
1137 $pl->{last_save} = $cf::RUNTIME;
1138
1139 Coro::cede;
1140 $pl->save_pl ($path);
1141 Coro::cede;
1142}
1143
1144sub new($) {
1145 my ($login) = @_;
1146
1147 my $self = create;
1148
1149 $self->ob->name ($login);
1150 $self->{deny_save} = 1;
1151
1152 $cf::PLAYER{$login} = $self;
1153
1154 $self
1155}
1156
1157sub quit_character {
1158 my ($pl) = @_;
1159
1160 $pl->{deny_save} = 1;
1161 $pl->password ("*"); # this should lock out the player until we nuked the dir
1162
1163 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1164 $pl->deactivate;
1165 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1166 $pl->ns->destroy if $pl->ns;
1167
1168 my $path = playerdir $pl;
1169 my $temp = "$path~$cf::RUNTIME~deleting~";
1170 IO::AIO::aio_rename $path, $temp, sub {
1171 delete $cf::PLAYER{$pl->ob->name};
1172 $pl->destroy;
1173
1174 IO::AIO::aio_rmtree $temp;
1175 };
1101} 1176}
1102 1177
1103=item $player->ext_reply ($msgid, $msgtype, %msg) 1178=item $player->ext_reply ($msgid, $msgtype, %msg)
1104 1179
1105Sends an ext reply to the player. 1180Sends an ext reply to the player.
1106 1181
1107=cut 1182=cut
1108 1183
1109sub cf::player::ext_reply($$$%) { 1184sub ext_reply($$$%) {
1110 my ($self, $id, %msg) = @_; 1185 my ($self, $id, %msg) = @_;
1111 1186
1112 $msg{msgid} = $id; 1187 $msg{msgid} = $id;
1113 1188
1114 $self->send ("ext " . to_json \%msg); 1189 $self->send ("ext " . cf::to_json \%msg);
1115} 1190}
1191
1192package cf;
1116 1193
1117=back 1194=back
1118 1195
1119 1196
1120=head3 cf::map 1197=head3 cf::map
… …
1126package cf::map; 1203package cf::map;
1127 1204
1128use Fcntl; 1205use Fcntl;
1129use Coro::AIO; 1206use Coro::AIO;
1130 1207
1131our $MAX_RESET = 7200; 1208our $MAX_RESET = 3600;
1132our $DEFAULT_RESET = 3600; 1209our $DEFAULT_RESET = 3000;
1133 1210
1134sub generate_random_map { 1211sub generate_random_map {
1135 my ($path, $rmp) = @_; 1212 my ($path, $rmp) = @_;
1136 1213
1137 # mit "rum" bekleckern, nicht 1214 # mit "rum" bekleckern, nicht
… …
1167 or return; 1244 or return;
1168 1245
1169 my $map = cf::map::new 1246 my $map = cf::map::new
1170 or return; 1247 or return;
1171 1248
1249 # for better error messages only, will be overwritten
1250 $map->path ($path);
1251
1172 $map->load_header ($path) 1252 $map->load_header ($path)
1173 or return; 1253 or return;
1174 1254
1175 $map->{load_path} = $path; 1255 $map->{load_path} = $path;
1176 1256
1177 $map 1257 $map
1178} 1258}
1179 1259
1260sub find;
1180sub find_map { 1261sub find {
1181 my ($path, $origin) = @_; 1262 my ($path, $origin) = @_;
1182 1263
1183 #warn "find_map<$path,$origin>\n";#d# 1264 #warn "find<$path,$origin>\n";#d#
1184 1265
1185 $path = new cf::path $path, $origin && $origin->path; 1266 $path = new cf::path $path, $origin && $origin->path;
1186 my $key = $path->as_string; 1267 my $key = $path->as_string;
1187 1268
1188 cf::lock_wait "map_find:$key"; 1269 cf::lock_wait "map_find:$key";
… …
1191 my $guard = cf::lock_acquire "map_find:$key"; 1272 my $guard = cf::lock_acquire "map_find:$key";
1192 1273
1193 # do it the slow way 1274 # do it the slow way
1194 my $map = try_load_header $path->save_path; 1275 my $map = try_load_header $path->save_path;
1195 1276
1277 Coro::cede;
1278
1196 if ($map) { 1279 if ($map) {
1280 $map->last_access ((delete $map->{last_access})
1281 || $cf::RUNTIME); #d#
1197 # safety 1282 # safety
1198 $map->{instantiate_time} = $cf::RUNTIME 1283 $map->{instantiate_time} = $cf::RUNTIME
1199 if $map->{instantiate_time} > $cf::RUNTIME; 1284 if $map->{instantiate_time} > $cf::RUNTIME;
1200 } else { 1285 } else {
1201 if (my $rmp = $path->random_map_params) { 1286 if (my $rmp = $path->random_map_params) {
… …
1206 1291
1207 $map or return; 1292 $map or return;
1208 1293
1209 $map->{load_original} = 1; 1294 $map->{load_original} = 1;
1210 $map->{instantiate_time} = $cf::RUNTIME; 1295 $map->{instantiate_time} = $cf::RUNTIME;
1296 $map->last_access ($cf::RUNTIME);
1211 $map->instantiate; 1297 $map->instantiate;
1212 1298
1213 # per-player maps become, after loading, normal maps 1299 # per-player maps become, after loading, normal maps
1214 $map->per_player (0) if $path->{user_rel}; 1300 $map->per_player (0) if $path->{user_rel};
1215 } 1301 }
1216 1302
1217 $map->path ($key); 1303 $map->path ($key);
1218 $map->{path} = $path; 1304 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1305 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME); 1306
1307 Coro::cede;
1221 1308
1222 if ($map->should_reset) { 1309 if ($map->should_reset) {
1223 $map->reset; 1310 $map->reset;
1224 undef $guard; 1311 undef $guard;
1225 $map = cf::map::find_map ($path) 1312 $map = find $path
1226 or return; 1313 or return;
1227 } 1314 }
1228 1315
1229 $cf::MAP{$key} = $map 1316 $cf::MAP{$key} = $map
1230 } 1317 }
… …
1252 if (aio_open $uniq, O_RDONLY, 0) { 1339 if (aio_open $uniq, O_RDONLY, 0) {
1253 $self->clear_unique_items; 1340 $self->clear_unique_items;
1254 $self->load_objects ($uniq, 0); 1341 $self->load_objects ($uniq, 0);
1255 } 1342 }
1256 } 1343 }
1344
1345 Coro::cede;
1257 1346
1258 # now do the right thing for maps 1347 # now do the right thing for maps
1259 $self->link_multipart_objects; 1348 $self->link_multipart_objects;
1260 1349
1261 if ($self->{path}->is_style_map) { 1350 if ($self->{path}->is_style_map) {
… …
1269 $self->difficulty ($self->estimate_difficulty) 1358 $self->difficulty ($self->estimate_difficulty)
1270 unless $self->difficulty; 1359 unless $self->difficulty;
1271 $self->activate; 1360 $self->activate;
1272 } 1361 }
1273 1362
1363 Coro::cede;
1364
1274 $self->in_memory (cf::MAP_IN_MEMORY); 1365 $self->in_memory (cf::MAP_IN_MEMORY);
1275} 1366}
1276 1367
1277sub load_map_sync { 1368sub find_sync {
1278 my ($path, $origin) = @_; 1369 my ($path, $origin) = @_;
1279 1370
1280 #warn "load_map_sync<$path, $origin>\n";#d# 1371 cf::sync_job { cf::map::find $path, $origin }
1372}
1281 1373
1282 cf::sync_job { 1374sub do_load_sync {
1283 my $map = cf::map::find_map $path, $origin 1375 my ($map) = @_;
1284 or return; 1376
1285 $map->load; 1377 cf::sync_job { $map->load };
1286 $map
1287 }
1288} 1378}
1289 1379
1290sub save { 1380sub save {
1291 my ($self) = @_; 1381 my ($self) = @_;
1292 1382
1383 my $lock = cf::lock_acquire "map_data:" . $self->path;
1384
1293 $self->{last_save} = $cf::RUNTIME; 1385 $self->{last_save} = $cf::RUNTIME;
1294 1386
1295 return unless $self->dirty; 1387 return unless $self->dirty;
1296 1388
1297 my $save = $self->{path}->save_path; utf8::encode $save; 1389 my $save = $self->{path}->save_path; utf8::encode $save;
1298 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1390 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1299 1391
1300 $self->{load_path} = $save; 1392 $self->{load_path} = $save;
1301 1393
1302 return if $self->{deny_save}; 1394 return if $self->{deny_save};
1395
1396 local $self->{last_access} = $self->last_access;#d#
1397
1398 cf::async {
1399 $_->contr->save for $self->players;
1400 };
1303 1401
1304 if ($uniq) { 1402 if ($uniq) {
1305 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1403 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1306 $self->save_objects ($uniq, cf::IO_UNIQUES); 1404 $self->save_objects ($uniq, cf::IO_UNIQUES);
1307 } else { 1405 } else {
… …
1310} 1408}
1311 1409
1312sub swap_out { 1410sub swap_out {
1313 my ($self) = @_; 1411 my ($self) = @_;
1314 1412
1413 # save first because save cedes
1414 $self->save;
1415
1416 my $lock = cf::lock_acquire "map_data:" . $self->path;
1417
1315 return if $self->players; 1418 return if $self->players;
1316 return if $self->in_memory != cf::MAP_IN_MEMORY; 1419 return if $self->in_memory != cf::MAP_IN_MEMORY;
1317 return if $self->{deny_save}; 1420 return if $self->{deny_save};
1318 1421
1319 $self->save;
1320 $self->clear; 1422 $self->clear;
1321 $self->in_memory (cf::MAP_SWAPPED); 1423 $self->in_memory (cf::MAP_SWAPPED);
1322} 1424}
1323 1425
1324sub reset_at { 1426sub reset_at {
… …
1362} 1464}
1363 1465
1364sub reset { 1466sub reset {
1365 my ($self) = @_; 1467 my ($self) = @_;
1366 1468
1469 my $lock = cf::lock_acquire "map_data:" . $self->path;
1470
1367 return if $self->players; 1471 return if $self->players;
1368 return if $self->{path}{user_rel};#d# 1472 return if $self->{path}{user_rel};#d#
1369 1473
1370 warn "resetting map ", $self->path;#d# 1474 warn "resetting map ", $self->path;#d#
1371 1475
… …
1390 1494
1391sub customise_for { 1495sub customise_for {
1392 my ($map, $ob) = @_; 1496 my ($map, $ob) = @_;
1393 1497
1394 if ($map->per_player) { 1498 if ($map->per_player) {
1395 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1499 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1396 } 1500 }
1397 1501
1398 $map 1502 $map
1399} 1503}
1400 1504
1401sub emergency_save { 1505sub emergency_save {
1402 local $cf::FREEZE = 1; 1506 my $freeze_guard = cf::freeze_mainloop;
1403 1507
1404 warn "enter emergency map save\n"; 1508 warn "enter emergency perl save\n";
1405 1509
1406 cf::sync_job { 1510 cf::sync_job {
1511 warn "begin emergency player save\n";
1512 $_->save for values %cf::PLAYER;
1513 warn "end emergency player save\n";
1514
1407 warn "begin emergency map save\n"; 1515 warn "begin emergency map save\n";
1408 $_->save for values %cf::MAP; 1516 $_->save for values %cf::MAP;
1517 warn "end emergency map save\n";
1409 }; 1518 };
1410 1519
1411 warn "end emergency map save\n"; 1520 warn "leave emergency perl save\n";
1412} 1521}
1413 1522
1414package cf; 1523package cf;
1415 1524
1416=back 1525=back
… …
1497 my $link_pos = delete $self->{_link_pos}; 1606 my $link_pos = delete $self->{_link_pos};
1498 1607
1499 unless ($map) { 1608 unless ($map) {
1500 # restore original map position 1609 # restore original map position
1501 ($map, $x, $y) = @{ $link_pos || [] }; 1610 ($map, $x, $y) = @{ $link_pos || [] };
1502 $map = cf::map::find_map $map; 1611 $map = cf::map::find $map;
1503 1612
1504 unless ($map) { 1613 unless ($map) {
1505 ($map, $x, $y) = @$EMERGENCY_POSITION; 1614 ($map, $x, $y) = @$EMERGENCY_POSITION;
1506 $map = cf::map::find_map $map 1615 $map = cf::map::find $map
1507 or die "FATAL: cannot load emergency map\n"; 1616 or die "FATAL: cannot load emergency map\n";
1508 } 1617 }
1509 } 1618 }
1510 1619
1511 ($x, $y) = (-1, -1) 1620 ($x, $y) = (-1, -1)
… …
1515 ($x, $y) = ($map->enter_x, $map->enter_y) 1624 ($x, $y) = ($map->enter_x, $map->enter_y)
1516 if $x <=0 && $y <= 0; 1625 if $x <=0 && $y <= 0;
1517 1626
1518 $map->load; 1627 $map->load;
1519 1628
1629 return unless $self->contr->active;
1520 $self->activate_recursive; 1630 $self->activate_recursive;
1521 $self->enter_map ($map, $x, $y); 1631 $self->enter_map ($map, $x, $y);
1522} 1632}
1523 1633
1524cf::player->attach ( 1634cf::player->attach (
… …
1537 1647
1538 # try to abort aborted map switching on player login :) 1648 # try to abort aborted map switching on player login :)
1539 # should happen only on crashes 1649 # should happen only on crashes
1540 if ($pl->ob->{_link_pos}) { 1650 if ($pl->ob->{_link_pos}) {
1541 $pl->ob->enter_link; 1651 $pl->ob->enter_link;
1542 Coro::async { 1652 (async {
1543 # we need this sleep as the login has a concurrent enter_exit running 1653 # we need this sleep as the login has a concurrent enter_exit running
1544 # and this sleep increases chances of the player not ending up in scorn 1654 # and this sleep increases chances of the player not ending up in scorn
1655 $pl->ob->reply (undef,
1656 "There was an internal problem at your last logout, "
1657 . "the server will try to bring you to your intended destination in a second.",
1658 cf::NDI_RED);
1545 Coro::Timer::sleep 1; 1659 Coro::Timer::sleep 1;
1546 $pl->ob->leave_link; 1660 $pl->ob->leave_link;
1547 }; 1661 })->prio (2);
1548 } 1662 }
1549 }, 1663 },
1550); 1664);
1551 1665
1552=item $player_object->goto_map ($path, $x, $y) 1666=item $player_object->goto ($path, $x, $y)
1553 1667
1554=cut 1668=cut
1555 1669
1556sub cf::object::player::goto_map { 1670sub cf::object::player::goto {
1557 my ($self, $path, $x, $y) = @_; 1671 my ($self, $path, $x, $y) = @_;
1558 1672
1559 $self->enter_link; 1673 $self->enter_link;
1560 1674
1561 (Coro::async { 1675 (async {
1562 $path = new cf::path $path; 1676 $path = new cf::path $path;
1563 1677
1564 my $map = cf::map::find_map $path->as_string; 1678 my $map = cf::map::find $path->as_string;
1565 $map = $map->customise_for ($self) if $map; 1679 $map = $map->customise_for ($self) if $map;
1566 1680
1567# warn "entering ", $map->path, " at ($x, $y)\n" 1681# warn "entering ", $map->path, " at ($x, $y)\n"
1568# if $map; 1682# if $map;
1569 1683
… …
1628 1742
1629 return unless $self->type == cf::PLAYER; 1743 return unless $self->type == cf::PLAYER;
1630 1744
1631 $self->enter_link; 1745 $self->enter_link;
1632 1746
1633 (Coro::async { 1747 (async {
1748 $self->deactivate_recursive; # just to be sure
1634 unless (eval { 1749 unless (eval {
1635
1636 prepare_random_map $exit 1750 prepare_random_map $exit
1637 if $exit->slaying eq "/!"; 1751 if $exit->slaying eq "/!";
1638 1752
1639 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1753 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1640 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1754 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1641 1755
1642 1; 1756 1;
1643 }) { 1757 }) {
1644 $self->message ("Something went wrong deep within the crossfire server. " 1758 $self->message ("Something went wrong deep within the crossfire server. "
1645 . "I'll try to bring you back to the map you were before. " 1759 . "I'll try to bring you back to the map you were before. "
… …
1702 on_reply => sub { 1816 on_reply => sub {
1703 my ($ns, $msg) = @_; 1817 my ($ns, $msg) = @_;
1704 1818
1705 # this weird shuffling is so that direct followup queries 1819 # this weird shuffling is so that direct followup queries
1706 # get handled first 1820 # get handled first
1707 my $queue = delete $ns->{query_queue}; 1821 my $queue = delete $ns->{query_queue}
1822 or return; # be conservative, not sure how that can happen, but we saw a crash here
1708 1823
1709 (shift @$queue)->[1]->($msg); 1824 (shift @$queue)->[1]->($msg);
1710 1825
1711 push @{ $ns->{query_queue} }, @$queue; 1826 push @{ $ns->{query_queue} }, @$queue;
1712 1827
… …
1718 } 1833 }
1719 } 1834 }
1720 }, 1835 },
1721); 1836);
1722 1837
1723=item $client->coro (\&cb) 1838=item $client->async (\&cb)
1724 1839
1725Create a new coroutine, running the specified callback. The coroutine will 1840Create a new coroutine, running the specified callback. The coroutine will
1726be automatically cancelled when the client gets destroyed (e.g. on logout, 1841be automatically cancelled when the client gets destroyed (e.g. on logout,
1727or loss of connection). 1842or loss of connection).
1728 1843
1729=cut 1844=cut
1730 1845
1731sub cf::client::coro { 1846sub cf::client::async {
1732 my ($self, $cb) = @_; 1847 my ($self, $cb) = @_;
1733 1848
1734 my $coro; $coro = async { 1849 my $coro = &Coro::async ($cb);
1735 eval {
1736 $cb->();
1737 };
1738 warn $@ if $@;
1739 };
1740 1850
1741 $coro->on_destroy (sub { 1851 $coro->on_destroy (sub {
1742 delete $self->{_coro}{$coro+0}; 1852 delete $self->{_coro}{$coro+0};
1743 }); 1853 });
1744 1854
… …
1979 open my $fh, "<:utf8", cf::confdir . "/config" 2089 open my $fh, "<:utf8", cf::confdir . "/config"
1980 or return; 2090 or return;
1981 2091
1982 local $/; 2092 local $/;
1983 *CFG = YAML::Syck::Load <$fh>; 2093 *CFG = YAML::Syck::Load <$fh>;
2094
2095 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2096
2097 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2098 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2099
2100 if (exists $CFG{mlockall}) {
2101 eval {
2102 $CFG{mlockall} ? &mlockall : &munlockall
2103 and die "WARNING: m(un)lockall failed: $!\n";
2104 };
2105 warn $@ if $@;
2106 }
1984} 2107}
1985 2108
1986sub main { 2109sub main {
1987 # we must not ever block the main coroutine 2110 # we must not ever block the main coroutine
1988 local $Coro::idle = sub { 2111 local $Coro::idle = sub {
1989 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2112 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1990 (Coro::unblock_sub {
1991 Event::one_event; 2113 async { Event::one_event };
1992 })->();
1993 }; 2114 };
1994 2115
1995 cfg_load; 2116 cfg_load;
1996 db_load; 2117 db_load;
1997 load_extensions; 2118 load_extensions;
… …
2008 return; 2129 return;
2009 } 2130 }
2010 2131
2011 warn "reloading..."; 2132 warn "reloading...";
2012 2133
2013 local $FREEZE = 1; 2134 my $guard = freeze_mainloop;
2014 cf::emergency_save; 2135 cf::emergency_save;
2015 2136
2016 eval { 2137 eval {
2017 # if anything goes wrong in here, we should simply crash as we already saved 2138 # if anything goes wrong in here, we should simply crash as we already saved
2018 2139
… …
2080 cf::load_extensions; 2201 cf::load_extensions;
2081 2202
2082 # reattach attachments to objects 2203 # reattach attachments to objects
2083 warn "reattach"; 2204 warn "reattach";
2084 _global_reattach; 2205 _global_reattach;
2206 reattach $_ for values %MAP;
2085 }; 2207 };
2086 2208
2087 if ($@) { 2209 if ($@) {
2088 warn $@; 2210 warn $@;
2089 warn "error while reloading, exiting."; 2211 warn "error while reloading, exiting.";
… …
2105 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2227 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2106 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2228 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2107 2229
2108 # dirty hack because... archetypes are not yet loaded 2230 # dirty hack because... archetypes are not yet loaded
2109 Event->timer ( 2231 Event->timer (
2110 after => 2, 2232 after => 10,
2111 cb => sub { 2233 cb => sub {
2112 $_[0]->w->cancel; 2234 $_[0]->w->cancel;
2113 2235
2114 # provide some exits "home" 2236 # provide some exits "home"
2115 my $exit = cf::object::new "exit"; 2237 my $exit = cf::object::new "exit";
… …
2154 reentrant => 0, 2276 reentrant => 0,
2155 prio => 0, 2277 prio => 0,
2156 at => $NEXT_TICK || $TICK, 2278 at => $NEXT_TICK || $TICK,
2157 data => WF_AUTOCANCEL, 2279 data => WF_AUTOCANCEL,
2158 cb => sub { 2280 cb => sub {
2159 unless ($FREEZE) {
2160 cf::server_tick; # one server iteration 2281 cf::server_tick; # one server iteration
2161 $RUNTIME += $TICK; 2282 $RUNTIME += $TICK;
2162 }
2163
2164 $NEXT_TICK += $TICK; 2283 $NEXT_TICK += $TICK;
2165 2284
2166 # if we are delayed by four ticks or more, skip them all 2285 # if we are delayed by four ticks or more, skip them all
2167 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2286 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2168 2287

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines